From owner-svn-ports-all@freebsd.org Wed May 9 17:20:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9D34FC5D86; Wed, 9 May 2018 17:20:38 +0000 (UTC) (envelope-from seanc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 686AB775C3; Wed, 9 May 2018 17:20:38 +0000 (UTC) (envelope-from seanc@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4AA95146DE; Wed, 9 May 2018 17:20:38 +0000 (UTC) (envelope-from seanc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w49HKcur068778; Wed, 9 May 2018 17:20:38 GMT (envelope-from seanc@FreeBSD.org) Received: (from seanc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w49HKbdK068776; Wed, 9 May 2018 17:20:37 GMT (envelope-from seanc@FreeBSD.org) Message-Id: <201805091720.w49HKbdK068776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: seanc set sender to seanc@FreeBSD.org using -f From: Sean Chittenden Date: Wed, 9 May 2018 17:20:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469455 - head/devel/mage X-SVN-Group: ports-head X-SVN-Commit-Author: seanc X-SVN-Commit-Paths: head/devel/mage X-SVN-Commit-Revision: 469455 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: Wed, 09 May 2018 17:20:38 -0000 Author: seanc Date: Wed May 9 17:20:37 2018 New Revision: 469455 URL: https://svnweb.freebsd.org/changeset/ports/469455 Log: Use post-patch instead of pre-patch and do-patch when stamping the version. Reported by: mat Reviewed by: swills, mat Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D15159 Modified: head/devel/mage/Makefile head/devel/mage/distinfo Modified: head/devel/mage/Makefile ============================================================================== --- head/devel/mage/Makefile Wed May 9 16:32:15 2018 (r469454) +++ head/devel/mage/Makefile Wed May 9 17:20:37 2018 (r469455) @@ -2,7 +2,7 @@ PORTNAME= mage DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0 +DISTVERSION= 2.1 CATEGORIES= devel MAINTAINER= seanc@FreeBSD.org @@ -21,12 +21,9 @@ GH_TAG_COMMIT= 771ebed PLIST_FILES= bin/mage -pre-patch: - @${SED} -e "s|%%GH_TAGNAME%%|${GH_TAGNAME}|g; s|%%GH_TAG_COMMIT%%|${GH_TAG_COMMIT}|g" \ - ${FILESDIR}/patch-magefile.go > ${WRKSRC}/magefile.go.patch - -do-patch: - @cd ${WRKSRC} && ${PATCH} --forward --quiet -p2 < magefile.go.patch +post-patch: + @${REINPLACE_CMD} -e "s|%%GH_TAGNAME%%|${GH_TAGNAME}|g; s|%%GH_TAG_COMMIT%%|${GH_TAG_COMMIT}|g" \ + ${WRKSRC}/magefile.go do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ Modified: head/devel/mage/distinfo ============================================================================== --- head/devel/mage/distinfo Wed May 9 16:32:15 2018 (r469454) +++ head/devel/mage/distinfo Wed May 9 17:20:37 2018 (r469455) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524434645 -SHA256 (magefile-mage-v2.1.0-2.1_GH0.tar.gz) = ac4ad1cfaf0a4ee67b1cbb0ea52792c5bc2ce240ee763fdc8d537bb14b40011a -SIZE (magefile-mage-v2.1.0-2.1_GH0.tar.gz) = 8777256 +TIMESTAMP = 1524473550 +SHA256 (magefile-mage-v2.1-2.1_GH0.tar.gz) = ac4ad1cfaf0a4ee67b1cbb0ea52792c5bc2ce240ee763fdc8d537bb14b40011a +SIZE (magefile-mage-v2.1-2.1_GH0.tar.gz) = 8777256