svn commit: r436107 - in head/ports-mgmt/poudriere: . files

[Bryan Drewery]

Author: bdrewery
Date: Mon Mar 13 19:14:17 2017
New Revision: 436107
URL: https://svnweb.freebsd.org/changeset/ports/436107

Log:
  Update to 3.1.15
  
  Changes: https://github.com/freebsd/poudriere/wiki/release_notes_3115

Deleted:
  head/ports-mgmt/poudriere/files/
Modified:
  head/ports-mgmt/poudriere/Makefile
  head/ports-mgmt/poudriere/distinfo
  head/ports-mgmt/poudriere/pkg-plist

Modified: head/ports-mgmt/poudriere/Makefile
==============================================================================
--- head/ports-mgmt/poudriere/Makefile	Mon Mar 13 19:03:33 2017	(r436106)
+++ head/ports-mgmt/poudriere/Makefile	Mon Mar 13 19:14:17 2017	(r436107)
@@ -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 at FreeBSD.org
 COMMENT=	Port build and test system
 
@@ -30,6 +30,24 @@ RUN_DEPENDS+=	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 \

Modified: head/ports-mgmt/poudriere/distinfo
==============================================================================
--- head/ports-mgmt/poudriere/distinfo	Mon Mar 13 19:03:33 2017	(r436106)
+++ head/ports-mgmt/poudriere/distinfo	Mon Mar 13 19:14:17 2017	(r436107)
@@ -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

Modified: head/ports-mgmt/poudriere/pkg-plist
==============================================================================
--- head/ports-mgmt/poudriere/pkg-plist	Mon Mar 13 19:03:33 2017	(r436106)
+++ head/ports-mgmt/poudriere/pkg-plist	Mon Mar 13 19:14:17 2017	(r436107)
@@ -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