Go ports: cleanup, finish transition to USES=go started with r505321 (cat. sysutils-x11)

- Remove custom build/install targets left in place after r505321
- Switch to the new GO_TARGET tuple syntax introduced in r512001

Reviewed by:	tobik
Approved by:	araujo (mentor), portmgr (adamw)
Differential Revision:	https://reviews.freebsd.org/D21744

15 files changed, 90 insertions, 191 deletions

diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index e07a9d08349c..56d47fdfa209 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -20,6 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	mholt
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	./caddy
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/caddy etc/rc.d/caddy
@@ -29,12 +30,7 @@ OPTIONS_DEFINE=	TELEMETRY
 TELEMETRY_DESC=	Enable telemetry support
 TELEMETRY_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-disable-telemetry
 
-do-build:
-	@cd ${GO_WRKSRC}/${PORTNAME} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME}/${PORTNAME} \
-		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+post-install:
 	${INSTALL_SCRIPT} ${GO_WRKSRC}/dist/init/freebsd/${PORTNAME} \
 		${STAGEDIR}/${PREFIX}/etc/rc.d/${PORTNAME}
 
diff --git a/www/fabio/Makefile b/www/fabio/Makefile
index 79741e2ddf80..06afee25326c 100644
--- a/www/fabio/Makefile
+++ b/www/fabio/Makefile
@@ -14,20 +14,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	fabiolb
-GH_PROJECT=	fabio
 GH_SUBDIR=	src/github.com/fabiolb/fabio
 
-USE_RC_SUBR=	fabio
+GO_BUILDFLAGS=	-ldflags "-X main.GitDescribe=v${PORTVERSION}"
+GO_TARGET=	:${PREFIX}/sbin/fabio
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/fabiolb/fabio; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
-		-ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/fabio
+USE_RC_SUBR=	fabio
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/fabiolb/fabio/bin/fabio \
-		${STAGEDIR}${PREFIX}/sbin/fabio
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/fabiolb/fabio/fabio.properties \
-		${STAGEDIR}${PREFIX}/etc/fabio.properties.sample
+post-install:
+	${INSTALL_DATA} ${GO_WRKSRC}/fabio.properties ${STAGEDIR}${PREFIX}/etc/fabio.properties.sample
 
 .include <bsd.port.mk>
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 7fb569c13380..e34564e4b211 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -21,6 +21,7 @@ GH_ACCOUNT=	go-gitea
 USE_RC_SUBR=	gitea
 
 GO_BUILDFLAGS=	-tags "${GO_TAGS}" -ldflags '-X "main.Version=${PORTVERSION}"'
+GO_TARGET=	:${PREFIX}/sbin/${PORTNAME}
 
 SUB_FILES+=	app.ini.sample
 SUB_LIST+=	GITUSER=${USERS}
@@ -48,8 +49,7 @@ DAEMONARGS=	-f
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${GO_WRKSRC}/custom/conf/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index efd78fb411a4..18313bbd84aa 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -17,6 +17,9 @@ GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
 GL_COMMIT=	520398c7154a50f7768ee52da71afd52efff85b1
 
+GO_BUILDFLAGS=	-ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}"
+GO_PKGNAME=	gitlab.com/gitlab-org/gitlab-pages
+
 PLIST_FILES=	bin/gitlab-pages
 
 USE_RC_SUBR=	gitlab_pages
@@ -24,17 +27,4 @@ USE_RC_SUBR=	gitlab_pages
 USERS=		gitlab-pages
 GROUPS=		gitlab-pages
 
-post-patch:
-	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
-	@${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org
-	@${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-pages
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \
-		go build -o gitlab-pages \
-		--ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gitlab-pages ${STAGEDIR}${PREFIX}/bin/gitlab-pages
-
 .include <bsd.port.mk>
diff --git a/www/go-www/Makefile b/www/go-www/Makefile
index c64332c785bc..c23165b75a72 100644
--- a/www/go-www/Makefile
+++ b/www/go-www/Makefile
@@ -16,21 +16,11 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nbari
-GH_TUPLE=	golang:crypto:505ab14:crypto/src/golang.org/x/crypto
+GH_TUPLE=	golang:crypto:505ab14:crypto/vendor/golang.org/x/crypto
 GH_SUBDIR=	src/github.com/nbari/${PORTNAME}
 
-PLIST_FILES=	bin/www
-
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/golang.org
-	@${LN} -sf ${LOCALBASE}/share/go/src/golang.org/x ${WRKSRC}/src/golang.org/x
+GO_BUILDFLAGS=	-ldflags "-s -w"
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-s -w" -o www;
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/www ${STAGEDIR}${PREFIX}/bin/www
+PLIST_FILES=	bin/www
 
 .include <bsd.port.mk>
diff --git a/www/grafana4/Makefile b/www/grafana4/Makefile
index 6abaf0238108..8ce9ff575cca 100644
--- a/www/grafana4/Makefile
+++ b/www/grafana4/Makefile
@@ -18,12 +18,16 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	grafana
 
-USES=	compiler go
+USES=	go
 
 USE_GITHUB=	yes
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 TAG=		fdb5b1f
 
+GO_BUILDFLAGS=	-ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
+GO_TARGET=	./pkg/cmd/grafana-server \
+		./pkg/cmd/grafana-cli
+
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
@@ -49,21 +53,12 @@ SUB_LIST+=	GRAFANA_USER=${GRAFANA_USER} \
 
 PLIST_SUB+=	GRAFANAHOMEDIR=${GRAFANAHOMEDIR}
 
-post-extract:
-	@${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public
+post-patch:
+	@${RM} -r ${WRKSRC}/public
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public)
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \
-		${STAGEDIR}${PREFIX}/bin/grafana-server
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \
-		${STAGEDIR}${PREFIX}/bin/grafana-cli
-	cd ${WRKSRC}/src/github.com/grafana/grafana && \
-		${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
+post-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
 	${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANALOGDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}
@@ -73,14 +68,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \
-		${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
+	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample
 
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/grafana5/Makefile b/www/grafana5/Makefile
index 073028aa4372..68e577f1e8cb 100644
--- a/www/grafana5/Makefile
+++ b/www/grafana5/Makefile
@@ -17,13 +17,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		compiler go
+USES=		go
 USE_RC_SUBR=	grafana
 
 USE_GITHUB=	yes
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 TAG=		69c5191
 
+GO_BUILDFLAGS=	-ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
+GO_TARGET=	./pkg/cmd/grafana-server \
+		./pkg/cmd/grafana-cli
+
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
@@ -49,21 +53,12 @@ SUB_LIST+=	GRAFANA_USER=${GRAFANA_USER} \
 
 PLIST_SUB+=	GRAFANAHOMEDIR=${GRAFANAHOMEDIR}
 
-post-extract:
-	@${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public
+post-patch:
+	@${RM} -r ${WRKSRC}/public
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public)
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \
-		${STAGEDIR}${PREFIX}/bin/grafana-server
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \
-		${STAGEDIR}${PREFIX}/bin/grafana-cli
-	cd ${WRKSRC}/src/github.com/grafana/grafana && \
-		${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
+post-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana
 	${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANALOGDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}
@@ -73,14 +68,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data
 	${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \
-		${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
+	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample
 
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/kurly/Makefile b/www/kurly/Makefile
index eb64587951fc..6680eb63ff07 100644
--- a/www/kurly/Makefile
+++ b/www/kurly/Makefile
@@ -9,25 +9,21 @@ MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Alternative implementation of curl written in Golang
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC_kurly}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
-USE_GITLAB=	nodefault
-GL_TUPLE=	davidjpeacock:kurly:369c1998dfbfca7043f8c995c8ef8714496530ea:kurly/src/gitlab.com/davidjpeacock/kurly
+USE_GITLAB=	yes
+GL_ACCOUNT=	davidjpeacock
+GL_COMMIT=	369c1998dfbfca7043f8c995c8ef8714496530ea
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	aki237:nscjar:e2df936:nscjar/src/github.com/aki237/nscjar \
-		alsm:ioprogress:063c372:ioprogress/src/github.com/alsm/ioprogress \
-		urfave:cli:8e01ec4:ucli/src/github.com/urfave/cli
+GH_TUPLE=	aki237:nscjar:e2df936:nscjar/vendor/github.com/aki237/nscjar \
+		alsm:ioprogress:063c372:ioprogress/vendor/github.com/alsm/ioprogress \
+		urfave:cli:8e01ec4:ucli/vendor/github.com/urfave/cli
 
-PLIST_FILES=	bin/kurly
-
-do-build:
-	cd ${WRKSRC_kurly} && \
-		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -o ${PORTNAME}
+GO_PKGNAME=	gitlab.com/davidjpeacock/kurly
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC_kurly}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+PLIST_FILES=	bin/kurly
 
 .include <bsd.port.mk>
diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile
index af2dc528388f..64b9ff398fd2 100644
--- a/www/miniflux/Makefile
+++ b/www/miniflux/Makefile
@@ -24,7 +24,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	miniflux
 
 GO_PKGNAME=	miniflux.app
-GO_TARGET=	${GO_PKGNAME}
+GO_TARGET=	:${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X miniflux.app/version.Version=${DISTVERSION} \
 		-X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')"
 
@@ -32,11 +32,8 @@ OPTIONS_DEFINE=		PGSQL_SERVER
 PGSQL_SERVER_DESC=	Install the PostgreSQL Server Component
 PGSQL_SERVER_VARS=	WANT_PGSQL=server,contrib
 
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/miniflux.app ${STAGEDIR}${PREFIX}/bin/miniflux
-	${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/
-
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_DATA} ${FILESDIR}/miniflux.env.sample \
 		${STAGEDIR}${PREFIX}/etc
 
diff --git a/www/minio-client/Makefile b/www/minio-client/Makefile
index 266bc64c6963..628ce97e9609 100644
--- a/www/minio-client/Makefile
+++ b/www/minio-client/Makefile
@@ -78,8 +78,6 @@ GO_BUILDFLAGS=	--ldflags='\
 		-X github.com/minio/mc/cmd.ReleaseTag=${GH_TAGNAME} \
 		-X github.com/minio/mc/cmd.CommitID=${COMMIT_ID} \
 		-X github.com/minio/mc/cmd.GOPATH=${WRKSRC} -s -w'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/minio-client ${STAGEDIR}${PREFIX}/bin/${MC}
+GO_TARGET=	:${MC}
 
 .include <bsd.port.mk>
diff --git a/www/s/Makefile b/www/s/Makefile
index ed54f1042dc9..e139e5e9441b 100644
--- a/www/s/Makefile
+++ b/www/s/Makefile
@@ -15,21 +15,15 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zquestz
-GH_TUPLE=	zquestz:go-ucl:ec59c7a:goucl/src/github.com/zquestz/go-ucl \
-		mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir \
-		NYTimes:gziphandler:v1.0.1:gziphandler/src/github.com/NYTimes/gziphandler \
-		spf13:cobra:v0.0.3:cobra/src/github.com/spf13/cobra \
-		spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag \
-		golang:text:4d1c5fb:sys/src/golang.org/x/text
-GH_SUBDIR:=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+GH_TUPLE=	zquestz:go-ucl:ec59c7a:goucl/vendor/github.com/zquestz/go-ucl \
+		mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir \
+		NYTimes:gziphandler:v1.0.1:gziphandler/vendor/github.com/NYTimes/gziphandler \
+		spf13:cobra:v0.0.3:cobra/vendor/github.com/spf13/cobra \
+		spf13:pflag:v1.0.3:pflag/vendor/github.com/spf13/pflag \
+		golang:text:4d1c5fb:sys/vendor/golang.org/x/text
 
-PLIST_FILES=	bin/${PORTNAME}
-
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/uchiwa/Makefile b/www/uchiwa/Makefile
index 495bdaed82e2..e09b4f89f540 100644
--- a/www/uchiwa/Makefile
+++ b/www/uchiwa/Makefile
@@ -19,12 +19,12 @@ UCHIWA_SHAREDIR=	${PREFIX}/share/uchiwa/public
 USE_RC_SUBR=	${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	sensu
-GH_TUPLE=	dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/src/github.com/dgrijalva/jwt-go
-GH_TUPLE+=	gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/src/github.com/gorilla/context
-GH_TUPLE+=	mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/src/github.com/mitchellh/mapstructure
-GH_TUPLE+=	palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/src/github.com/palourde/mergo
-GH_TUPLE+=	stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/src/github.com/stretchr/objx
-GH_TUPLE+=	stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/src/github.com/stretchr/testify
+GH_TUPLE=	dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/vendor/github.com/dgrijalva/jwt-go
+GH_TUPLE+=	gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/vendor/github.com/gorilla/context
+GH_TUPLE+=	mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/vendor/github.com/mitchellh/mapstructure
+GH_TUPLE+=	palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/vendor/github.com/palourde/mergo
+GH_TUPLE+=	stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/vendor/github.com/stretchr/objx
+GH_TUPLE+=	stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/vendor/github.com/stretchr/testify
 GH_TUPLE+=	sensu:uchiwa-web:${PORTVERSION}:uchiwaweb/public/bower_components/uchiwa-web
 GH_TUPLE+=	angular:bower-angular-cookies:b89821e37d3011ad0bca9a4847a8fcc59f90fabb:bowerangularcookies/public/bower_components/angular-cookies
 GH_TUPLE+=	urish:angular-moment:0.9.2:urishangularmoment/public/bower_components/angular-moment
@@ -41,31 +41,18 @@ GH_TUPLE+=	angular-ui:bootstrap-bower:0.13.4:angularuibootstrapbower/public/bowe
 GH_TUPLE+=	moment:moment:2.8.4:momentmoment/public/bower_components/moment
 GH_TUPLE+=	jquery:jquery-dist:3.0.0:jqueryjquery/public/bower_components/jquery
 GH_TUPLE+=	jashkenas:underscore:1f4bf626f23a99f7a676f5076dc1b1475554c8f7:jashkenasunderscore/public/bower_components/underscore
-GH_TUPLE+=	kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/src/github.com/kless/osutil
+GH_TUPLE+=	kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/vendor/github.com/kless/osutil
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 USERS=	uchiwa
 GROUPS=	uchiwa
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-.for src in .travis.yml Gruntfile.js bower.json package.json uchiwa \
-	Dockerfile LICENSE config.json.example public uchiwa.go .bowerrc \
-	Godeps README.md fixtures
-	@${MV} ${WRKSRC}/${src} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-.endfor
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/sensu && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./...
-
-do-install:
+post-install:
 	${MKDIR} ${STAGEDIR}${UCHIWA_LOGDIR} \
 	${STAGEDIR}${UCHIWA_CONFDIR} \
 	${STAGEDIR}${UCHIWA_SHAREDIR}
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/uchiwa ${STAGEDIR}${PREFIX}/bin/uchiwa
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample
-	(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR})
+	${INSTALL_DATA} ${WRKSRC}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample
+	(cd ${WRKSRC}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR})
 
 .include <bsd.port.mk>
diff --git a/www/varnish_exporter/Makefile b/www/varnish_exporter/Makefile
index c6104ffdb0f2..9ae99f2cf79a 100644
--- a/www/varnish_exporter/Makefile
+++ b/www/varnish_exporter/Makefile
@@ -14,15 +14,16 @@ USE_GITHUB=		yes
 
 GH_ACCOUNT=		jonnenauha
 GH_PROJECT=		prometheus_varnish_exporter
-GH_TUPLE=		prometheus:client_golang:v0.8.0:client_golang \
-			beorn7:perks:3a771d9:perks \
-			golang:protobuf:70b3af3:protobuf \
-			matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \
-			prometheus:client_model:5c3871d:client_model \
-			prometheus:common:7600349:common \
-			prometheus:procfs:ae68e2d:procfs
+GH_TUPLE=		prometheus:client_golang:v0.8.0:client_golang/vendor/github.com/prometheus/client_golang \
+			beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \
+			golang:protobuf:70b3af3:protobuf/vendor/github.com/golang/protobuf \
+			matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+			prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \
+			prometheus:common:7600349:common/vendor/github.com/prometheus/common \
+			prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs
 
 GO_PKGNAME=		github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=		:varnish_exporter
 
 USE_RC_SUBR=		${PORTNAME}
 
@@ -31,20 +32,4 @@ GROUPS=			varnish
 
 PLIST_FILES=		bin/${PORTNAME}
 
-pre-build:
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/beorn7
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/golang
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/matttproud
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus
-	${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang
-	${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model
-	${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common
-	${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks
-	${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs
-	${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf
-	${MV} ${WRKSRC_golang_protobuf_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus_varnish_exporter ${STAGEDIR}${PREFIX}/bin/varnish_exporter
-
 .include <bsd.port.mk>
diff --git a/www/webhook/Makefile b/www/webhook/Makefile
index bed3c1275045..65e283009ad0 100644
--- a/www/webhook/Makefile
+++ b/www/webhook/Makefile
@@ -16,6 +16,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	adnanh
 USE_RC_SUBR=	webhook
 
+GO_TARGET=	:${PREFIX}/sbin/webhook
+
 PLIST_FILES=	"@sample etc/webhook.yaml.sample" sbin/webhook
 
 .include <bsd.port.options.mk>
@@ -28,8 +30,7 @@ DAEMONARGS=	-f
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+post-install:
 	${INSTALL_DATA}  ${FILESDIR}/webhook.yaml ${STAGEDIR}${PREFIX}/etc/webhook.yaml.sample
 
 .include <bsd.port.mk>
diff --git a/www/ytdl/Makefile b/www/ytdl/Makefile
index 3faf0da07c0a..15a6973ca765 100644
--- a/www/ytdl/Makefile
+++ b/www/ytdl/Makefile
@@ -16,22 +16,17 @@ USES=			go
 USE_GITHUB=		yes
 GH_ACCOUNT=		rylio
 GH_SUBDIR=		src/github.com/rylio/ytdl
-GH_TUPLE=		PuerkitoBio:goquery:v1.3.0:goquery/src/github.com/PuerkitoBio/goquery \
-			andybalholm:cascadia:349dd02:cascadia/src/github.com/andybalholm/cascadia \
-			cheggaaa:pb:5d91ad4:pb/src/github.com/cheggaaa/pb \
-			codegangsta:cli:v1.15.0:cli/src/github.com/codegangsta/cli \
-			mattn:go-colorable:v0.0.9:colorable/src/github.com/mattn/go-colorable \
-			mattn:go-isatty:v0.0.3:isatty/src/github.com/mattn/go-isatty \
-			Sirupsen:logrus:v0.8.7:logrus/src/github.com/Sirupsen/logrus \
-			golang:net:0ed95ab:net/src/golang.org/x/net
+GH_TUPLE=		PuerkitoBio:goquery:v1.3.0:goquery/vendor/github.com/PuerkitoBio/goquery \
+			andybalholm:cascadia:349dd02:cascadia/vendor/github.com/andybalholm/cascadia \
+			cheggaaa:pb:5d91ad4:pb/vendor/github.com/cheggaaa/pb \
+			codegangsta:cli:v1.15.0:cli/vendor/github.com/codegangsta/cli \
+			mattn:go-colorable:v0.0.9:colorable/vendor/github.com/mattn/go-colorable \
+			mattn:go-isatty:v0.0.3:isatty/vendor/github.com/mattn/go-isatty \
+			Sirupsen:logrus:v0.8.7:logrus/vendor/github.com/Sirupsen/logrus \
+			golang:net:0ed95ab:net/vendor/golang.org/x/net
 
-PLIST_FILES=		bin/${PORTNAME}
-
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -p ${MAKE_JOBS_NUMBER} ./cmd/${PORTNAME}
+GO_TARGET=		./cmd/${PORTNAME}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+PLIST_FILES=		bin/${PORTNAME}
 
 .include <bsd.port.mk>