From 4fa76f61972d158170679a6107c5749ac671deb0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 Feb 2016 20:38:12 +0100 Subject: [PATCH 1/3] mtree: update distfiles/fix update check --- srcpkgs/mtree/template | 12 +++++++++--- srcpkgs/mtree/update | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 srcpkgs/mtree/update diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index db246bf6308..ed85eebfe8e 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -2,14 +2,20 @@ pkgname=mtree version=1.0.2 revision=5 +wrksrc="${pkgname}-port-${version}" build_style=gnu-configure +hostmakedepends="automake" makedepends="libressl-devel" short_desc="Utility for creating and verifying file hierarchies" maintainer="Christian Neukirchen " license="3-clause-BSD" -homepage="https://code.google.com/p/mtree-port/" -distfiles="https://s3.amazonaws.com/archie-public/mtree-port/${pkgname}-${version}.tar.gz" -checksum=f69b8f249fac99cc97fd401c7d1d2539128231cbc49c2252c4868b441bbb403b +homepage="https://github.com/archiecobbs/mtree-port/" +distfiles="https://github.com/archiecobbs/mtree-port/archive/${version}.tar.gz" +checksum=c74d23c658fb4c362092e89b5b20de8f979b48e063f297f7e7ef4658e1797c1d + +pre_configure() { + ./autogen.sh +} post_install() { rm -rf ${DESTDIR}/usr/share/doc/packages/mtree diff --git a/srcpkgs/mtree/update b/srcpkgs/mtree/update deleted file mode 100644 index d51313f0873..00000000000 --- a/srcpkgs/mtree/update +++ /dev/null @@ -1 +0,0 @@ -site="https://code.google.com/p/mtree-port/wiki/Downloads?tm=2" From b7b3d1765204ca130ce16151382c30ef22f84c53 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 Feb 2016 20:38:39 +0100 Subject: [PATCH 2/3] mtree: update to 1.0.3. --- srcpkgs/mtree/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index ed85eebfe8e..8f6f2bce1ff 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -1,7 +1,7 @@ # Template file for 'mtree' pkgname=mtree -version=1.0.2 -revision=5 +version=1.0.3 +revision=1 wrksrc="${pkgname}-port-${version}" build_style=gnu-configure hostmakedepends="automake" @@ -11,7 +11,7 @@ maintainer="Christian Neukirchen " license="3-clause-BSD" homepage="https://github.com/archiecobbs/mtree-port/" distfiles="https://github.com/archiecobbs/mtree-port/archive/${version}.tar.gz" -checksum=c74d23c658fb4c362092e89b5b20de8f979b48e063f297f7e7ef4658e1797c1d +checksum=bbbf2ae5f1f99119b3cb7f55f90015b0e06238cde2801c9990521109b2529eed pre_configure() { ./autogen.sh From 76920f054de99aa0dd604103684b03c008b58102 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 Feb 2016 20:51:05 +0100 Subject: [PATCH 3/3] mtree: fix musl build --- srcpkgs/mtree/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index 8f6f2bce1ff..414fe7090b6 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -13,7 +13,19 @@ homepage="https://github.com/archiecobbs/mtree-port/" distfiles="https://github.com/archiecobbs/mtree-port/archive/${version}.tar.gz" checksum=bbbf2ae5f1f99119b3cb7f55f90015b0e06238cde2801c9990521109b2529eed +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" musl-fts-devel" + ;; +esac + pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -i '$amtree_CPPFLAGS=-D_STAT_VER_LINUX' Makefile.am + sed -i '$amtree_LDADD=-lfts' Makefile.am + sed -i 's/strtoq/strtoll/g' spec.c + ;; + esac ./autogen.sh }