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
svn path=/head/; revision=513276
2024-10-18 19:49:40 +00:00 · 2019-09-29 22:34:31 +00:00 · 2019-09-29 22:34:31 +00:00 · fc95b3f0cf · 2021-03-31 03:12:20 +00:00
commit fc95b3f0cf
parent 67c4b925b7
46 changed files with 298 additions and 608 deletions
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@ -18,6 +18,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 GH_SUBDIR=	src/github.com/aws/amazon-ssm-agent

+GO_BUILDLAGS=	-ldflags "-s -w"
+GO_TARGET=	./agent:${PREFIX}/sbin/amazon-ssm-agent \
+		./agent/framework/processor/executer/outofproc/worker:${PREFIX}/sbin/ssm-document-worker \
+		./agent/framework/processor/executer/outofproc/sessionworker:${PREFIX}/sbin/ssm-session-worker \
+		./agent/session/logging:${PREFIX}/sbin/ssm-session-logger \
+		./agent/cli-main:${PREFIX}/sbin/ssm-cli
+
 PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\
 		etc/amazon/ssm/seelog_unix.xml.template		\
 		sbin/amazon-ssm-agent				\
@ -28,33 +35,10 @@ PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\

 USE_RC_SUBR=	amazon-ssm-agent

-do-build:
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o amazon-ssm-agent -v 				\
-		agent/agent.go agent/agent_unix.go agent/agent_parser.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-document-worker -v				\
-		agent/framework/processor/executer/outofproc/worker/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-session-worker -v				\
-		agent/framework/processor/executer/outofproc/sessionworker/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-session-logger -v				\
-		agent/session/logging/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-cli -v agent/cli-main/cli-main.go
+post-patch:
+	${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/

-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-document-worker ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-worker ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-logger ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-cli ${STAGEDIR}${PREFIX}/sbin
+post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template
--- a/sysutils/circonus-agent/Makefile
+++ b/sysutils/circonus-agent/Makefile
@ -17,47 +17,43 @@ USE_GITHUB=	yes

 GH_ACCOUNT=	circonus-labs
 GH_SUBDIR=	src/github.com/circonus-labs/circonus-agent
-GH_TUPLE=	alecthomas:units:2efee85:units/src/github.com/alecthomas/units \
-		pkg:errors:645ef00:errors/src/github.com/pkg/errors \
-		rs:zerolog:56a970de:zerolog/src/github.com/rs/zerolog \
-		spf13:cobra:c439c4fa:cobra/src/github.com/spf13/cobra \
-		spf13:viper:b5e8006c:viper/src/github.com/spf13/viper \
-		golang:sys:7ceb54c8:sys/src/golang.org/x/sys \
-		xi2:httpgzip:2d8bcdd:httpgzip/src/xi2.org/x/httpgzip \
-		pelletier:go-toml:acdc4509:go_toml/src/github.com/pelletier/go-toml \
-		maier:go-appstats:812a586:go_appstats/src/github.com/maier/go-appstats \
-		circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/src/github.com/circonus-labs/circonus-gometrics \
-		go-tomb:tomb:d5d1b58:tomb2/src/gopkg.in/tomb.v2 \
-		go-yaml:yaml:7f97868e:yaml2/src/gopkg.in/yaml.v2 \
-		go-ole:go-ole:a41e3c4:go_ole/src/github.com/go-ole/go-ole \
-		circonus-labs:circonusllhist:1e65893c:circonusllhist/src/github.com/circonus-labs/circonusllhist \
-		fsnotify:fsnotify:c2828203:fsnotify/src/github.com/fsnotify/fsnotify \
-		hashicorp:go-retryablehttp:794af36:go_retryablehttp/src/github.com/hashicorp/go-retryablehttp \
-		spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \
-		hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \
-		hashicorp:hcl:23c074d:hcl/src/github.com/hashicorp/hcl \
-		magiconair:properties:c3beff4c:properties/src/github.com/magiconair/properties \
-		mitchellh:mapstructure:00c29f56:mapstructure/src/github.com/mitchellh/mapstructure \
-		spf13:afero:bb8f1927:afero/src/github.com/spf13/afero \
-		spf13:cast:8965335b:cast/src/github.com/spf13/cast \
-		spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \
-		golang:text:f21a4dfb:text/src/golang.org/x/text \
-		tv42:httpunix:b75d861:httpunix/src/github.com/tv42/httpunix \
-		prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \
-		golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \
-		prometheus:common:e4aa40a9:common/src/github.com/prometheus/common \
-		matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions
+GH_TUPLE=	alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \
+		pkg:errors:645ef00:errors/vendor/github.com/pkg/errors \
+		rs:zerolog:56a970de:zerolog/vendor/github.com/rs/zerolog \
+		spf13:cobra:c439c4fa:cobra/vendor/github.com/spf13/cobra \
+		spf13:viper:b5e8006c:viper/vendor/github.com/spf13/viper \
+		golang:sys:7ceb54c8:sys/vendor/golang.org/x/sys \
+		xi2:httpgzip:2d8bcdd:httpgzip/vendor/xi2.org/x/httpgzip \
+		pelletier:go-toml:acdc4509:go_toml/vendor/github.com/pelletier/go-toml \
+		maier:go-appstats:812a586:go_appstats/vendor/github.com/maier/go-appstats \
+		circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/vendor/github.com/circonus-labs/circonus-gometrics \
+		go-tomb:tomb:d5d1b58:tomb2/vendor/gopkg.in/tomb.v2 \
+		go-yaml:yaml:7f97868e:yaml2/vendor/gopkg.in/yaml.v2 \
+		go-ole:go-ole:a41e3c4:go_ole/vendor/github.com/go-ole/go-ole \
+		circonus-labs:circonusllhist:1e65893c:circonusllhist/vendor/github.com/circonus-labs/circonusllhist \
+		fsnotify:fsnotify:c2828203:fsnotify/vendor/github.com/fsnotify/fsnotify \
+		hashicorp:go-retryablehttp:794af36:go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \
+		spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \
+		hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
+		hashicorp:hcl:23c074d:hcl/vendor/github.com/hashicorp/hcl \
+		magiconair:properties:c3beff4c:properties/vendor/github.com/magiconair/properties \
+		mitchellh:mapstructure:00c29f56:mapstructure/vendor/github.com/mitchellh/mapstructure \
+		spf13:afero:bb8f1927:afero/vendor/github.com/spf13/afero \
+		spf13:cast:8965335b:cast/vendor/github.com/spf13/cast \
+		spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/vendor/github.com/spf13/jwalterweatherman \
+		golang:text:f21a4dfb:text/vendor/golang.org/x/text \
+		tv42:httpunix:b75d861:httpunix/vendor/github.com/tv42/httpunix \
+		prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \
+		golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \
+		prometheus:common:e4aa40a9:common/vendor/github.com/prometheus/common \
+		matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions
+
+GO_TARGET=	:circonus-agentd

 ETCDIR=		${PREFIX}/etc/circonus-agentd
 PLIST_FILES=	bin/circonus-agentd "@dir ${ETCDIR}"

-do-build:
-	( cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		go build ${BUILD_FLAGS} -o bin/circonus-agentd )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/circonus-agentd ${STAGEDIR}${PREFIX}/bin/circonus-agentd
+post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}

 .include <bsd.port.mk>
--- a/sysutils/consul-alerts/Makefile
+++ b/sysutils/consul-alerts/Makefile
@ -10,32 +10,19 @@ COMMENT=	Simple daemon to send notifications based on Consul health checks

 LICENSE=	GPLv2+

-USES=		compiler go
+USES=		go

 USE_GITHUB=	yes
 GH_ACCOUNT=	AcalephStorage
 GH_SUBDIR=	src/github.com/AcalephStorage/consul-alerts
-GH_TUPLE=	aws:aws-sdk-go:v1.8.30:aws_sdk_go/src/github.com/aws/aws-sdk-go \
-		imdario:mergo:0.2.2:mergo/src/github.com/imdario/mergo \
-		mitchellh:hashstructure:9204ce5:hashstructure/src/github.com/mitchellh/hashstructure
+GH_TUPLE=	aws:aws-sdk-go:v1.8.30:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		imdario:mergo:0.2.2:mergo/vendor/github.com/imdario/mergo \
+		mitchellh:hashstructure:9204ce5:hashstructure/vendor/github.com/mitchellh/hashstructure
+
+GO_BUILDFLAGS=	-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"

 PLIST_FILES=	${PREFIX}/bin/${PORTNAME}

 USE_RC_SUBR=	${PORTNAME}

-do-build:
-	cd ${GO_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
-			-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/sysutils/consul_exporter/Makefile
+++ b/sysutils/consul_exporter/Makefile
@ -10,37 +10,19 @@ COMMENT=	Exporter for Consul metrics

 LICENSE=	APACHE20

-USES=		compiler go
+USES=		go

 USE_GITHUB=	yes
 GH_ACCOUNT=	prometheus
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/consul_exporter

+GO_BUILDFLAGS=	-ldflags "\
+		-X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION}  \
+		-X github.com/prometheus/consul_exporter/version.VersionPrerelease=  \
+		-X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION}"
+
 USE_RC_SUBR=	consul_exporter

 PLIST_FILES=	bin/consul_exporter

-post-extract:
-	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
-		-ldflags "\
-		-X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION}  \
-		-X github.com/prometheus/consul_exporter/version.VersionPrerelease=  \
-		-X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \
-		" \
-		-o bin/consul_exporter
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter
-
-.include <bsd.port.pre.mk>
-
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go fails.
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/sysutils/container-diff/Makefile
+++ b/sysutils/container-diff/Makefile
@ -21,7 +21,4 @@ PLIST_FILES=	bin/container-diff
 GH_ACCOUNT=	GoogleContainerTools
 USE_GITHUB=	yes

-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff
-
 .include <bsd.port.mk>
--- a/sysutils/coreos-ct/Makefile
+++ b/sysutils/coreos-ct/Makefile
@ -18,18 +18,13 @@ GH_ACCOUNT=	coreos
 GH_PROJECT=	container-linux-config-transpiler

 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-GO_LDFLAGS=	-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}
+GO_BUILDFLAGS=	-ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}"
+GO_TARGET=	./internal:ct

 OPTIONS_DEFINE=	DOCS

 PORTDOCS=	README.md NEWS doc/*

-do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${WRKDIR}/bin/ct -ldflags "${GO_LDFLAGS}" ./internal)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/ct ${STAGEDIR}${PREFIX}/bin
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@ -23,20 +23,11 @@ OPTIONS_DEFINE=	DOCS

 PORTDOCS=	README.md
 COMMIT=		7ece735
-GO_LDFLAGS=	-ldflags="-s -w \
+GO_BUILDFLAGS=	-ldflags="-s -w \
 		-X main.Name=${PORTNAME} \
 		-X main.Version=${PORTVERSION} \
 		-X main.GitCommit=${COMMIT}"

-do-build:
-	@cd ${WRKSRC}/src/github.com/hashicorp/envconsul; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		go build ${GO_LDFLAGS}\
-		-o bin/envconsul
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/envconsul/bin/envconsul ${STAGEDIR}${PREFIX}/bin/envconsul
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
--- a/sysutils/epazote/Makefile
+++ b/sysutils/epazote/Makefile
@ -10,21 +10,16 @@ COMMENT=	Automated HTTP (microservices) supervisor
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		compiler go
+USES=		go

 USE_GITHUB=	yes
-GH_TUPLE=	epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \
-		go-yaml:yaml:cd8b52f:yaml/src/github.com/go-yaml/yaml
+GH_TUPLE=	epazote:scheduler:0.1.0:scheduler/vendor/github.com/epazote/scheduler \
+		go-yaml:yaml:cd8b52f:yaml/vendor/github.com/go-yaml/yaml
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}

+GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION}"
+GO_TARGET=	./cmd/epazote
+
 PLIST_FILES=	bin/epazote

-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-X main.version=${PORTVERSION}" -o epazote cmd/epazote/main.go;
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/epazote ${STAGEDIR}${PREFIX}/bin/epazote
-
 .include <bsd.port.mk>
--- a/sysutils/fusefs-webdavfs/Makefile
+++ b/sysutils/fusefs-webdavfs/Makefile
@ -41,6 +41,8 @@ GH_ACCOUNT+=	${GETOPT_GH_ACCOUNT}:getopt ${FUSE_GH_ACCOUNT}:fuse
 GH_PROJECT+=	${GETOPT_GH_PROJECT}:getopt ${FUSE_GH_PROJECT}:fuse
 GH_TAGNAME+=	${GETOPT_GH_TAGNAME}:getopt ${FUSE_GH_TAGNAME}:fuse

+GO_TARGET=	:${PREFIX}/sbin/mount.webdavfs
+
 PLIST_FILES=	sbin/mount.webdavfs sbin/mount_webdavfs

 SUB_FILES=	pkg-message mount_webdavfs
@ -53,8 +55,7 @@ post-patch:
 	${LN} -s ${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/v2 ${GETOPT_WRKSRCDIR}
 	${LN} -s ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${FUSE_WRKSRCDIR}/fuse

-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/mount.webdavfs
+post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mount_webdavfs ${STAGEDIR}${PREFIX}/sbin

 .include <bsd.port.mk>
--- a/sysutils/goawk/Makefile
+++ b/sysutils/goawk/Makefile
@ -9,22 +9,14 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	AWK interpreter written in Go

 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 USES=		go

-USE_GITHUB=	nodefault # the main code is in GH_TUPLE
+USE_GITHUB=	yes
 GH_ACCOUNT=	benhoyt
-GH_TUPLE=	benhoyt:goawk:${DISTVERSIONFULL}:main/src/github.com/benhoyt/goawk
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}

 PLIST_FILES=	bin/${PORTNAME}

-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./...
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
--- a/sysutils/gomplate/Makefile
+++ b/sysutils/gomplate/Makefile
@ -18,19 +18,12 @@ GH_ACCOUNT=	hairyhenderson
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 GH_TAG_COMMIT=	ce4b3e3

+GO_BUILDFLAGS=	-ldflags "\
+		-w -s \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} \
+		-X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}"
+GO_TARGET=	./cmd/gomplate
+
 PLIST_FILES=	bin/gomplate

-post-extract:
-	@${CP} -RpP ${WRKSRC}/vendor/* ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \
-	${LOCALBASE}/bin/go build \
-		-ldflags "-w -s -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}" \
-		-o ${PORTNAME} \
-		./cmd/gomplate
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.mk>
--- a/sysutils/goss/Makefile
+++ b/sysutils/goss/Makefile
@ -22,34 +22,30 @@ USE_RC_SUBR=		goss
 USE_GITHUB=		yes
 GH_ACCOUNT=		aelsabbahy
 GH_SUBDIR=		src/github.com/aelsabbahy/${PORTNAME}
-GH_TUPLE=		achanda:go-sysctl:6be7678:achanda/src/github.com/achanda/go-sysctl \
-			aelsabbahy:go-ps:4433868:gops/src/github.com/aelsabbahy/go-ps \
-			aelsabbahy:GOnetstat:edf89f7:GOnetstat/src/github.com/aelsabbahy/GOnetstat \
-			cheekybits:genny:e8e29e6:cheekybits/src/github.com/cheekybits/genny \
-			fatih:color:bf82308:fatih/src/github.com/fatih/color \
-			go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \
-			golang:sys:9a2e24c:sys/src/golang.org/x/sys \
-			mattn:go-colorable:d228849:mattn/src/github.com/mattn/go-colorable \
-			mattn:go-isatty:66b8e73:mattnisatty/src/github.com/mattn/go-isatty \
-			miekg:dns:58f52c5:miekg/src/github.com/miekg/dns \
-			moby:moby:383a2f0:docker/src/github.com/docker/docker \
-			oleiade:reflections:0e86b3c:oleiade/src/github.com/oleiade/reflections \
-			onsi:gomega:ff4bc6b:onsi/src/github.com/onsi/gomega \
-			opencontainers:runc:8779fa5:opencontainers/src/github.com/opencontainers/runc \
-			patrickmn:go-cache:1881a9b:patrickmn/src/github.com/patrickmn/go-cache \
-			urfave:cli:d86a009:urfave/src/github.com/urfave/cli
+GH_TUPLE=		achanda:go-sysctl:6be7678:achanda/vendor/github.com/achanda/go-sysctl \
+			aelsabbahy:go-ps:4433868:gops/vendor/github.com/aelsabbahy/go-ps \
+			aelsabbahy:GOnetstat:edf89f7:GOnetstat/vendor/github.com/aelsabbahy/GOnetstat \
+			cheekybits:genny:e8e29e6:cheekybits/vendor/github.com/cheekybits/genny \
+			fatih:color:bf82308:fatih/vendor/github.com/fatih/color \
+			go-yaml:yaml:a5b47d3:yaml/vendor/gopkg.in/yaml.v2 \
+			golang:sys:9a2e24c:sys/vendor/golang.org/x/sys \
+			mattn:go-colorable:d228849:mattn/vendor/github.com/mattn/go-colorable \
+			mattn:go-isatty:66b8e73:mattnisatty/vendor/github.com/mattn/go-isatty \
+			miekg:dns:58f52c5:miekg/vendor/github.com/miekg/dns \
+			moby:moby:383a2f0:docker/vendor/github.com/docker/docker \
+			oleiade:reflections:0e86b3c:oleiade/vendor/github.com/oleiade/reflections \
+			onsi:gomega:ff4bc6b:onsi/vendor/github.com/onsi/gomega \
+			opencontainers:runc:8779fa5:opencontainers/vendor/github.com/opencontainers/runc \
+			patrickmn:go-cache:1881a9b:patrickmn/vendor/github.com/patrickmn/go-cache \
+			urfave:cli:d86a009:urfave/vendor/github.com/urfave/cli
+
+GO_BUILDFLAGS=		-ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w"
+GO_TARGET=		./cmd/${PORTNAME}

 post-patch:
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/extras/goss.yaml.sample

-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \
-	go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" -o \
-		bin/${PORTNAME} ./cmd/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/extras/goss.yaml.sample ${STAGEDIR}${PREFIX}/etc/goss.yaml.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/goss.d
 	${INSTALL_DATA} ${WRKSRC}/extras/process_goss.yaml.sample \
--- a/sysutils/hared/Makefile
+++ b/sysutils/hared/Makefile
@ -16,11 +16,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jpmens
 GH_PROJECT=	hared-hare

-GH_TUPLE=	go-gcfg:gcfg:f02745a:gcfg/src/gopkg.in/gcfg.v1 \
-		go-warnings:warnings:27b9fab:warnings/src/gopkg.in/warnings.v0 \
-		eclipse:paho.mqtt.golang:d4f545e:paho/src/github.com/eclipse/paho.mqtt.golang \
-		golang:net:9dfe398:net/src/golang.org/x/net \
-		gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket
+GH_TUPLE=	go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \
+		go-warnings:warnings:27b9fab:warnings/vendor/gopkg.in/warnings.v0 \
+		eclipse:paho.mqtt.golang:d4f545e:paho/vendor/github.com/eclipse/paho.mqtt.golang \
+		golang:net:9dfe398:net/vendor/golang.org/x/net \
+		gorilla:websocket:7a8dacf:websocket/vendor/github.com/gorilla/websocket
+
+GO_TARGET=	./daemon:${PORTNAME}

 CONFLICTS_INSTALL=	sysutils/py-hared

@ -28,13 +30,7 @@ OPTIONS_DEFINE=	DOCS

 ETCDIR=		${PREFIX}/etc

-do-build:
-	(cd ${GO_WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \
-	${GO_CMD} build -o ${GO_PKGNAME} ./daemon/hared.go)
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_PKGNAME} ${STAGEDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.sample ${STAGEDIR}${ETCDIR}

 post-install-DOCS-on:
--- a/sysutils/helm/Makefile
+++ b/sysutils/helm/Makefile
@ -15,29 +15,15 @@ RUN_DEPENDS=	kubectl:sysutils/kubectl

 USES=		go tar:xz

-PLIST_FILES=	bin/${PORTNAME} \
-		bin/tiller \
-		bin/rudder
-
-post-patch:
-	${MV} ${WRKSRC}/vendor/* ${WRKDIR}/src/
-	${LN} -s ${WRKSRC} ${WRKDIR}/src/k8s.io/helm
-
-do-build:
-.for cmd in helm tiller rudder
-	cd ${WRKDIR}/src/k8s.io/helm/cmd/${cmd} ; \
-		GOPATH=${WRKDIR} GOCACHE=${WRKDIR}/.gocache go build \
-		-ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \
+GO_PKGNAME=	k8s.io/helm
+GO_BUILDFLAGS=	-ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \
 		-X k8s.io/helm/pkg/version.GitCommit=5270352a09c7e8b6e8c9593002a73535276507c0 \
 		-X k8s.io/helm/pkg/version.BuildMetadata="
-.endfor
+GO_TARGET=	./cmd/${PORTNAME} \
+		./cmd/tiller \
+		./cmd/rudder

-do-install:
-.for cmd in helm tiller rudder
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/cmd/${cmd}/${cmd} \
-		${STAGEDIR}${PREFIX}/bin/${cmd}
-.endfor
+PLIST_FILES=	${GO_TARGET:C/.\/cmd/bin/}

 maintainer-distfile:
 	(cd /tmp; fetch https://github.com/helm/helm/archive/v${PORTVERSION}.tar.gz; \
--- a/sysutils/immortal/Makefile
+++ b/sysutils/immortal/Makefile
@ -13,34 +13,23 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go
 USE_RC_SUBR=	immortaldir
 USE_GITHUB=	yes
-GH_TUPLE=	immortal:logrotate:6f52ae7:logrotate/src/github.com/immortal/logrotate \
-		immortal:multiwriter:2e0dd11:multiwriter/src/github.com/immortal/multiwriter \
-		immortal:natcasesort:162328b:natcasesort/src/github.com/immortal/natcasesort \
-		immortal:xtime:fb1aca1:xtime/src/github.com/immortal/xtime \
-		nbari:violetear:5c7cdfe:nbari/src/github.com/nbari/violetear \
-		go-yaml:yaml:51d6538:yaml/src/github.com/go-yaml/yaml
+GH_TUPLE=	immortal:logrotate:6f52ae7:logrotate/vendor/github.com/immortal/logrotate \
+		immortal:multiwriter:2e0dd11:multiwriter/vendor/github.com/immortal/multiwriter \
+		immortal:natcasesort:162328b:natcasesort/vendor/github.com/immortal/natcasesort \
+		immortal:xtime:fb1aca1:xtime/vendor/github.com/immortal/xtime \
+		nbari:violetear:5c7cdfe:nbari/vendor/github.com/nbari/violetear \
+		go-yaml:yaml:51d6538:yaml/vendor/github.com/go-yaml/yaml
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}

+GO_BUILDFLAGS=	-ldflags "-s -w -X main.version=${PORTVERSION}"
+GO_TARGET=	./cmd/immortal \
+		./cmd/immortalctl \
+		./cmd/immortaldir
+
 OPTIONS_DEFINE=	EXAMPLES

-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-s -w -X main.version=${PORTVERSION}" -o immortal cmd/immortal/main.go;
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-s -w -X main.version=${PORTVERSION}" -o immortalctl cmd/immortalctl/main.go;
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
-	"-s -w -X main.version=${PORTVERSION}" -o immortaldir cmd/immortaldir/main.go;
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortal ${STAGEDIR}${PREFIX}/bin/immortal
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortalctl ${STAGEDIR}${PREFIX}/bin/immortalctl
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortaldir ${STAGEDIR}${PREFIX}/bin/immortaldir
-	${INSTALL_MAN} ${WRKSRC}/src/github.com/immortal/immortal/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
-
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/src/github.com/immortal/immortal/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/www.yml ${STAGEDIR}${EXAMPLESDIR}/www.yml.sample
--- a/sysutils/ipfs-go/Makefile
+++ b/sysutils/ipfs-go/Makefile
@ -20,7 +20,7 @@ ONLY_FOR_ARCHS=	amd64 i386

 USES=		go:modules

-GO_TARGET=	./cmd/ipfs
+GO_TARGET=	./cmd/ipfs:ipfs-go

 NO_WRKSUBDIR=	yes

@ -52,8 +52,7 @@ post-patch:
 	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go
 	@${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go

-do-install:
+post-install:
 	@${MKDIR} ${STAGEDIR}${IPFS_HOME}
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}

 .include <bsd.port.mk>
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@ -14,32 +14,21 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	On i386: go compiler crashes: https://github.com/golang/go/issues/23763

-USES=		compiler go
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 GH_SUBDIR=	src/github.com/hashicorp/nomad
 USE_RC_SUBR=	nomad

+GO_BUILDFLAGS=	-tags ui \
+		-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"
+
 USERS=		nomad
 GROUPS=		nomad

-do-build:
-	@cd ${WRKSRC}/src/github.com/hashicorp/nomad && \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x -tags ui \
-			-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/nomad/bin/nomad ${STAGEDIR}${PREFIX}/bin/nomad
+post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/client.hcl \
-		${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/server.hcl \
-		${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample
+	${INSTALL_DATA} ${WRKSRC}/dist/client.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample
+	${INSTALL_DATA} ${WRKSRC}/dist/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample

-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/sysutils/paladin/Makefile
+++ b/sysutils/paladin/Makefile
@ -12,15 +12,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 USES=		go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags="-X main.localbase=/usr/local"

 USE_GITHUB=	yes
 GH_ACCOUNT=	rwestlund

-# Override default build command to pass ldflags.
-do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install \
-		-ldflags="-X main.localbase=/usr/local" -v ${GO_TARGET})
-
 post-install:
 	@${CP} ${WRKSRC}/etc/paladin.conf.sample ${STAGEDIR}/${LOCALBASE}/etc/
 	@${CP} ${WRKSRC}/etc/rc.d/paladin ${STAGEDIR}/${LOCALBASE}/etc/rc.d/
--- a/sysutils/phpfpm_exporter/Makefile
+++ b/sysutils/phpfpm_exporter/Makefile
@ -17,13 +17,9 @@ GH_ACCOUNT=	bakins
 GH_PROJECT=	php-fpm-exporter

 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=	./cmd/${GH_PROJECT}:${PORTNAME}
+
 PLIST_FILES=	bin/${PORTNAME}
 USE_RC_SUBR=	phpfpm_exporter

-do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 ${GO_CMD} build -o ${PORTNAME} ./cmd/${GH_PROJECT})
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.mk>
--- a/sysutils/rest-server/Makefile
+++ b/sysutils/rest-server/Makefile
@ -25,7 +25,4 @@ GROUPS=		restserver

 PLIST_FILES=	bin/${PORTNAME}

-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.mk>
--- a/sysutils/snmp_exporter/Makefile
+++ b/sysutils/snmp_exporter/Makefile
@ -18,7 +18,8 @@ USE_RC_SUBR=	snmp_exporter

 GH_ACCOUNT=	prometheus

-GO_TARGET=	. ./generator
+GO_TARGET=	. \
+		./generator:snmp_exporter_generator

 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${GO_WRKSRC}/generator/main.go
@ -26,6 +27,5 @@ post-patch:
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/
 	${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml
-	${MV} ${STAGEDIR}${PREFIX}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator

 .include <bsd.port.mk>
--- a/sysutils/sockaddr/Makefile
+++ b/sysutils/sockaddr/Makefile
@ -18,19 +18,12 @@ GH_ACCOUNT=	hashicorp
 GH_PROJECT=	go-sockaddr
 GH_TAGNAME=	7165ee1

+GO_BUILDFLAGS=	-ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s"
+GO_TARGET=	./cmd/${PORTNAME}
+
 PLIST_FILES=	bin/sockaddr

-post-extract:
-	@${CP} -rp ${WRKSRC}/cmd/${PORTNAME}/vendor/* ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/${PORTNAME}/ && \
-	${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \
-	${LOCALBASE}/bin/go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s" \
-		-o ${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/go-sockaddr/cmd/${PORTNAME}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-patch:
+	@${LN} -s ${WRKSRC}/cmd/${PORTNAME}/vendor ${WRKSRC}

 .include <bsd.port.mk>
--- a/sysutils/zrepl/Makefile
+++ b/sysutils/zrepl/Makefile
@ -19,39 +19,39 @@ USE_RC_SUBR=	zrepl
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 USE_GITHUB=	yes
 GH_SUBDIR=	src/github.com/zrepl/zrepl
-GH_TUPLE=	beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \
-		fatih:color:v1.7.0:color/src/github.com/fatih/color \
-		ftrvxmtrx:fd:c6d8003:fd/src/github.com/ftrvxmtrx/fd \
-		gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \
-		gdamore:tcell:v1.1.0:tcell/src/github.com/gdamore/tcell \
-		go-logfmt:logfmt:v0.4.0:logfmt/src/github.com/go-logfmt/logfmt \
-		golang:net:351d144:net/src/golang.org/x/net \
-		golang:protobuf:v1.3.1:protobuf/src/github.com/golang/protobuf \
-		golang:sync:e225da7:sync/src/golang.org/x/sync \
-		golang:sys:4ed8d59:sys/src/golang.org/x/sys \
-		golang:text:v0.3.0:go_text/src/golang.org/x/text \
-		google:go-genproto:bd91e49:genproto/src/google.golang.org/genproto \
-		google:uuid:v1.1.1:uuid/src/github.com/google/uuid \
-		grpc:grpc-go:v1.17.0:grpc/src/google.golang.org/grpc \
-		jinzhu:copier:db4671f:copier/src/github.com/jinzhu/copier \
-		kr:pretty:cfb55aa:pretty/src/github.com/kr/pretty \
-		kr:text:7cafcd8:text/src/github.com/kr/text \
-		lucasb-eyer:go-colorful:v1.0:go_colorful/src/github.com/lucasb-eyer/go-colorful \
-		mattn:go-isatty:v0.0.3:go_isatty/src/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.3:go_runewidth/src/github.com/mattn/go-runewidth \
-		matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
-		pkg:errors:v0.8.1:errors/src/github.com/pkg/errors \
-		problame:go-netssh:09d6bc4:go_netssh/src/github.com/problame/go-netssh \
-		problame:go-rwccmd:391d2c7:go_rwccmd/src/github.com/problame/go-rwccmd \
-		prometheus:client_golang:e11c6ff:client_golang/src/github.com/prometheus/client_golang \
-		prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \
-		prometheus:common:d0f7cd6:common/src/github.com/prometheus/common \
-		prometheus:procfs:8b1c2da:procfs/src/github.com/prometheus/procfs \
-		spf13:cobra:b787445:cobra/src/github.com/spf13/cobra \
-		spf13:pflag:v1.0.0:pflag/src/github.com/spf13/pflag \
-		stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \
-		theckman:goconstraint:v1.11.0:goconstraint/src/github.com/theckman/goconstraint \
-		zrepl:yaml-config:08227ad:yaml_config/src/github.com/zrepl/yaml-config
+GH_TUPLE=	beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \
+		fatih:color:v1.7.0:color/vendor/github.com/fatih/color \
+		ftrvxmtrx:fd:c6d8003:fd/vendor/github.com/ftrvxmtrx/fd \
+		gdamore:encoding:b23993c:encoding/vendor/github.com/gdamore/encoding \
+		gdamore:tcell:v1.1.0:tcell/vendor/github.com/gdamore/tcell \
+		go-logfmt:logfmt:v0.4.0:logfmt/vendor/github.com/go-logfmt/logfmt \
+		golang:net:351d144:net/vendor/golang.org/x/net \
+		golang:protobuf:v1.3.1:protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:e225da7:sync/vendor/golang.org/x/sync \
+		golang:sys:4ed8d59:sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:go_text/vendor/golang.org/x/text \
+		google:go-genproto:bd91e49:genproto/vendor/google.golang.org/genproto \
+		google:uuid:v1.1.1:uuid/vendor/github.com/google/uuid \
+		grpc:grpc-go:v1.17.0:grpc/vendor/google.golang.org/grpc \
+		jinzhu:copier:db4671f:copier/vendor/github.com/jinzhu/copier \
+		kr:pretty:cfb55aa:pretty/vendor/github.com/kr/pretty \
+		kr:text:7cafcd8:text/vendor/github.com/kr/text \
+		lucasb-eyer:go-colorful:v1.0:go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+		mattn:go-isatty:v0.0.3:go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.3:go_runewidth/vendor/github.com/mattn/go-runewidth \
+		matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		pkg:errors:v0.8.1:errors/vendor/github.com/pkg/errors \
+		problame:go-netssh:09d6bc4:go_netssh/vendor/github.com/problame/go-netssh \
+		problame:go-rwccmd:391d2c7:go_rwccmd/vendor/github.com/problame/go-rwccmd \
+		prometheus:client_golang:e11c6ff:client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:d0f7cd6:common/vendor/github.com/prometheus/common \
+		prometheus:procfs:8b1c2da:procfs/vendor/github.com/prometheus/procfs \
+		spf13:cobra:b787445:cobra/vendor/github.com/spf13/cobra \
+		spf13:pflag:v1.0.0:pflag/vendor/github.com/spf13/pflag \
+		stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \
+		theckman:goconstraint:v1.11.0:goconstraint/vendor/github.com/theckman/goconstraint \
+		zrepl:yaml-config:08227ad:yaml_config/vendor/github.com/zrepl/yaml-config

 SUB_FILES=	pkg-message

@ -70,19 +70,13 @@ SUB_LIST+=	DAEMON_LOGGING="-S -l \$${zrepl_facility} -s \$${zrepl_priority} -T \
 SUB_LIST+=	DAEMON_LOGGING=""
 .endif

-post-extract:
-	${LN} -sf ${WRKSRC}/src ${WRKDIR}
-
 post-build-MANPAGES-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man

-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zrepl/samples
 	${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl-0.1.json ${STAGEDIR}${PREFIX}/share/zrepl/samples/
 	${INSTALL_DATA} ${WRKSRC}/config/samples/* ${STAGEDIR}${PREFIX}/share/zrepl/samples/
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
 		${STAGEDIR}${PREFIX}/etc/syslog.d \
 		${STAGEDIR}${PREFIX}/etc/zrepl \
--- a/textproc/consul-template/Makefile
+++ b/textproc/consul-template/Makefile
@ -21,13 +21,4 @@ PLIST_FILES=	bin/consul-template

 USE_RC_SUBR=	consul-template

-do-build:
-	@cd ${WRKSRC}/src/github.com/hashicorp/consul-template ; \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
-
-do-install:
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/src/github.com/hashicorp/consul-template/consul-template \
-		${STAGEDIR}${PREFIX}/bin/consul-template
-
 .include <bsd.port.mk>
--- a/textproc/gron/Makefile
+++ b/textproc/gron/Makefile
@ -15,24 +15,13 @@ LICENSE=	MIT
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	tomnomnom
-GH_TUPLE=	fatih:color:v1.7.0:color \
-		mattn:go-colorable:v0.1.1:colorable \
-		mattn:go-isatty:v0.0.6:isatty \
-		nwidger:jsoncolor:75a6de4:jsoncolor \
-		pkg:errors:v0.8.1:pkg_errors
+GH_TUPLE=	fatih:color:v1.7.0:color/vendor/github.com/fatih/color \
+		mattn:go-colorable:v0.1.1:colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.6:isatty/vendor/github.com/mattn/go-isatty \
+		nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \
+		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors
 GO_BUILDFLAGS=	-ldflags="-X main.gronVersion=${PORTVERSION}"

 PLIST_FILES=	bin/${PORTNAME}

-pre-build:
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/fatih \
-		${GO_WRKDIR_SRC}/github.com/mattn \
-		${GO_WRKDIR_SRC}/github.com/pkg \
-		${GO_WRKDIR_SRC}/github.com/nwidger
-	${MV} ${WRKSRC_color} ${GO_WRKDIR_SRC}/github.com/fatih/color
-	${MV} ${WRKSRC_colorable} ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable
-	${MV} ${WRKSRC_isatty} ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty
-	${MV} ${WRKSRC_jsoncolor} ${GO_WRKDIR_SRC}/github.com/nwidger/jsoncolor
-	${MV} ${WRKSRC_pkg_errors} ${GO_WRKDIR_SRC}/github.com/pkg/errors
-
 .include <bsd.port.mk>
--- a/textproc/jid/Makefile
+++ b/textproc/jid/Makefile
@ -14,19 +14,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	simeji
 GH_SUBDIR=	src/github.com/simeji/jid
-GH_TUPLE=	bitly:go-simplejson:aabad6e:simplejson/src/github.com/bitly/go-simplejson \
-		fatih:color:7824417:color/src/github.com/fatih/color \
-		mattn:go-runewidth:9e777a8:runewidth/src/github.com/mattn/go-runewidth \
-		nsf:termbox-go:3540b76:termbox/src/github.com/nsf/termbox-go \
-		nwidger:jsoncolor:75a6de4:jsoncolor/src/github.com/nwidger/jsoncolor \
-		pkg:errors:645ef00:errors/src/github.com/pkg/errors
+GH_TUPLE=	bitly:go-simplejson:aabad6e:simplejson/vendor/github.com/bitly/go-simplejson \
+		fatih:color:7824417:color/vendor/github.com/fatih/color \
+		mattn:go-runewidth:9e777a8:runewidth/vendor/github.com/mattn/go-runewidth \
+		nsf:termbox-go:3540b76:termbox/vendor/github.com/nsf/termbox-go \
+		nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \
+		pkg:errors:645ef00:errors/vendor/github.com/pkg/errors

 USES=		go

+GO_TARGET=	./cmd/jid
+
 PLIST_FILES=	bin/jid

-do-build:
-	@(cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go)
-
 .include <bsd.port.mk>
--- a/textproc/minify/Makefile
+++ b/textproc/minify/Makefile
@ -28,7 +28,4 @@ GH_TUPLE=	dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/
 		tdewolff:test:v1.0.4:tdewolff_test/vendor/github.com/tdewolff/test
 USE_GITHUB=	yes

-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/minify ${STAGEDIR}${PREFIX}/bin/minify
-
 .include <bsd.port.mk>
--- a/textproc/sift/Makefile
+++ b/textproc/sift/Makefile
@ -20,13 +20,10 @@ GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 PLIST_FILES=	bin/sift

 GH_ACCOUNT=	svent
-GH_TUPLE=	golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \
-		golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \
-		svent:go-flags:4bcbad3:svent_goflags/../src/github.com/svent/go-flags \
-		svent:go-nbreader:7cef48d:svent_gonbreader/../src/github.com/svent/go-nbreader
+GH_TUPLE=	golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \
+		svent:go-flags:4bcbad3:svent_goflags/vendor/github.com/svent/go-flags \
+		svent:go-nbreader:7cef48d:svent_gonbreader/vendor/github.com/svent/go-nbreader
 USE_GITHUB=	yes

-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/sift ${STAGEDIR}${PREFIX}/bin/sift
-
 .include <bsd.port.mk>
--- a/textproc/spiff/Makefile
+++ b/textproc/spiff/Makefile
@ -13,6 +13,8 @@ USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudfoundry-incubator

+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+
 PLIST_FILES=	bin/spiff

 PORTDOCS=	LICENSE README.md examples/cf-aws.yml \
@ -20,28 +22,10 @@ PORTDOCS=	LICENSE README.md examples/cf-aws.yml \

 OPTIONS_DEFINE=	DOCS

-post-patch:
-	@cd ${WRKSRC} ; ${MV} ${WRKSRC}/vendor ${WRKSRC}/src
-	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${MV} .gitignore LICENSE Makefile README.md \
-		compare dynaml examples flow init_test.go scripts spiff.go \
-		spiff_test.go yaml \
-		src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build spiff.go
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/
-
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \
-		${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \
-		${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- 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}

--- 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

+GO_BUILDFLAGS=	-ldflags "-X main.GitDescribe=v${PORTVERSION}"
+GO_TARGET=	:${PREFIX}/sbin/fabio
+
 USE_RC_SUBR=	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
-
-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>
--- 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
--- 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>
--- 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}

+GO_BUILDFLAGS=	-ldflags "-s -w"
+
 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
-
-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
-
 .include <bsd.port.mk>
--- 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>
--- 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>
--- 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
+
+GO_PKGNAME=	gitlab.com/davidjpeacock/kurly

 PLIST_FILES=	bin/kurly

-do-build:
-	cd ${WRKSRC_kurly} && \
-		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -o ${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC_kurly}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.mk>
--- 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

--- 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>
--- 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
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}

 PLIST_FILES=	bin/${PORTNAME}

-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
--- 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>
--- 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>
--- 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>
--- 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
+
+GO_TARGET=		./cmd/${PORTNAME}

 PLIST_FILES=		bin/${PORTNAME}

-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -p ${MAKE_JOBS_NUMBER} ./cmd/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
--- a/x11/aminal/Makefile
+++ b/x11/aminal/Makefile
@ -9,34 +9,25 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Golang terminal emulator from scratch

 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		gl go
-USE_GITHUB=	nodefault # the main code is in GH_TUPLE
+USES=		gl go xorg
+USE_GITHUB=	yes
 GH_ACCOUNT=	liamg
-GH_TUPLE=	liamg:aminal:${DISTVERSIONFULL}:main/src/github.com/liamg/aminal \
-		BurntSushi:xgb:27f1227:xgb/src/github.com/BurntSushi/xgb \
-		gen2brain:shm:6c18ff7:shm/src/github.com/gen2brain/shm
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+GH_TUPLE=	BurntSushi:xgb:27f1227:xgb/vendor/github.com/BurntSushi/xgb \
+		gen2brain:shm:6c18ff7:shm/vendor/github.com/gen2brain/shm
 USE_GL=		gl
 USE_XORG=	x11 xcursor xi xinerama xrandr xxf86vm

-MAKE_ENV=	CGO_CFLAGS="-I${LOCALBASE}/include" CGO_LDFLAGS="-L${LOCALBASE}/lib"
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}

 PLIST_FILES=	bin/${PORTNAME}

 PORTSCOUT=	limit:^[0-9].*

 post-patch: # https://github.com/liamg/aminal/issues/208
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/platform && \
+	@cd ${WRKSRC}/platform && \
 		${CP} linuxLaunch.go freebsdLaunch.go && \
 		${REINPLACE_CMD} 's|build linux|build freebsd|' freebsdLaunch.go

-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./...
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
--- a/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go
+++ b/x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go
@ -1,5 +1,5 @@
--- src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go.orig	2018-12-15 01:47:38 UTC
-+++ src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go
+--- vendor/github.com/riywo/loginshell/loginshell.go.orig	2018-12-15 01:47:38 UTC
+++ vendor/github.com/riywo/loginshell/loginshell.go
@@ -15,6 +15,8 @@ func Shell() (string, error) {
     switch runtime.GOOS {
         case "linux":