From owner-svn-ports-all@freebsd.org Tue Nov 28 20:24:28 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 773A4DEDAF7; Tue, 28 Nov 2017 20:24:28 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5095776C26; Tue, 28 Nov 2017 20:24:28 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASKORWj063521; Tue, 28 Nov 2017 20:24:27 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASKORE7063518; Tue, 28 Nov 2017 20:24:27 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711282024.vASKORE7063518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 28 Nov 2017 20:24:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r455072 - in branches/2017Q4/ports-mgmt: poudriere poudriere-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2017Q4/ports-mgmt: poudriere poudriere-devel X-SVN-Commit-Revision: 455072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2017 20:24:28 -0000 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