Mail archive
alpine-aports

[alpine-aports] [PATCH 4/9] main/s6: upgrade to 2.5.0.0

From: Ivan Tham <pickfire_at_riseup.net>
Date: Tue, 28 Mar 2017 17:29:04 +0800

---
 main/s6/APKBUILD | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)
diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index 0c087af832..c536b8193e 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
_at_@ -1,54 +1,39 @@
 # Maintainer: Laurent Bercot <ska-devel_at_skarnet.org>
 # Contributor: John Regan <john_at_jrjrtech.com>
 pkgname=s6
-pkgver=2.4.0.0
+pkgver=2.5.0.0
 pkgrel=0
 pkgdesc="skarnet.org's small & secure supervision software suite."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs execline"
-depends_dev="skalibs-dev execline-dev"
-makedepends="$depends_dev"
-install=""
+makedepends="skalibs-dev execline-dev"
+options="!check"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$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/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--libdir=/usr/lib \
 		--libexecdir="/lib/$pkgname" \
-		--with-dynlib=/lib \
-		|| return 1
-	make || return 1
+		--with-dynlib=/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 doc() {
 	default_doc
 	mkdir -p "$subpkgdir/usr/share/doc"
-	cp -a "$_builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-md5sums="d43d82d23ba2f4a00435648298bccc28  s6-2.4.0.0.tar.gz"
-sha256sums="5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560  s6-2.4.0.0.tar.gz"
-sha512sums="bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2  s6-2.4.0.0.tar.gz"
+sha512sums="ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94  s6-2.5.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Tue Mar 28 2017 - 17:29:04 GMT