From 69353e6762308b31206a40f24b5fdfb64c5fd370 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 3 Sep 2017 16:32:30 -0500
Subject: main/perl-json: modernise, fix test suite

---
 main/perl-json/APKBUILD | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'main/perl-json')

diff --git a/main/perl-json/APKBUILD b/main/perl-json/APKBUILD
index 5c2ecdcf4f..dbe55346df 100644
--- a/main/perl-json/APKBUILD
+++ b/main/perl-json/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=perl-json
 _pkgreal=JSON
 pkgver=2.90
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl module implementing a JSON encoder/decoder"
 url="http://search.cpan.org/dist/JSON/"
 arch="noarch"
@@ -14,16 +14,22 @@ install=""
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$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 -delete
         find "$pkgdir" -name .packlist -delete
 }
-- 
cgit v1.2.3