svn commit: r455072 - in branches/2017Q4/ports-mgmt: poudriere poudriere-devel

[Bryan Drewery]

Author: bdrewery
Date: Tue Nov 28 20:24:27 2017
New Revision: 455072
URL: https://svnweb.freebsd.org/changeset/ports/455072

Log:
  MFH: r453087 r453882
  
  - Update to 3.1.22
  
  Changes: https://github.com/freebsd/poudriere/wiki/release_notes_3122
  
  PR:	216083
  PR:	215541
  
  Avoid running git and finding PORTSDIR/.git.
  
  Reported by:	xmj
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q4/ports-mgmt/poudriere-devel/Makefile
  branches/2017Q4/ports-mgmt/poudriere/Makefile
  branches/2017Q4/ports-mgmt/poudriere/distinfo
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- branches/2017Q4/ports-mgmt/poudriere-devel/Makefile	Tue Nov 28 20:18:47 2017	(r455071)
+++ branches/2017Q4/ports-mgmt/poudriere-devel/Makefile	Tue Nov 28 20:24:27 2017	(r455072)
@@ -47,10 +47,12 @@ PLIST_SUB+=	RM=""
 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/

Modified: branches/2017Q4/ports-mgmt/poudriere/Makefile
==============================================================================
--- branches/2017Q4/ports-mgmt/poudriere/Makefile	Tue Nov 28 20:18:47 2017	(r455071)
+++ branches/2017Q4/ports-mgmt/poudriere/Makefile	Tue Nov 28 20:24:27 2017	(r455072)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.21
+DISTVERSION=	3.1.22
 PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
@@ -44,10 +44,12 @@ PLIST_SUB+=	RM=""
 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/

Modified: branches/2017Q4/ports-mgmt/poudriere/distinfo
==============================================================================
--- branches/2017Q4/ports-mgmt/poudriere/distinfo	Tue Nov 28 20:18:47 2017	(r455071)
+++ branches/2017Q4/ports-mgmt/poudriere/distinfo	Tue Nov 28 20:24:27 2017	(r455072)
@@ -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