aboutsummaryrefslogtreecommitdiffstats
path: root/testing/moreutils
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2017-02-19 23:10:11 +0100
committerTimo Teräs <timo.teras@iki.fi>2017-02-21 06:38:48 +0000
commitaf7ac9fbe296060f2ea7a5067edb298e7c31a3a2 (patch)
tree089a81e9634cd8e948e382163a6edd063527274e /testing/moreutils
parent6a0effbc27e60786f69951820d24e4f57feaa4fe (diff)
downloadaports-af7ac9fbe296060f2ea7a5067edb298e7c31a3a2.tar.bz2
aports-af7ac9fbe296060f2ea7a5067edb298e7c31a3a2.tar.xz
testing/moreutils: upgrade to 0.60 and modernize abuild
Update docbook-xsl.patch
Diffstat (limited to 'testing/moreutils')
-rw-r--r--testing/moreutils/APKBUILD19
-rw-r--r--testing/moreutils/docbook-xsl.patch20
2 files changed, 15 insertions, 24 deletions
diff --git a/testing/moreutils/APKBUILD b/testing/moreutils/APKBUILD
index dbc66b43d1..a095d09dc9 100644
--- a/testing/moreutils/APKBUILD
+++ b/testing/moreutils/APKBUILD
@@ -1,21 +1,18 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=moreutils
-pkgver=0.59
+pkgver=0.60
pkgrel=0
pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago"
url="http://joeyh.name/code/moreutils/"
arch="all"
license="GPL"
depends="perl perl-timedate perl-ipc-run"
-depends_dev=""
-makedepends="$depends_dev docbook-xsl docbook-xml perl-xml-sax libxslt-dev linux-headers"
-install=""
+makedepends="perl-dev docbook-xsl docbook-xml perl-xml-sax libxslt-dev linux-headers"
subpackages="$pkgname-doc"
-source="http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.orig.tar.gz
+source="http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.orig.tar.xz
docbook-xsl.patch"
-
-builddir="$srcdir"/$pkgname-$pkgver.orig
+builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$builddir"
@@ -31,9 +28,5 @@ package() {
mv $pkgdir/usr/bin/parallel $pkgdir/usr/bin/parallel-moreutils
}
-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"
+sha512sums="3fb5d8e140a90d805c4cd0de74248a5ea830ba8f90c56afdeb537391c32984cbb9701d4d9caf187a5f9284dfe791d1f7a333af3aac2a4860e2041c414e5cb788 moreutils_0.60.orig.tar.xz
+38c0088c2c637ac1cc809c16b7a2fb386a67d88a7aca2aef458203de3599fe6258c80ab0b5edfbb534203d71510c4d37abe4ebe23427273a4ccecf305736c9e3 docbook-xsl.patch"
diff --git a/testing/moreutils/docbook-xsl.patch b/testing/moreutils/docbook-xsl.patch
index 12df92ad4d..e10f90e608 100644
--- a/testing/moreutils/docbook-xsl.patch
+++ b/testing/moreutils/docbook-xsl.patch
@@ -1,13 +1,11 @@
-diff --git a/Makefile b/Makefile
-index 54b71ee..ce463c1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -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
+--- a/Makefile 2017-02-19 20:44:09.469193976 +0100
++++ b/Makefile 2017-02-19 20:44:32.302484346 +0100
+@@ -8,7 +8,7 @@
+ ifneq (,$(findstring CYGWIN,$(shell uname)))
+ DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets
+ else
+- DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl
++ DOCBOOKXSL?=/usr/share/xml/docbook/xsl-stylesheets-1.79.1
+ endif
DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 $(DOCBOOKXSL)/manpages/docbook.xsl
-