Index: branches/2017Q4/ports-mgmt/poudriere/Makefile
===================================================================
--- branches/2017Q4/ports-mgmt/poudriere/Makefile	(revision 455071)
+++ branches/2017Q4/ports-mgmt/poudriere/Makefile	(revision 455072)
@@ -1,59 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.21
+DISTVERSION=	3.1.22
 PORTREVISION=	0
 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
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-devel-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	ZSH QEMU EXAMPLES
 OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
 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:
+post-patch:
+	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
-	    ${WRKSRC}/src/bin/poudriere
+	    ${WRKSRC}/poudriere
+	${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
 	    ${STAGEDIR}${DATADIR}/MANIFESTS
 
 .include <bsd.port.mk>
Index: branches/2017Q4/ports-mgmt/poudriere/distinfo
===================================================================
--- branches/2017Q4/ports-mgmt/poudriere/distinfo	(revision 455071)
+++ branches/2017Q4/ports-mgmt/poudriere/distinfo	(revision 455072)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507911513
-SHA256 (freebsd-poudriere-3.1.21_GH0.tar.gz) = b05f63580aef1040466e285dc61733d5ee62a57e87f2f6a14b3d56200adcf5dd
-SIZE (freebsd-poudriere-3.1.21_GH0.tar.gz) = 2866020
+TIMESTAMP = 1509239945
+SHA256 (freebsd-poudriere-3.1.22_GH0.tar.gz) = 657cfdeb8b504693e7e35b54f1fe72f5b4a3e9fab1c229f88d64951b7ae14d28
+SIZE (freebsd-poudriere-3.1.22_GH0.tar.gz) = 2866440
Index: branches/2017Q4/ports-mgmt/poudriere-devel/Makefile
===================================================================
--- branches/2017Q4/ports-mgmt/poudriere-devel/Makefile	(revision 455071)
+++ branches/2017Q4/ports-mgmt/poudriere-devel/Makefile	(revision 455072)
@@ -1,62 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
 DISTVERSION=	3.1.99.20170901
 PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	3.0-2513-gaf851838
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	ZSH QEMU EXAMPLES
 OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
 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:
+post-patch:
+	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
-	    ${WRKSRC}/src/bin/poudriere
+	    ${WRKSRC}/poudriere
+	${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
 	    ${STAGEDIR}${DATADIR}/MANIFESTS
 
 .include <bsd.port.mk>
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 455071)
+++ branches/2017Q4	(revision 455072)

Property changes on: branches/2017Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r453087,453882