Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 May 2018 17:20:37 +0000 (UTC)
From:      Sean Chittenden <seanc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469455 - head/devel/mage
Message-ID:  <201805091720.w49HKbdK068776@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805091720.w49HKbdK068776>