main/perl*: mass test suite addition + modernisation of 18 Perl packages

17 files changed, 201 insertions, 188 deletions

diff --git a/main/perl-encode-locale/APKBUILD b/main/perl-encode-locale/APKBUILD
index dd4a9d4be5..361bbc6384 100644
--- a/main/perl-encode-locale/APKBUILD
+++ b/main/perl-encode-locale/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-encode-locale
 _realname=Encode-Locale
 pkgver=1.05
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl module - Determine the locale encoding"
 url="http://search.cpan.org/~gaas"
 arch="noarch"
@@ -14,21 +14,24 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_realname-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd $_builddir
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="fcfdb8e4ee34bcf62aed429b4a23db27  Encode-Locale-1.05.tar.gz"
-sha256sums="176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1  Encode-Locale-1.05.tar.gz"
 sha512sums="68ed5732fd3645eca2ea54080067677a48f90fc5a594a1b453a322f3127e67a984d539cb5fd41ac63a03b9dab693c070b65e3c70a2a677dc61b4634f3e212d06  Encode-Locale-1.05.tar.gz"
diff --git a/main/perl-file-listing/APKBUILD b/main/perl-file-listing/APKBUILD
index ec56794b56..36009c6e9f 100644
--- a/main/perl-file-listing/APKBUILD
+++ b/main/perl-file-listing/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-listing
 pkgver=6.04
-pkgrel=0
+pkgrel=1
 pkgdesc="File::Listing perl module"
 url="http://search.cpan.org/dist/File-Listing/"
 arch="noarch"
@@ -14,26 +14,22 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-$pkgver.tar.gz"
 
-_builddir="$srcdir"/File-Listing-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/File-Listing-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
index b08c87016b..086a0f0646 100644
--- a/main/perl-html-parser/APKBUILD
+++ b/main/perl-html-parser/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-html-parser
 _pkgreal=HTML-Parser
 pkgver=3.72
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML parser class"
 url="http://search.cpan.org/dist/HTML-Parser/"
 arch="all"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="eb7505e5f626913350df9dd4a03d54a8  HTML-Parser-3.72.tar.gz"
-sha256sums="ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b  HTML-Parser-3.72.tar.gz"
 sha512sums="9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716  HTML-Parser-3.72.tar.gz"
diff --git a/main/perl-html-tagset/APKBUILD b/main/perl-html-tagset/APKBUILD
index 216d110904..7b3ea29456 100644
--- a/main/perl-html-tagset/APKBUILD
+++ b/main/perl-html-tagset/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-html-tagset
 _pkgreal=HTML-Tagset
 pkgver=3.20
-pkgrel=0
+pkgrel=1
 pkgdesc="data tables useful in parsing HTML"
 url="http://search.cpan.org/dist/HTML-Tagset/"
 arch="noarch"
@@ -16,21 +16,26 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	make && make test
+	cd "$builddir"
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-http-cookies/APKBUILD b/main/perl-http-cookies/APKBUILD
index a3cf80694e..306ae287cb 100644
--- a/main/perl-http-cookies/APKBUILD
+++ b/main/perl-http-cookies/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-cookies
 pkgver=6.01
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP::Cookies perl module"
 url="http://search.cpan.org/dist/HTTP-Cookies/"
 arch="noarch"
@@ -14,26 +14,22 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Cookies-$pkgver.tar.gz"
 
-_builddir="$srcdir"/HTTP-Cookies-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/HTTP-Cookies-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-http-daemon/APKBUILD b/main/perl-http-daemon/APKBUILD
index 8269b2f19f..4b0b0e3578 100644
--- a/main/perl-http-daemon/APKBUILD
+++ b/main/perl-http-daemon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-daemon
 pkgver=6.01
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP::Daemon perl module"
 url="http://search.cpan.org/dist/HTTP-Daemon/"
 arch="noarch"
@@ -14,27 +14,21 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-$pkgver.tar.gz"
 
-_builddir="$srcdir"/HTTP-Daemon-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+builddir="$srcdir"/HTTP-Daemon-$pkgver
+build() {
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	# make test || return 1
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-http-date/APKBUILD b/main/perl-http-date/APKBUILD
index 3eacf8f06e..c92ec48c72 100644
--- a/main/perl-http-date/APKBUILD
+++ b/main/perl-http-date/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-http-date
 _realname=HTTP-Date
 pkgver=6.02
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl module date conversion routines"
 url="http://search.cpan.org/~gaas"
 arch="noarch"
@@ -15,16 +15,21 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_realname-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd $_builddir
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-http-message/APKBUILD b/main/perl-http-message/APKBUILD
index 603106053f..e7ecfc9060 100644
--- a/main/perl-http-message/APKBUILD
+++ b/main/perl-http-message/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-http-message
 _pkgreal=HTTP-Message
 pkgver=6.11
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP style messages"
 url="http://search.cpan.org/dist/HTTP-Message/"
 arch="noarch"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="4ed7add10daea3ab30abfeab6d03872f  HTTP-Message-6.11.tar.gz"
-sha256sums="e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b  HTTP-Message-6.11.tar.gz"
 sha512sums="6fc923b7dbdcce7269a03700a8776fe85522287f409fffac40936a77d951a70d957642eda8d2a0367af60d176c89654b3bb6249c23f458c0cd9d44031e6b6dc2  HTTP-Message-6.11.tar.gz"
diff --git a/main/perl-http-negotiate/APKBUILD b/main/perl-http-negotiate/APKBUILD
index 1ae0ddd923..125edce67d 100644
--- a/main/perl-http-negotiate/APKBUILD
+++ b/main/perl-http-negotiate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-negotiate
 pkgver=6.01
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP::Negotiate perl module"
 url="http://search.cpan.org/dist/HTTP-Negotiate/"
 arch="noarch"
@@ -13,26 +13,22 @@ install=""
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz"
 
-_builddir="$srcdir"/HTTP-Negotiate-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/HTTP-Negotiate-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-io-html/APKBUILD b/main/perl-io-html/APKBUILD
index 29c524aa2e..f625824539 100644
--- a/main/perl-io-html/APKBUILD
+++ b/main/perl-io-html/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-io-html
 _pkgreal=IO-HTML
 pkgver=1.001
-pkgrel=0
+pkgrel=1
 pkgdesc="Open an HTML file with automatic charset detection"
 url="http://search.cpan.org/dist/IO-HTML/"
 arch="noarch"
@@ -15,26 +15,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="3f8958718844dc96b9f6946f21d70d22  IO-HTML-1.001.tar.gz"
-sha256sums="ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0  IO-HTML-1.001.tar.gz"
 sha512sums="fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52  IO-HTML-1.001.tar.gz"
diff --git a/main/perl-lwp-mediatypes/APKBUILD b/main/perl-lwp-mediatypes/APKBUILD
index 8f173f2232..174074fe9f 100644
--- a/main/perl-lwp-mediatypes/APKBUILD
+++ b/main/perl-lwp-mediatypes/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-lwp-mediatypes
 _realname=LWP-MediaTypes
 pkgver=6.02
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl module - guess media type for a file or a URL"
 url="http://search.cpan.org/~gaas"
 arch="noarch"
@@ -15,16 +15,21 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_realname-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd $_builddir
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-net-http/APKBUILD b/main/perl-net-http/APKBUILD
index 854f04b956..33f146f3e2 100644
--- a/main/perl-net-http/APKBUILD
+++ b/main/perl-net-http/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-http
 pkgver=6.09
-pkgrel=0
+pkgrel=1
 pkgdesc="Net::HTTP perl module"
 url="http://search.cpan.org/dist/Net-HTTP/"
 arch="noarch"
@@ -14,29 +14,23 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Net-HTTP-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Net-HTTP-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Net-HTTP-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="3d84d17f64c7316d69e7eb7b4e292b9a  Net-HTTP-6.09.tar.gz"
-sha256sums="52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d  Net-HTTP-6.09.tar.gz"
 sha512sums="ae36c8367206f18190237f9c6db417054b78f99cfa79cc651550d3612505faf9d31e415c8b32e7f87f4fd389ccaa0e23f62c3781f6f27485b7296b2fe48d7e45  Net-HTTP-6.09.tar.gz"
diff --git a/main/perl-test-fatal/APKBUILD b/main/perl-test-fatal/APKBUILD
index 7b60f0fe30..dd4466ba9b 100644
--- a/main/perl-test-fatal/APKBUILD
+++ b/main/perl-test-fatal/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-fatal
 _pkgreal=Test-Fatal
 pkgver=0.014
-pkgrel=0
+pkgrel=1
 pkgdesc="incredibly simple helpers for testing code with exceptions"
 url="http://search.cpan.org/dist/Test-Fatal/"
 arch="noarch"
@@ -16,24 +16,27 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	make && make test
+	cd "$builddir"
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="7954f6d2e3607be10c0fbd69063a3d1b  Test-Fatal-0.014.tar.gz"
-sha256sums="bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0  Test-Fatal-0.014.tar.gz"
 sha512sums="339d9b33231f8c8d93c0f9374a51458d004568a2f3e28471976e954c35d27efd348f68fb56e3cabd11dc47d37e7ce46282eba967c156ba5081811d221c6a7523  Test-Fatal-0.014.tar.gz"
diff --git a/main/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD
index d1d7b7bfdb..bfe9fb7676 100644
--- a/main/perl-try-tiny/APKBUILD
+++ b/main/perl-try-tiny/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-try-tiny
 _pkgreal=Try-Tiny
 pkgver=0.22
-pkgrel=0
+pkgrel=1
 pkgdesc="unknown"
 url="http://search.cpan.org/dist/Try-Tiny/"
 arch="noarch"
@@ -16,24 +16,27 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	make && make test
+	cd "$builddir"
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="6769658bfbca241a470206c9a8819ff2  Try-Tiny-0.22.tar.gz"
-sha256sums="60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19  Try-Tiny-0.22.tar.gz"
 sha512sums="4e39b4da16480bb2b93c05e8e016e9d1b5a68f29c527b19bbf9333442ca708e88dd2720a5812d141a152ae088ed1fcb1ce179018c2d0fe105545256396b2ccc4  Try-Tiny-0.22.tar.gz"
diff --git a/main/perl-uri/APKBUILD b/main/perl-uri/APKBUILD
index 1b20d132e2..5cc3a5e530 100644
--- a/main/perl-uri/APKBUILD
+++ b/main/perl-uri/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-uri
 pkgver=1.71
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl Module: form Resource Identifiers (absolute and relative)"
 url="http://search.cpan.org/dist/URI/"
 arch="noarch"
@@ -12,19 +12,24 @@ makedepends="perl-dev"
 replaces="perl-uri-escape"
 source="http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-$pkgver.tar.gz"
 
+builddir="$srcdir"/URI-$pkgver
 
 build() {
-	cd "$srcdir"/URI-$pkgver
-	perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	cd "$builddir"
+	perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$srcdir"/URI-$pkgver
-	make install DESTDIR="$pkgdir" || return 1
+	cd "$builddir"
+	make install DESTDIR="$pkgdir"
 	find "$pkgdir" -name perllocal.pod -delete
 	find "$pkgdir" -name .packlist -delete
 }
-md5sums="247c3da29a794f72730e01aa5a715daf  URI-1.71.tar.gz"
-sha256sums="9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115  URI-1.71.tar.gz"
+
 sha512sums="db412b75054a4d315eb861060fa4641832c2428b9dfe56bbe35f530c9ba572d4de2061d9782454750293dd5a64f3375830988d8512f410e84a9d599c80458405  URI-1.71.tar.gz"
diff --git a/main/perl-www-robotrules/APKBUILD b/main/perl-www-robotrules/APKBUILD
index 6ea48d65f7..7c13364fb5 100644
--- a/main/perl-www-robotrules/APKBUILD
+++ b/main/perl-www-robotrules/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-www-robotrules
 pkgver=6.02
-pkgrel=0
+pkgrel=1
 pkgdesc="WWW::RobotRules perl module"
 url="http://search.cpan.org/dist/WWW-RobotRules/"
 arch="noarch"
@@ -14,26 +14,22 @@ replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz"
 
-_builddir="$srcdir"/WWW-RobotRules-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/WWW-RobotRules-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-xml-parser/APKBUILD b/main/perl-xml-parser/APKBUILD
index 0a2792fe41..dbae4556a2 100644
--- a/main/perl-xml-parser/APKBUILD
+++ b/main/perl-xml-parser/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-xml-parser
 _pkgreal=XML-Parser
 pkgver=2.44
-pkgrel=3
+pkgrel=4
 pkgdesc="A perl module for parsing XML documents"
 url="http://search.cpan.org/dist/XML-Parser/"
 arch="all"
@@ -15,24 +15,27 @@ makedepends="perl-dev expat-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	make && make test
+	cd "$builddir"
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="af4813fe3952362451201ced6fbce379  XML-Parser-2.44.tar.gz"
-sha256sums="1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216  XML-Parser-2.44.tar.gz"
 sha512sums="4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61  XML-Parser-2.44.tar.gz"