main/readline: upgrade to 7.0 patchlevel 003

- fix url
- move static libraries to -dev, remove -static subpackage
- move libhistory library to separate subpackage
- remade APKBUILD for automatic deploy upstream's patches

1 files changed, 28 insertions, 38 deletions

diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index a6f6a91bf5..e19ec08fac 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -1,42 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=readline
-pkgver=6.3.008
+pkgver=7.0.003
+pkgrel=0
 _myver=${pkgver%.*}
-pkgrel=5
 pkgdesc="GNU readline library"
-url="ftp://ftp.cwru.edu/pub/bash/"
+url="https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 arch="all"
 license="GPL"
 depends=
 makedepends="ncurses-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://ftp.gnu.org/gnu/readline/readline-${_myver}.tar.gz
-	p0-readline-6.3-008.patch
+subpackages="$pkgname-dev $pkgname-doc libhistory"
+source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$_myver.tar.gz
 	fix-ncurses-underlinking.patch
 	"
 
-# generate url's to patches. note: no forks allowed!
+for _patch in $(seq -w 001 ${pkgver##*.}); do
+	_name=$pkgname${_myver//./}-$_patch
+	source="$source $_name.diff::http://ftp.gnu.org/gnu/$pkgname/$pkgname-$_myver-patches/$_name"
+done
 
-_getpatch() {
-	_i=1
-	_suff=${_myver//./}
-	_patchver=${pkgver##*.}
-	while [ $_i -le $_patchver ]; do
-		curl http://ftp.gnu.org/gnu/readline/readline-$_myver-patches/readline$_suff-$(printf "%03d" $_i)
-		_i=$(( $_i + 1))
-	done
-}
+builddir="$srcdir/$pkgname-$_myver"
 
-builddir="$srcdir"/$pkgname-$_myver
 prepare() {
+	local i
 	cd "$builddir"
-	update_config_sub || return 1
 	for i in $source; do
-		case $i in
-		p0-*.patch) msg $i; patch -p0 -i "$srcdir"/$i || return 1;;
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		case ${i%::*} in
+		*.diff) msg ${i#*::}; patch -p0 -i "$srcdir"/${i%::*} || return 1;;
 		esac
 	done
+	default_prepare || return 1
+	update_config_sub
 }
 
 build() {
@@ -53,28 +47,24 @@ build() {
 	make || return 1
 }
 
-static() {
-	pkgdesc="$pkgdesc - static library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make -C "$builddir" DESTDIR="$pkgdir" install || return 1
 	# verfy that its not underlinked as upstream designed it
 	if ! readelf -d "$pkgdir"/usr/lib/libreadline.so | grep 'NEEDED.*ncurses'; then
 		error "readline needs to be linked against ncurses"
 		return 1
 	fi
+	rmdir "$pkgdir"/usr/bin
+}
+
+libhistory() {
+	pkgdesc="GNU History Library"
+	mkdir -p "$subpkgdir"/usr/lib || return 1
+	mv "$pkgdir"/usr/lib/$subpkgname.* "$subpkgdir"/usr/lib || return 1
 }
 
-md5sums="33c8fb279e981274f485fd91da77e94a  readline-6.3.tar.gz
-3e84f443ddc7aedad1e6d527c105a213  p0-readline-6.3-008.patch
-14c0ace483b61e99441acca376acaeac  fix-ncurses-underlinking.patch"
-sha256sums="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43  readline-6.3.tar.gz
-b1682565724a25b68118f6880257cd2381988ee34e98e6c69e6fa20a0f941701  p0-readline-6.3-008.patch
-351a19e1c8bb4c06b7cacb70a3cf3dda2eefce66bb4eb4635ac93c5716405b1e  fix-ncurses-underlinking.patch"
-sha512sums="f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401  readline-6.3.tar.gz
-beab1f333643deea33bde114b7ba3eb6a6d9c84a2a92a66111bb46c6c1d27416d970112cf6ea635a7f3d5a419d4c768718a8f6ff1b4726c0cda8f566a2ad092f  p0-readline-6.3-008.patch
-325dcf74e9f463a74fb116cb6f3ff8d9708dbec24b423a778eeda3a5ac4fe6df131e0e99d034053ad356b01502894ecc8facc09160d4c29b2291bd95cff6b635  fix-ncurses-underlinking.patch"
+sha512sums="18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870  readline-7.0.tar.gz
+325dcf74e9f463a74fb116cb6f3ff8d9708dbec24b423a778eeda3a5ac4fe6df131e0e99d034053ad356b01502894ecc8facc09160d4c29b2291bd95cff6b635  fix-ncurses-underlinking.patch
+4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec  readline70-001.diff
+13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185  readline70-002.diff
+eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385  readline70-003.diff"