community/perl-[t-y]: modernize APKBUILD

Changes:
- Move tests to check()
- Remove return 1
- rename _builddir to builddir

25 files changed, 271 insertions, 193 deletions

diff --git a/community/perl-template-toolkit/APKBUILD b/community/perl-template-toolkit/APKBUILD
index e326bb6c2d..52df68b276 100644
--- a/community/perl-template-toolkit/APKBUILD
+++ b/community/perl-template-toolkit/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-template-toolkit
 _pkgreal=Template-Toolkit
 pkgver=2.27
-pkgrel=1
+pkgrel=2
 pkgdesc="comprehensive template processing system"
 url="http://search.cpan.org/dist/Template-Toolkit/"
 arch="all"
@@ -16,27 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/A/AB/ABW/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+
+	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"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/community/perl-test-base/APKBUILD b/community/perl-test-base/APKBUILD
index 7794a4076a..d10f7d15c1 100644
--- a/community/perl-test-base/APKBUILD
+++ b/community/perl-test-base/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-base
 _pkgreal=Test-Base
 pkgver=0.88
-pkgrel=0
+pkgrel=1
 pkgdesc="A Data Driven Testing Framework"
 url="http://search.cpan.org/dist/Test-Base/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/$_pkgreal-$pkgver.tar.g
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,15 +28,18 @@ prepare() {
 build() {
 	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
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="ced0cd86b099f9fd2cd73df1f46ab5e9  Test-Base-0.88.tar.gz"
-sha256sums="52368cc5a9cbbc4eaba33ed820672f92001b73d8bcba0bb95d5fdb1d370b9039  Test-Base-0.88.tar.gz"
 sha512sums="59725ce38a55a82a336942ea36c0782560d4b3b04fbe6e4550f6e21074f18d622325d87bb2d7db0475b58999d8f9ee55579c4349004a5434b3c1980366dd71df  Test-Base-0.88.tar.gz"
diff --git a/community/perl-test-differences/APKBUILD b/community/perl-test-differences/APKBUILD
index 44f7b599ca..bf1d4dea7e 100644
--- a/community/perl-test-differences/APKBUILD
+++ b/community/perl-test-differences/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-differences
 _pkgreal=Test-Differences
 pkgver=0.64
-pkgrel=0
+pkgrel=1
 pkgdesc="Test strings and data structures and show differences if not ok"
 url="http://search.cpan.org/dist/Test-Differences/"
 arch="noarch"
@@ -15,25 +15,30 @@ depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/D/DC/DCANTRELL/$_pkgreal-$pkgver.tar.gz"
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+	default_prepare
+
+	cd "$builddir"
+	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+	cd "$builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	./Build
+}
+
+check() {
+        cd "$builddir"
+        ./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	cd "$builddir"
+	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="ecfda620fe133e36a6e392d94ab8424d  Test-Differences-0.64.tar.gz"
-sha256sums="9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276  Test-Differences-0.64.tar.gz"
 sha512sums="118a4b8e3f61f64d6676c82913bb605a843a408f3fc5d960b40cc86f10423380a203b2a5604e15ba8d4e0cff96af88b551fba1c7aa2ada3c0ef408a27ee5f069  Test-Differences-0.64.tar.gz"
diff --git a/community/perl-test-failwarnings/APKBUILD b/community/perl-test-failwarnings/APKBUILD
index 4d47127066..d4450ecaa7 100644
--- a/community/perl-test-failwarnings/APKBUILD
+++ b/community/perl-test-failwarnings/APKBUILD
@@ -4,13 +4,13 @@
 pkgname=perl-test-failwarnings
 _pkgreal=Test-FailWarnings
 pkgver=0.008
-pkgrel=0
+pkgrel=1
 pkgdesc="Add test failures if warnings are caught"
 url="http://search.cpan.org/dist/Test-FailWarnings/"
 arch="noarch"
 license="apache_2_0"
 cpandepends=""
-cpanmakedepends="  perl-capture-tiny "
+cpanmakedepends="perl-capture-tiny"
 depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.t
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,7 +28,12 @@ prepare() {
 build() {
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make
+}
+
+check() {
+        cd "$builddir"
+        make test
 }
 
 package() {
@@ -37,6 +42,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="c03d51f550dbfd9945722ff7f4c32717  Test-FailWarnings-0.008.tar.gz"
-sha256sums="da34ef9029f6849d6026201d49127d054ee6ac4b979c82210315f5721964a96f  Test-FailWarnings-0.008.tar.gz"
 sha512sums="7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51  Test-FailWarnings-0.008.tar.gz"
diff --git a/community/perl-test-mock-guard/APKBUILD b/community/perl-test-mock-guard/APKBUILD
index 9ff073a61e..c105e3e267 100644
--- a/community/perl-test-mock-guard/APKBUILD
+++ b/community/perl-test-mock-guard/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-test-mock-guard
 _pkgname=Test-Mock-Guard
 pkgver=0.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple mock test library using RAII"
 url="https://github.com/zigorou/p5-test-mock-guard"
 arch="noarch"
@@ -14,24 +14,27 @@ source="http://search.cpan.org/CPAN/authors/id/X/XA/XAICRON/$_pkgname-$pkgver.ta
 builddir="$srcdir/$_pkgname-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL --installdirs=vendor || return 1
+	perl Build.PL --installdirs=vendor
 }
 
 build() {
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	./Build && ./Build test
+	./Build
+}
+
+check() {
+        cd "$builddir"
+        ./Build test
 }
 
 package() {
 	cd "$builddir"
-	./Build install --destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="b2866485cc29c787f85793279e2f2360  Test-Mock-Guard-0.10.tar.gz"
-sha256sums="7f228a63f8d6ceb92aa784080a13e85073121b2835eca06d794f9709950dbd3d  Test-Mock-Guard-0.10.tar.gz"
 sha512sums="17a8cbfea9e33a625ad5a33b40b5a799715d59b57eb4030a9d694fdd1e7361667f326888577291f0807852b86c04b97384ab8a48d95eb92158d35e14131068cc  Test-Mock-Guard-0.10.tar.gz"
diff --git a/community/perl-test-mockrandom/APKBUILD b/community/perl-test-mockrandom/APKBUILD
index 3b001af6ea..e65f5aaeed 100644
--- a/community/perl-test-mockrandom/APKBUILD
+++ b/community/perl-test-mockrandom/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-mockrandom
 _pkgreal=Test-MockRandom
 pkgver=1.01
-pkgrel=0
+pkgrel=1
 pkgdesc="Replaces random number generation with non-random number generation"
 url="http://search.cpan.org/dist/Test-MockRandom/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.t
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,15 +28,18 @@ prepare() {
 build() {
 	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
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="5ea7e2ec70776129993721f7632d04da  Test-MockRandom-1.01.tar.gz"
-sha256sums="2614930d84fc5deac39afbc1ee86ccd39b221507f27d4ee493ca26e5c921cce0  Test-MockRandom-1.01.tar.gz"
 sha512sums="e222bd0d3d7673b403e80d1633ddaca0ee35f96f2245e8df859d661edc7efc09b9a96d3718f25b6614395d1f24d66c9498e842cec476cf8c5b12464d585f85e7  Test-MockRandom-1.01.tar.gz"
diff --git a/community/perl-test-most/APKBUILD b/community/perl-test-most/APKBUILD
index 996864d6c9..a94a3329fa 100644
--- a/community/perl-test-most/APKBUILD
+++ b/community/perl-test-most/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-test-most
 _pkgreal=Test-Most
 pkgver=0.35
-pkgrel=0
+pkgrel=1
 pkgdesc="unknown"
 url="http://search.cpan.org/dist/Test-Most/"
 arch="noarch"
@@ -15,26 +15,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/O/OV/OVID/$_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="03dbabd34d6f40af8bd47f5fbb0c6989  Test-Most-0.35.tar.gz"
-sha256sums="9897a6f4d751598d2ed1047e01c1554b01d0f8c96c45e7e845229782bf6f657f  Test-Most-0.35.tar.gz"
 sha512sums="1b2d201811e59d7afce47ff5f7da67c170d4685ffbec23360757b5cacc9fe72fc82609bc46cc9d8e351fdb75715696457c201dd94fadaeca70a6f31690236291  Test-Most-0.35.tar.gz"
diff --git a/community/perl-test-resub/APKBUILD b/community/perl-test-resub/APKBUILD
index aa9886d4fc..922410fc37 100644
--- a/community/perl-test-resub/APKBUILD
+++ b/community/perl-test-resub/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-resub
 _pkgreal=Test-Resub
 pkgver=2.03
-pkgrel=0
+pkgrel=1
 pkgdesc="Lexically scoped monkey patching for testing"
 url="http://search.cpan.org/dist/Test-Resub/"
 arch="noarch"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/K/KO/KOLYA/$_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="8af92b5ec6f3275c88f1a17616d8e8ae  Test-Resub-2.03.tar.gz"
-sha256sums="5bc04e7ff90b01c8677b0c3ddaf1be9382c6ace55ab25b0f72e3f935e570da52  Test-Resub-2.03.tar.gz"
 sha512sums="f8f5a51adc21296ee7902f029a1aeaf6c34d2c9ced908dad7ffe09b7256d05d222429aab47d5138e7b733456218441a4ea106e16968267ee3b4ad36850244c68  Test-Resub-2.03.tar.gz"
diff --git a/community/perl-test-weaken/APKBUILD b/community/perl-test-weaken/APKBUILD
index 1327a4603d..0dfef30749 100644
--- a/community/perl-test-weaken/APKBUILD
+++ b/community/perl-test-weaken/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-weaken
 _pkgreal=Test-Weaken
 pkgver=3.022000
-pkgrel=0
+pkgrel=1
 pkgdesc="Test that freed memory objects were, indeed, freed"
 url="http://search.cpan.org/dist/Test-Weaken/"
 arch="noarch"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/K/KR/KRYDE/$_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="67aa37a1de788bf40abf7dd07c787f6a  Test-Weaken-3.022000.tar.gz"
-sha256sums="2631a87121310262e0e96107a6fa0ed69487b7701520773bee5fa9accc295f5b  Test-Weaken-3.022000.tar.gz"
 sha512sums="07ed16a29c3de052cb0f5884fc06715e10e6214e46b4ed7f7d8524931da293a903ae283e2935c109ea1be9336aeb5d092403249d60730624c590e9e54b38ff1b  Test-Weaken-3.022000.tar.gz"
diff --git a/community/perl-test-yaml/APKBUILD b/community/perl-test-yaml/APKBUILD
index fa0f0c6f01..f34ee92426 100644
--- a/community/perl-test-yaml/APKBUILD
+++ b/community/perl-test-yaml/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-test-yaml
 _pkgreal=Test-YAML
 pkgver=1.06
-pkgrel=0
+pkgrel=1
 pkgdesc="Testing Module for YAML Implementations"
 url="http://search.cpan.org/dist/Test-YAML/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/I/IN/INGY/$_pkgreal-$pkgver.tar.g
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,7 +28,12 @@ prepare() {
 build() {
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make
+}
+
+check() {
+        cd "$builddir"
+        make test
 }
 
 package() {
@@ -37,6 +42,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="92e6ea57576428095fe3c9b8e00e6f29  Test-YAML-1.06.tar.gz"
-sha256sums="27376103163c12d7d13ae45bf22caf5a0c38478362425bf68613c3748f76b943  Test-YAML-1.06.tar.gz"
 sha512sums="f6fe4bf46a8cc5ea92b5275cc704e79266b11769bd476888b202540a6d9a23a59a2550503afd88a72f9832355e2b48983f6a31f60db07abe5b0e15f4e74ae2e2  Test-YAML-1.06.tar.gz"
diff --git a/community/perl-text-bibtex/APKBUILD b/community/perl-text-bibtex/APKBUILD
index eb02805d77..9e5810265c 100644
--- a/community/perl-text-bibtex/APKBUILD
+++ b/community/perl-text-bibtex/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-text-bibtex
 _pkgreal=Text-BibTeX
 pkgver=0.78
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl module for Text-BibTeX"
 url="http://search.cpan.org/dist/Text-BibTeX/"
 arch="all"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/A/AM/AMBS/$_pkgreal-$pkgver.tar.g
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	if [ -e Build.PL ]; then
@@ -29,17 +29,20 @@ prepare() {
 }
 
 build() {
-    cd "$builddir"
-    export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-    ./Build && ./Build test
+	cd "$builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	./Build
+}
+
+check() {
+        cd "$builddir"
+        ./Build test
 }
 
 package() {
     cd "$builddir"
-    ./Build install destdir="$pkgdir" || return 1
+    ./Build install destdir="$pkgdir"
     find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="551a25463dbf6349df9a158484d5a6c5  Text-BibTeX-0.78.tar.gz"
-sha256sums="53036462b539ee7401eecb38d8fb78f8c6b724917890aa2a243ab176461adad1  Text-BibTeX-0.78.tar.gz"
 sha512sums="b888e2273db40a104a1206462b172587140389aa69eb725db589f137a532b87958182bf31734f873bc5f1dec2f6bedc6ed93c0e40ed82c014a0aff3f573242b5  Text-BibTeX-0.78.tar.gz"
diff --git a/community/perl-text-diff/APKBUILD b/community/perl-text-diff/APKBUILD
index 5cfdfe2722..2b25867abd 100644
--- a/community/perl-text-diff/APKBUILD
+++ b/community/perl-text-diff/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-text-diff
 _pkgreal=Text-Diff
 pkgver=1.45
-pkgrel=0
+pkgrel=1
 pkgdesc="Perform diffs on files and record sets"
 url="http://search.cpan.org/dist/Text-Diff/"
 arch="noarch"
@@ -16,21 +16,26 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/$_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/community/perl-text-glob/APKBUILD b/community/perl-text-glob/APKBUILD
index 60c786bc03..3a4aac7d88 100644
--- a/community/perl-text-glob/APKBUILD
+++ b/community/perl-text-glob/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-text-glob
 _pkgreal=Text-Glob
 pkgver=0.11
-pkgrel=0
+pkgrel=1
 pkgdesc="match globbing patterns against text"
 url="http://search.cpan.org/dist/Text-Glob/"
 arch="noarch"
@@ -16,10 +16,10 @@ makedepends="perl-dev $cpanmakedepends perl-module-build"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	if [ -e Build.PL ]; then
 		perl Build.PL installdirs=vendor || return 1
 	else
@@ -28,13 +28,18 @@ prepare() {
 }
 
 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/community/perl-text-roman/APKBUILD b/community/perl-text-roman/APKBUILD
index cee9df66c9..1a292d8f9a 100644
--- a/community/perl-text-roman/APKBUILD
+++ b/community/perl-text-roman/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-text-roman
 _pkgreal=Text-Roman
 pkgver=3.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Allows conversion between Roman and Arabic algarisms."
 url="http://search.cpan.org/dist/Text-Roman/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/S/SY/SYP/$_pkgreal-$pkgver.tar.gz
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,7 +28,12 @@ prepare() {
 build() {
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make
+}
+
+check() {
+        cd "$builddir"
+        make test
 }
 
 package() {
@@ -37,6 +42,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="1f6b09c0cc1f4425b565ff787a39fd83  Text-Roman-3.5.tar.gz"
-sha256sums="cb4a08a3b151802ffb2fce3258a416542ab81db0f739ee474a9583ffb73e046a  Text-Roman-3.5.tar.gz"
 sha512sums="597ca054094f58c0983c66ce2b22dbc4d69861b02495663987e6b66dc0044a0d7e18e51ef817ed3c76832d283c01c6f9f51e68af7cb6b186b27553b5a877bc33  Text-Roman-3.5.tar.gz"
diff --git a/community/perl-tie-hash-method/APKBUILD b/community/perl-tie-hash-method/APKBUILD
index a263ac54ac..9e7630fdf9 100644
--- a/community/perl-tie-hash-method/APKBUILD
+++ b/community/perl-tie-hash-method/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-tie-hash-method
 _pkgreal=Tie-Hash-Method
 pkgver=0.02
-pkgrel=0
+pkgrel=1
 pkgdesc="Tied hash with specific methods overriden by callbacks"
 url="http://search.cpan.org/dist/Tie-Hash-Method/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/Y/YV/YVES/$_pkgreal-$pkgver.tar.g
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,15 +28,18 @@ prepare() {
 build() {
 	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
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="d7ca97ed34a31ae9dc90f666be5f1151  Tie-Hash-Method-0.02.tar.gz"
-sha256sums="d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9  Tie-Hash-Method-0.02.tar.gz"
 sha512sums="e32e911310dfbe066167a8750f9e9a4c5b277c4666addaf3a6b00851ef47e190c88195c394b8778b38e570001ada38f00d78b2ca4fa32498bf8fbb1f94b82424  Tie-Hash-Method-0.02.tar.gz"
diff --git a/community/perl-try-tiny/APKBUILD b/community/perl-try-tiny/APKBUILD
index d418026e8c..80613159dc 100644
--- a/community/perl-try-tiny/APKBUILD
+++ b/community/perl-try-tiny/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-try-tiny
 _pkgreal=Try-Tiny
 pkgver=0.28
-pkgrel=0
+pkgrel=1
 pkgdesc="minimal try/catch with proper preservation of $@"
 url="http://search.cpan.org/dist/Try-Tiny/"
 arch="noarch"
@@ -16,23 +16,28 @@ 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
 }
 
diff --git a/community/perl-unicode-string/APKBUILD b/community/perl-unicode-string/APKBUILD
index 2c7fb96ff5..aa5e88f30b 100644
--- a/community/perl-unicode-string/APKBUILD
+++ b/community/perl-unicode-string/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-unicode-string
 _pkgreal=Unicode-String
 pkgver=2.09
-pkgrel=5
+pkgrel=6
 pkgdesc="String of Unicode characters for perl (UCS2/UTF16)"
 url="http://search.cpan.org/dist/Unicode-String/"
 arch="all"
@@ -18,34 +18,32 @@ source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.g
 	perl-Unicode-String-2.09-undefined.patch
 	"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+
+	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="553e68e603723bf7c631f8701ab0d678  Unicode-String-2.09.tar.gz
-b08a47f2bd8b046a98fe4951f3eb6e43  perl-Unicode-String-2.09-undefined.patch"
-sha256sums="c817bedb954ea2d488bade56059028b99e0198f6826482e2f68fd6d78653faad  Unicode-String-2.09.tar.gz
-7128483d06c846a9fbfbc1dc501b755b879914885f12559fec30ac4f6fb12d39  perl-Unicode-String-2.09-undefined.patch"
 sha512sums="88bd5fe4a1e8ac05b7da5f75411f3e2cb17fb756ca926ace7f46d047ba7a7f22e54462efb61c2f0bf651d2c63d6fe74bffa8b7bcf49aa59847135a43b5cde759  Unicode-String-2.09.tar.gz
 b25a6c91d5ecc11dd3c8a675024111a3dfadaf3b22f2b3000f5fb3f7e79741b28aafa709b3c72ff7e6f4f936d8fbc38f50ca5994513b47badb57a31872e99450  perl-Unicode-String-2.09-undefined.patch"
diff --git a/community/perl-universal-moniker/APKBUILD b/community/perl-universal-moniker/APKBUILD
index e8d71b1d8d..5f32892b36 100644
--- a/community/perl-universal-moniker/APKBUILD
+++ b/community/perl-universal-moniker/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-universal-moniker
 _pkgreal=UNIVERSAL-moniker
 pkgver=0.08
-pkgrel=0
+pkgrel=1
 pkgdesc="unknown"
 url="http://search.cpan.org/dist/UNIVERSAL-moniker/"
 arch="noarch"
@@ -16,21 +16,26 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/$_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/community/perl-xml-libxml-simple/APKBUILD b/community/perl-xml-libxml-simple/APKBUILD
index ef74c4ffd3..19ce13eacd 100644
--- a/community/perl-xml-libxml-simple/APKBUILD
+++ b/community/perl-xml-libxml-simple/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-xml-libxml-simple
 _pkgreal=XML-LibXML-Simple
 pkgver=0.97
-pkgrel=0
+pkgrel=1
 pkgdesc="XML::LibXML based XML::Simple clone"
 url="http://search.cpan.org/dist/XML-LibXML-Simple/"
 arch="noarch"
@@ -18,7 +18,7 @@ source="http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/$_pkgreal-$pkgver.tar
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -28,7 +28,12 @@ prepare() {
 build() {
 	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make
+}
+
+check() {
+        cd "$builddir"
+        make test
 }
 
 package() {
diff --git a/community/perl-xml-libxslt/APKBUILD b/community/perl-xml-libxslt/APKBUILD
index 792dbeb6d0..0144a62941 100644
--- a/community/perl-xml-libxslt/APKBUILD
+++ b/community/perl-xml-libxslt/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-xml-libxslt
 _pkgreal=XML-LibXSLT
 pkgver=1.95
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to GNOME libxslt library"
 url="http://search.cpan.org/dist/XML-LibXSLT/"
 arch="all"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends libxml2-dev libxslt-dev libgcrypt-dev lib
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_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="adf26f5195e18087c89ef3e7f7d97c43  XML-LibXSLT-1.95.tar.gz"
-sha256sums="f1ca21135acc53af9f175958ef5fceb453fd0ef383cfb0e6ef6ea24031f3ef35  XML-LibXSLT-1.95.tar.gz"
 sha512sums="06a1c9896a391be2588995f25520da05f086b3fa79109884131525a0d76a7b375e0c5a2febf8a79a888f3a9bd25b5eb39064de1baeffafcfe18f5576c9c54e19  XML-LibXSLT-1.95.tar.gz"
diff --git a/community/perl-xml-treepp/APKBUILD b/community/perl-xml-treepp/APKBUILD
index 3a2c0c5696..a8db16eca4 100644
--- a/community/perl-xml-treepp/APKBUILD
+++ b/community/perl-xml-treepp/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-xml-treepp
 _pkgreal=XML-TreePP
 pkgver=0.43
-pkgrel=0
+pkgrel=1
 pkgdesc="Pure Perl implementation for parsing/writing XML documents"
 url="http://search.cpan.org/dist/XML-TreePP/"
 arch="noarch"
@@ -16,26 +16,29 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/K/KA/KAWASAKI/$_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="f69693066e52591bf1142d3f4e6d37e5  XML-TreePP-0.43.tar.gz"
-sha256sums="7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760  XML-TreePP-0.43.tar.gz"
 sha512sums="4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1  XML-TreePP-0.43.tar.gz"
diff --git a/community/perl-xml-twig/APKBUILD b/community/perl-xml-twig/APKBUILD
index 205c90e777..71fa4b6270 100644
--- a/community/perl-xml-twig/APKBUILD
+++ b/community/perl-xml-twig/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-xml-twig
 _pkgreal=XML-Twig
 pkgver=3.52
-pkgrel=0
+pkgrel=1
 pkgdesc="XML, The Perl Way"
 url="http://search.cpan.org/dist/XML-Twig/"
 arch="noarch"
@@ -16,24 +16,27 @@ makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/M/MI/MIROD/$_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="14fbaf5ea8729b797ada51a880b6720e  XML-Twig-3.52.tar.gz"
-sha256sums="fef75826c24f2b877d0a0d2645212fc4fb9756ed4d2711614ac15c497e8680ad  XML-Twig-3.52.tar.gz"
 sha512sums="1594e127fb76c0e53d0bd1f0a12fe3874c9523dd2bc55675d5a6cf44d5682ddea481671f786d3a65e6b69f5307c4da1701529f318453a1f8a22685b2dae793a6  XML-Twig-3.52.tar.gz"
diff --git a/community/perl-xml-writer/APKBUILD b/community/perl-xml-writer/APKBUILD
index b2c04934d8..7b11f55dbd 100644
--- a/community/perl-xml-writer/APKBUILD
+++ b/community/perl-xml-writer/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-xml-writer
 _realname=XML-Writer
 pkgver=0.625
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl extension for writing XML documents"
 url="http://search.cpan.org/~josephw/XML-Writer-0.625/"
 arch="noarch"
@@ -15,20 +15,18 @@ install=""
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/J/JO/JOSEPHW/$_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 || return 1
+	cd "$builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
 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="b9c2420c243c6a36ce45a008740fcede  XML-Writer-0.625.tar.gz"
-sha256sums="e080522c6ce050397af482665f3965a93c5d16f5e81d93f6e2fe98084ed15fbe  XML-Writer-0.625.tar.gz"
 sha512sums="30ad348e7f1423ce82dc0709e767d4ae384ad6e76f6444c8a12d97b1dc9c2b39e2c5bec43779bc35891942fa75f852cd26e8831dd6b5cfb9c72bc8512ca55923  XML-Writer-0.625.tar.gz"
diff --git a/community/perl-xml-xpath/APKBUILD b/community/perl-xml-xpath/APKBUILD
index b5535184f2..08533871c7 100644
--- a/community/perl-xml-xpath/APKBUILD
+++ b/community/perl-xml-xpath/APKBUILD
@@ -4,8 +4,8 @@
 pkgname=perl-xml-xpath
 _pkgreal=XML-XPath
 pkgver=1.40
-pkgrel=0
-pkgdesc="a set of modules for parsing and evaluating XPath statements"
+pkgrel=1
+pkgdesc="A set of modules for parsing and evaluating XPath statements"
 url="http://search.cpan.org/dist/XML-XPath/"
 arch="noarch"
 license="GPL PerlArtistic"
@@ -24,7 +24,12 @@ prepare() {
 
 build() {
 	cd "$builddir"
-	make && make test
+	make
+}
+
+check() {
+        cd "$builddir"
+        make test
 }
 
 package() {
diff --git a/community/perl-yaml-tiny/APKBUILD b/community/perl-yaml-tiny/APKBUILD
index c8cf3e79a6..4168769f77 100644
--- a/community/perl-yaml-tiny/APKBUILD
+++ b/community/perl-yaml-tiny/APKBUILD
@@ -3,38 +3,41 @@
 pkgname=perl-yaml-tiny
 _pkgreal=YAML-Tiny
 pkgver=1.70
-pkgrel=0
+pkgrel=1
 pkgdesc="Read/Write YAML files with as little code as possible"
 url="http://search.cpan.org/dist/YAML-Tiny/"
 arch="noarch"
 license="GPL PerlArtistic"
 cpandepends=""
-cpanmakedepends="   perl-json-maybexs"
+cpanmakedepends="perl-json-maybexs"
 depends="$cpandepends"
 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"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="a475714e8d512aafc410ca4d7a117aa2  YAML-Tiny-1.70.tar.gz"
-sha256sums="bbce4b52b5eafdb04e3043975a08dbf394d00b7d2c958adb9d03d9f7e9291255  YAML-Tiny-1.70.tar.gz"
 sha512sums="a4d790f8d797170fac819640d23a3ddc62b506ac9467d8922ed2ca8f1abacf5a6ba7604e5312f6539a3c9e4aa8c41ccd91754ca32f74bf8b0d89a9d84e4b4f53  YAML-Tiny-1.70.tar.gz"