7 files changed, 26 insertions, 80 deletions

diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index 074b17fc68d6..f21d38c2f1eb 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.14
-PORTREVISION=	3
+DISTVERSION=	3.1.15
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
+
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 
@@ -30,6 +30,24 @@ RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
+.include <bsd.port.options.mk>
+
+# rm -x support came in 10.0.  A bundled rm is used if not supported in base.
+# While <10 is technically not supported in the Ports Tree, Poudriere
+# detects this and it being a package build tool it should still be
+# supported as a user may be installing this to build packages for upgrading
+# their system to a supported release.
+.if ${OSVERSION} < 1000000
+PLIST_SUB+=	RM=""
+.else
+PLIST_SUB+=	RM="@comment "
+.endif
+
+pre-install:
+	${REINPLACE_CMD} \
+	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
+	    ${WRKSRC}/src/bin/poudriere
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
diff --git a/ports-mgmt/poudriere/distinfo b/ports-mgmt/poudriere/distinfo
index 646d36b4198e..e2fecf0cc11d 100644
--- a/ports-mgmt/poudriere/distinfo
+++ b/ports-mgmt/poudriere/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466783271
-SHA256 (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2442511b1898f514bd22087bf05e9693fa78c2c1e9f214581da8ab6d437882e9
-SIZE (freebsd-poudriere-3.1.14_GH0.tar.gz) = 2834745
+TIMESTAMP = 1489432342
+SHA256 (freebsd-poudriere-3.1.15_GH0.tar.gz) = 4cdd11324418a51c8c55604590f12c8772eb575b0ccd41d90ccdd2fa7e3172ad
+SIZE (freebsd-poudriere-3.1.15_GH0.tar.gz) = 2858968
diff --git a/ports-mgmt/poudriere/files/patch-arm64-binutils b/ports-mgmt/poudriere/files/patch-arm64-binutils
deleted file mode 100644
index 8efaf84cbcb9..000000000000
--- a/ports-mgmt/poudriere/files/patch-arm64-binutils
+++ /dev/null
@@ -1,29 +0,0 @@
-commit f61894880dc863258d8ef76fb1bde993b6b9ca08
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Fri Aug 26 14:23:39 2016 -0700
-
-    For arm64 copy the latest aarch64-binutils ld into the jail at startup.
-    
-    This will work like the qemu installation done at startup, and not require
-    messing with the jail creation/update or snapshots.
-
-diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
-index 7c1a4d7..4244b0f 100755
---- src/share/poudriere/common.sh
-+++ src/share/poudriere/common.sh
-@@ -1777,6 +1777,15 @@ jail_start() {
- 		mkdir -p "${tomnt}${EMULATOR%/*}"
- 		cp -f "${EMULATOR}" "${tomnt}${EMULATOR}"
- 	fi
-+	# Handle special ARM64 needs
-+	if [ "${arch#*.}" = "aarch64" ] && ! [ -f "${tomnt}/usr/bin/ld" ]; then
-+		if [ -f /usr/local/aarch64-freebsd/bin/ld ]; then
-+			cp -f /usr/local/aarch64-freebsd/bin/ld \
-+			    "${tomnt}/usr/bin/ld"
-+		else
-+			err 1 "Arm64 requires aarch64-binutils to be installed."
-+		fi
-+	 fi
- 
- 	if [ -d "${CCACHE_DIR:-/nonexistent}" ]; then
- 		cat >> "${tomnt}/etc/make.conf" <<-EOF
diff --git a/ports-mgmt/poudriere/files/patch-mkdir-vp b/ports-mgmt/poudriere/files/patch-mkdir-vp
deleted file mode 100644
index 986595e127fa..000000000000
--- a/ports-mgmt/poudriere/files/patch-mkdir-vp
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e7a21685d30fc183b46cd7c5e0f134ce3a6126fc
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Fri Jun 24 08:52:08 2016 -0700
-
-    Don't use -v for mkdir
-
-diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
-index 00eecca..75c02b7 100755
---- src/share/poudriere/common.sh
-+++ src/share/poudriere/common.sh
-@@ -1179,7 +1179,7 @@ do_jail_mounts() {
- 
- 	fi
- 	echo ${nullpaths} | tr ' ' '\n' | sed -e "s,^/,${mnt}/," | \
--	    xargs mkdir -vp
-+	    xargs mkdir -p
- 	for nullpath in ${nullpaths}; do
- 		[ -d "${from}${nullpath}" -a "${from}" != "${mnt}" ] && \
- 		    ${NULLMOUNT} -o ro "${from}${nullpath}" "${mnt}${nullpath}"
diff --git a/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh b/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
deleted file mode 100644
index c833691230e1..000000000000
--- a/ports-mgmt/poudriere/files/patch-src_share_poudriere_common.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/share/poudriere/common.sh.orig	2015-11-30 17:25:11 UTC
-+++ src/share/poudriere/common.sh
-@@ -1847,7 +1847,7 @@ jail_stop() {
- 	fi
- 	msg "Umounting file systems"
- 	destroyfs ${MASTERMNT} jail || :
--	rm -rfx ${MASTERMNT}/../
-+	rm -rf ${MASTERMNT}/../
- 	export STATUS=0
- 
- 	# Don't override if there is a failure to grab the last status.
diff --git a/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh b/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh
deleted file mode 100644
index 93d39ea47d7b..000000000000
--- a/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/share/poudriere/include/fs.sh.orig	2016-05-18 22:58:28 UTC
-+++ src/share/poudriere/include/fs.sh
-@@ -191,10 +191,10 @@ destroyfs() {
- 		zfs destroy -rf ${fs}
- 		rmdir ${mnt}
- 	else
--		rm -rfx ${mnt} 2>/dev/null || :
-+		rm -rf ${mnt} 2>/dev/null || :
- 		if [ -d "${mnt}" ]; then
- 			chflags -R 0 ${mnt}
--			rm -rfx ${mnt}
-+			rm -rf ${mnt}
- 		fi
- 	fi
- }
diff --git a/ports-mgmt/poudriere/pkg-plist b/ports-mgmt/poudriere/pkg-plist
index e2e4b69adab6..aa5e3e4d4908 100644
--- a/ports-mgmt/poudriere/pkg-plist
+++ b/ports-mgmt/poudriere/pkg-plist
@@ -4,7 +4,7 @@ bin/poudriere
 %%ETCDIR%%/hooks/pkgbuild.sh.sample
 @sample etc/poudriered.conf.sample
 etc/rc.d/poudriered
-libexec/poudriere/clock_monotonic
+libexec/poudriere/clock
 libexec/poudriere/cpdup
 libexec/poudriere/dirempty
 libexec/poudriere/dirwatch
@@ -12,8 +12,10 @@ libexec/poudriere/jexecd
 libexec/poudriere/locked_mkdir
 libexec/poudriere/nc
 libexec/poudriere/poudriered
+libexec/poudriere/ptsort
 libexec/poudriere/rename
 libexec/poudriere/rexec
+%%RM%%libexec/poudriere/rm
 libexec/poudriere/sh
 libexec/poudriere/timeout
 libexec/poudriere/timestamp