From: Daniel Sabogal <dsabogalcc@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH 2/2] main/tiff: modernize abuild
Date: Thu, 29 Jun 2017 21:26:52 -0400
Message-Id: <20170630012652.9410-7-dsabogalcc@gmail.com>
In-Reply-To: <20170630012652.9410-1-dsabogalcc@gmail.com>
References: <20170630012652.9410-1-dsabogalcc@gmail.com>
Precedence: list

---
 main/tiff/APKBUILD | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index 8bf35393cd..7bd9266dea 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -12,8 +12,8 @@ depends=
 depends_dev="zlib-dev libjpeg-turbo-dev"
 makedepends="libtool autoconf automake $depends_dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
-source="http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz
-	"
+source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
 #   4.0.7-r3
@@ -34,22 +34,14 @@ source="http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz
 #   4.0.7-r1:
 #     - CVE-2017-5225
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	local _failed=
 	cd "$builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || _failed="$_failed $i";;
-		esac
-	done
+	update_config_sub
+	default_prepare
 }
 
 build() {
 	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -57,9 +49,13 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-cxx \
-		|| return 1
-	make || return 1
+		--disable-cxx
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-- 
2.13.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---