Index: head/devel/mage/Makefile
===================================================================
--- head/devel/mage/Makefile	(revision 469454)
+++ head/devel/mage/Makefile	(revision 469455)
@@ -1,38 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	mage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
+DISTVERSION=	2.1
 CATEGORIES=	devel
 
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Command-line make-like build tool using Go as input files
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magefile
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 GH_TAGNAME=	2.1
 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} \
 	${LOCALBASE}/bin/go run bootstrap.go
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/devel/mage/distinfo
===================================================================
--- head/devel/mage/distinfo	(revision 469454)
+++ head/devel/mage/distinfo	(revision 469455)
@@ -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