diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2016-05-30 07:58:18 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2016-05-30 07:58:18 +0000 |
| commit | 47dc2914c3bb2176237ca7c35c320dd40ef05137 (patch) | |
| tree | de61d8fdb9f03013f1a2d331dcdfa8cfb9b9c28c | |
| parent | d45f2e1fd6cf0b295b4ad35ee2bac4fc3c2f678e (diff) | |
| download | aports-47dc2914c3bb2176237ca7c35c320dd40ef05137.tar.bz2 aports-47dc2914c3bb2176237ca7c35c320dd40ef05137.tar.xz | |
testing/moreutils: upgrade to 0.59
| -rw-r--r-- | testing/moreutils/APKBUILD | 29 | ||||
| -rw-r--r-- | testing/moreutils/docbook-xsl.patch | 13 |
2 files changed, 16 insertions, 26 deletions
diff --git a/testing/moreutils/APKBUILD b/testing/moreutils/APKBUILD index 751bde6433..dbc66b43d1 100644 --- a/testing/moreutils/APKBUILD +++ b/testing/moreutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=moreutils -pkgver=0.58 +pkgver=0.59 pkgrel=0 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" url="http://joeyh.name/code/moreutils/" @@ -15,24 +15,15 @@ subpackages="$pkgname-doc" source="http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.orig.tar.gz docbook-xsl.patch" -_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.orig build() { - cd "$_builddir" + cd "$builddir" make } package() { - cd "$_builddir" + cd "$builddir" make PREFIX=$pkgdir/usr install chmod 0644 $pkgdir/usr/share/man/man1/* mv $pkgdir/usr/share/man/man1/ts.1 $pkgdir/usr/share/man/man1/ts.1moreutils @@ -40,9 +31,9 @@ package() { mv $pkgdir/usr/bin/parallel $pkgdir/usr/bin/parallel-moreutils } -md5sums="7dd0c1d06d723c1b402ff746be367623 moreutils_0.58.orig.tar.gz -f9bc7598ed6fc8f3395712ea94fd6144 docbook-xsl.patch" -sha256sums="9c4bba745518f1cc4d5594b1276793bd4f737fedb2e5b14beeab4b73f106c00a moreutils_0.58.orig.tar.gz -effb1f92995871cc87d1405e84fb438ca2b7e8f58630cc692aa7b6442b0b22cd docbook-xsl.patch" -sha512sums="4bbb250d34b33a295e35cb4c282843ecf608ce61b428f8aa145a39dd6433a7b5b22619fe078df48be8d7f54f11aabcbf3094dc0e1c7fcd80c136e4be63282c64 moreutils_0.58.orig.tar.gz -800217abc409e7304e39cef77a3d62eab921c924678ef5619e87a06d719af9bed85e3223dee305b42d28827201d4f970444c68a4eef6584ea22e39211a727942 docbook-xsl.patch" +md5sums="22b26cebe53afae604f74f4135628217 moreutils_0.59.orig.tar.gz +a8900e4699ffefb5393a954c6de0fe49 docbook-xsl.patch" +sha256sums="a48e11c3197bf79a7bfaa121423e64626e3381d9fedc91d606e9724ae498d1b4 moreutils_0.59.orig.tar.gz +7c83aaf6edf29cddb0c7eb1d57d5abf1999eee2dd21cd5279d8d68869d4a5b2e docbook-xsl.patch" +sha512sums="2cbe56a04476f5266bcb265c2c328ad61e2200eb1617ab632f1dcbefd08e0228652c82092cda7e12a539300cebf4550f766561f95de386ca4b3c2a491120f3ed moreutils_0.59.orig.tar.gz +3f8a85ff9445bab82db40cd8a210ea69597ec72bf263ce165cfe8da5bf15b2283cb1e840e86e0a710b4f6191616abad40e79ca0d2eb7029a4b7c1afcd3d91783 docbook-xsl.patch" diff --git a/testing/moreutils/docbook-xsl.patch b/testing/moreutils/docbook-xsl.patch index 67141beabc..12df92ad4d 100644 --- a/testing/moreutils/docbook-xsl.patch +++ b/testing/moreutils/docbook-xsl.patch @@ -1,14 +1,13 @@ diff --git a/Makefile b/Makefile -index 4f8af10..001c69b 100644 +index 54b71ee..ce463c1 100644 --- a/Makefile +++ b/Makefile -@@ -5,7 +5,8 @@ CFLAGS?=-O2 -g -Wall +@@ -4,7 +4,7 @@ MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun. + CFLAGS?=-O2 -g -Wall INSTALL_BIN?=install -s PREFIX?=/usr +-DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl ++DOCBOOKXSL?=/usr/share/xml/docbook/xsl-stylesheets-1.79.1 --DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl -+DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/xml/docbook/xsl-stylesheets-1.79.1/manpages/docbook.xsl -+ - - all: $(BINS) $(MANS) + DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 $(DOCBOOKXSL)/manpages/docbook.xsl |