system/perl: bump to 5.26.2, modernize, remove dumbnes

1 files changed, 16 insertions, 56 deletions

diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index a004771b1..1414e4842 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -3,17 +3,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Proxy-For: solar
 pkgname=perl
-pkgver=5.26.1
-pkgrel=1
+pkgver=5.26.2
+pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url="http://www.perl.org/"
 arch="all"
 license="Artistic GPL-2.0"
-options="!check !fhs"  # Tests require more musl locale support
+# remove !check when tests pass.
+options="!check !fhs"
 depends=""
-depends_dev="perl-utils"
 makedepends="bzip2-dev zlib-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch miniperl"
+subpackages="$pkgname-doc $pkgname-dev"
 source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
 	"
 
@@ -29,11 +29,11 @@ _archlib=/usr/lib/perl5/core_perl
 
 prepare() {
 	chmod +w "$builddir"/*.c
-	default_prepare || return 1
+	default_prepare
 	cd "$builddir"
 	sed	-e 's/less -R/less/g' \
 		-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
-		-i ./Configure || return 1
+		-i ./Configure ||
 
 	# Ensure that we never accidentally bundle zlib or bzip2
 	rm -rf cpan/Compress-Raw-Zlib/zlib-src
@@ -75,11 +75,15 @@ build() {
 		-Dinstallman3dir=/usr/share/man/man3 \
 		-Dman1ext='1' \
 		-Dman3ext='3pm' \
-		-Dcf_by='Alpine' \
+		-Dcf_by='Adelie' \
 		-Ud_csh \
-		-Dusenm \
-		|| return 1
-	make libperl.so && make || return 1
+		-Dusenm
+	make libperl.so && make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
@@ -87,25 +91,10 @@ package() {
 	make DESTDIR="$pkgdir" install
 	if [ -n "$(find $pkgdir/usr/local -type f)" ]; then
 		error "files found under /usr/local"
-		return 1
 	fi
 	find "$pkgdir" -name '.*' -delete
 }
 
-miniperl() {
-	install -Dm755 "$builddir"/$subpkgname \
-		"$subpkgdir"/usr/bin/$subpkgname || return 1
-}
-
-doc() {
-	default_doc
-	local file; for file in $(find "$pkgdir" -name "*.pod"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*} || return 1
-		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
-	done
-}
-
 dev() {
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_archlib "$subpkgdir"/$_privlib
 	mv "$pkgdir"/$_archlib/Devel "$subpkgdir"/$_archlib/
@@ -120,33 +109,4 @@ dev() {
 	default_dev
 }
 
-utils() {
-	pkgdesc="$pkgdesc (misc utilities)"
-	depends="$pkgname"
-	mkdir -p "$subpkgdir"/usr/bin
-	local file
-	for file in \
-		corelist \
-		cpan \
-		encguess \
-		libnetcfg \
-		h2ph \
-		instmodsh \
-		json_pp \
-		perlbug \
-		perlthanks \
-		piconv \
-		pl2pm \
-		prove \
-		ptar \
-		ptardiff \
-		ptargrep \
-		shasum \
-		splain \
-		zipdetails
-	do
-		mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/ || return 1
-	done
-}
-
-sha512sums="098a08f1dd0dbc065cc2d93752a5b320e63d665a80392f7c4d83e807f05762d34c70c99d80bc8085512f5653f9a4b54edb5a8973aba240d41c211ebbd630209f  perl-5.26.1.tar.gz"
+sha512sums="166d767f748a911b969fc8008069f087927cbdd9ee21b375b31e5feb5afc2be8d80d68f8c291accee6fdf3be90e9dc2fc870cb9c0bd1cc68c6e001e4ed38d564  perl-5.26.2.tar.gz"