diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-03-17 15:34:27 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-03-17 15:37:30 +0100 |
| commit | c7ac00153d74991a1d1736eee3e5fc019484014d (patch) | |
| tree | d582b649b130da169ca0f230adc4a82138c94650 | |
| parent | f5a3a019b59e6ceb385e4508411389af33e14098 (diff) | |
| download | aports-c7ac00153d74991a1d1736eee3e5fc019484014d.tar.bz2 aports-c7ac00153d74991a1d1736eee3e5fc019484014d.tar.xz | |
main/patch: rebuild to fix install_if rule for -doc subpackage
Since abuild version 2.24.0 the install_if variable for the default
subpackage was modified to automatically pull in -doc subpackages when
the package 'docs' is installed.
While we are here also do some tiny cleanups.
| -rw-r--r-- | main/patch/APKBUILD | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD index e2a0b2959f..f6648ba890 100644 --- a/main/patch/APKBUILD +++ b/main/patch/APKBUILD @@ -1,43 +1,41 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=patch pkgver=2.7.5 -pkgrel=0 +pkgrel=1 pkgdesc="Utility to apply diffs to files" url="http://www.gnu.org/software/patch/patch.html" arch="all" -license='GPL' -depends= -source="ftp://ftp.gnu.org/gnu/patch/patch-$pkgver.tar.xz" +license="GPL" +depends="" +depends_dev="" +makedepends="" +install="" subpackages="$pkgname-doc" -install= +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz" _builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - build() { cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-nls \ || return 1 make || return 1 } package() { - cd "$_builddir" - make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install - rm -rf "$pkgdir"/usr/lib/charset.alias - rmdir -p "$pkgdir"/usr/lib 2>/dev/null - return 0 + make prefix="$pkgdir"/usr \ + mandir="$pkgdir"/usr/share/man \ + -C "$_builddir" install || return 1 + + rm -f "$pkgdir"/usr/lib/charset.alias + rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } md5sums="e3da7940431633fb65a01b91d3b7a27a patch-2.7.5.tar.xz" |