svn commit: r453882 - in head/ports-mgmt: poudriere poudriere-devel

[Bryan Drewery]

Author: bdrewery
Date: Fri Nov 10 06:28:14 2017
New Revision: 453882
URL: https://svnweb.freebsd.org/changeset/ports/453882

Log:
  Avoid running git and finding PORTSDIR/.git.
  
  Reported by:	xmj

Modified:
  head/ports-mgmt/poudriere-devel/Makefile
  head/ports-mgmt/poudriere/Makefile

Modified: head/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- head/ports-mgmt/poudriere-devel/Makefile	Fri Nov 10 05:38:47 2017	(r453881)
+++ head/ports-mgmt/poudriere-devel/Makefile	Fri Nov 10 06:28:14 2017	(r453882)
@@ -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: head/ports-mgmt/poudriere/Makefile
==============================================================================
--- head/ports-mgmt/poudriere/Makefile	Fri Nov 10 05:38:47 2017	(r453881)
+++ head/ports-mgmt/poudriere/Makefile	Fri Nov 10 06:28:14 2017	(r453882)
@@ -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/