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

- Remove custom build/install targets left in place after r505321
- Switch to the new GO_TARGET tuple syntax introduced in r512001
- Switch to go:modules when upstream already uses them

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

8 files changed, 207 insertions, 252 deletions

diff --git a/security/acmetool/Makefile b/security/acmetool/Makefile
index f7812562d00f..462da94a56f1 100644
--- a/security/acmetool/Makefile
+++ b/security/acmetool/Makefile
@@ -16,49 +16,46 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	hlandau
 GH_PROJECT=	acme
 GH_SUBDIR=	src/github.com/hlandau/acme
-GH_TUPLE=	alecthomas:template:a0175ee:template/src/github.com/alecthomas/template \
-		alecthomas:units:2efee85:units/src/github.com/alecthomas/units \
-		coreos:go-systemd:749ef98:go_systemd/src/github.com/coreos/go-systemd \
-		hlandau:acme:221ea15:acme/src/github.com/hlandau/acme \
-		hlandau:buildinfo:337a29b:buildinfo/src/github.com/hlandau/buildinfo \
-		hlandau:dexlogconfig:244f29b:dexlogconfig/src/github.com/hlandau/dexlogconfig \
-		hlandau:goutils:0cdb66a:goutils/src/github.com/hlandau/goutils \
-		hlandau:xlog:197ef79:xlog/src/github.com/hlandau/xlog \
-		jmhodges:clock:880ee4c:clock/src/github.com/jmhodges/clock \
-		mattn:go-isatty:6ca4dbf:go_isatty/src/github.com/mattn/go-isatty \
-		mattn:go-runewidth:a9d6d1e:go_runewidth/src/github.com/mattn/go-runewidth \
-		mitchellh:go-wordwrap:ad45545:go_wordwrap/src/github.com/mitchellh/go-wordwrap \
-		ogier:pflag:45c278a:pflag/src/github.com/ogier/pflag \
-		peterhellberg:link:6d32b8d:link/src/github.com/peterhellberg/link \
-		satori:go.uuid:36e9d2e:go_uuid/src/github.com/satori/go.uuid \
-		shiena:ansicolor:a422bbe:ansicolor/src/github.com/shiena/ansicolor \
-		golang:crypto:91a49db:crypto/src/golang.org/x/crypto \
-		golang:net:22ae77b:net/src/golang.org/x/net \
-		golang:sys:dd2ff4a:sys/src/golang.org/x/sys \
-		golang:text:b7ef84a:text/src/golang.org/x/text \
-		alecthomas:kingpin:947dcec:kingpin/src/gopkg.in/alecthomas/kingpin.v2 \
-		cheggaaa:pb:72b9643:pb/src/gopkg.in/cheggaaa/pb.v1 \
-		hlandau:configurable:4149686:configurable/src/gopkg.in/hlandau/configurable.v1 \
-		hlandau:easyconfig:7589cb9:easyconfig/src/gopkg.in/hlandau/easyconfig.v1 \
-		hlandau:service:b64b346:service/src/gopkg.in/hlandau/service.v2 \
-		hlandau:svcutils:c25dac4:svcutils/src/gopkg.in/hlandau/svcutils.v1 \
-		square:go-jose:aa2e30f:go_jose/src/gopkg.in/square/go-jose.v1 \
-		tylerb:graceful:4654dfb:graceful/src/gopkg.in/tylerb/graceful.v1 \
-		go-yaml:yaml:7f97868:go_yaml/src/gopkg.in/yaml.v2
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/hlandau/acme && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
-		go build -o ${WRKSRC}/bin/${PORTNAME} -ldflags "\
+GH_TUPLE=	alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/template \
+		alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \
+		coreos:go-systemd:749ef98:go_systemd/vendor/github.com/coreos/go-systemd \
+		hlandau:acme:221ea15:acme/vendor/github.com/hlandau/acme \
+		hlandau:buildinfo:337a29b:buildinfo/vendor/github.com/hlandau/buildinfo \
+		hlandau:dexlogconfig:244f29b:dexlogconfig/vendor/github.com/hlandau/dexlogconfig \
+		hlandau:goutils:0cdb66a:goutils/vendor/github.com/hlandau/goutils \
+		hlandau:xlog:197ef79:xlog/vendor/github.com/hlandau/xlog \
+		jmhodges:clock:880ee4c:clock/vendor/github.com/jmhodges/clock \
+		mattn:go-isatty:6ca4dbf:go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:a9d6d1e:go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mitchellh:go-wordwrap:ad45545:go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
+		ogier:pflag:45c278a:pflag/vendor/github.com/ogier/pflag \
+		peterhellberg:link:6d32b8d:link/vendor/github.com/peterhellberg/link \
+		satori:go.uuid:36e9d2e:go_uuid/vendor/github.com/satori/go.uuid \
+		shiena:ansicolor:a422bbe:ansicolor/vendor/github.com/shiena/ansicolor \
+		golang:crypto:91a49db:crypto/vendor/golang.org/x/crypto \
+		golang:net:22ae77b:net/vendor/golang.org/x/net \
+		golang:sys:dd2ff4a:sys/vendor/golang.org/x/sys \
+		golang:text:b7ef84a:text/vendor/golang.org/x/text \
+		alecthomas:kingpin:947dcec:kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
+		cheggaaa:pb:72b9643:pb/vendor/gopkg.in/cheggaaa/pb.v1 \
+		hlandau:configurable:4149686:configurable/vendor/gopkg.in/hlandau/configurable.v1 \
+		hlandau:easyconfig:7589cb9:easyconfig/vendor/gopkg.in/hlandau/easyconfig.v1 \
+		hlandau:service:b64b346:service/vendor/gopkg.in/hlandau/service.v2 \
+		hlandau:svcutils:c25dac4:svcutils/vendor/gopkg.in/hlandau/svcutils.v1 \
+		square:go-jose:aa2e30f:go_jose/vendor/gopkg.in/square/go-jose.v1 \
+		tylerb:graceful:4654dfb:graceful/vendor/gopkg.in/tylerb/graceful.v1 \
+		go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2
+
+GO_BUILDFLAGS=	-ldflags "\
 		-X github.com/hlandau/acme/hooks.DefaultPath=${PREFIX}/libexec/acme/hooks \
 		-X github.com/hlandau/acme/storage.RecommendedPath=/var/db/acme \
-		-X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports \
-		"\
-		github.com/hlandau/acme/cmd/acmetool
-	@${WRKSRC}/bin/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8
+		-X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports"
+GO_TARGET=	./cmd/acmetool
+
+post-build:
+	${GO_WRKDIR_BIN}/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 	${MKDIR} ${STAGEDIR}/var/db/acme
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/acme/hooks
diff --git a/security/go-cve-dictionary/Makefile b/security/go-cve-dictionary/Makefile
index a48853951a49..27887eba3893 100644
--- a/security/go-cve-dictionary/Makefile
+++ b/security/go-cve-dictionary/Makefile
@@ -20,34 +20,36 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	kotakanbe
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
-GH_TUPLE+=	VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1
-GH_TUPLE+=	asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator
-GH_TUPLE+=	cheggaaa:pb:v2.0.6:pb/src/gopkg.in/cheggaaa/pb.v2
-GH_TUPLE+=	dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go
-GH_TUPLE+=	fatih:color:v1.7.0:colorv1/src/github.com/fatih/color
-GH_TUPLE+=	go-redis:redis:v6.13.2:redis/src/github.com/go-redis/redis
-GH_TUPLE+=	go-sql-driver:mysql:v1.4.0:mysql/src/github.com/go-sql-driver/mysql
-GH_TUPLE+=	go-stack:stack:v1.7.0:gostack/src/github.com/go-stack/stack
-GH_TUPLE+=	golang:crypto:f027049:golangcrypto/src/golang.org/x/crypto
-GH_TUPLE+=	golang:sys:acbc56f:golangsys/src/golang.org/x/sys
-GH_TUPLE+=	google:subcommands:5bae204:subcommands/src/github.com/google/subcommands
-GH_TUPLE+=	hashicorp:go-version:270f2f7:goversion/src/github.com/hashicorp/go-version
-GH_TUPLE+=	inconshreveable:log15:v2.13:log15/src/github.com/inconshreveable/log15
-GH_TUPLE+=	jinzhu:gorm:v1.9.1:gorm/src/github.com/jinzhu/gorm
-GH_TUPLE+=	jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection
-GH_TUPLE+=	k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp
-GH_TUPLE+=	knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe
-GH_TUPLE+=	htcat:htcat:v1.0.2:htcat/src/github.com/htcat/htcat
-GH_TUPLE+=	labstack:echo:6d227df:echo/src/github.com/labstack/echo
-GH_TUPLE+=	labstack:gommon:0.2.6:gommon/src/github.com/labstack/gommon
-GH_TUPLE+=	lib:pq:90697d6:pq/src/github.com/lib/pq
-GH_TUPLE+=	mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable
-GH_TUPLE+=	mattn:go-isatty:v0.0.3:goisatty/src/github.com/mattn/go-isatty
-GH_TUPLE+=	mattn:go-runewidth:v0.0.2:gorunewidth/src/github.com/mattn/go-runewidth
-GH_TUPLE+=	mattn:go-sqlite3:v1.9.0:gosqlite3/src/github.com/mattn/go-sqlite3
-GH_TUPLE+=	olekukonko:tablewriter:d4647c9:tablewriter/src/github.com/olekukonko/tablewriter
-GH_TUPLE+=	pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors
-GH_TUPLE+=	valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate
+GH_TUPLE+=	VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1
+GH_TUPLE+=	asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator
+GH_TUPLE+=	cheggaaa:pb:v2.0.6:pb/vendor/gopkg.in/cheggaaa/pb.v2
+GH_TUPLE+=	dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go
+GH_TUPLE+=	fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color
+GH_TUPLE+=	go-redis:redis:v6.13.2:redis/vendor/github.com/go-redis/redis
+GH_TUPLE+=	go-sql-driver:mysql:v1.4.0:mysql/vendor/github.com/go-sql-driver/mysql
+GH_TUPLE+=	go-stack:stack:v1.7.0:gostack/vendor/github.com/go-stack/stack
+GH_TUPLE+=	golang:crypto:f027049:golangcrypto/vendor/golang.org/x/crypto
+GH_TUPLE+=	golang:sys:acbc56f:golangsys/vendor/golang.org/x/sys
+GH_TUPLE+=	google:subcommands:5bae204:subcommands/vendor/github.com/google/subcommands
+GH_TUPLE+=	hashicorp:go-version:270f2f7:goversion/vendor/github.com/hashicorp/go-version
+GH_TUPLE+=	inconshreveable:log15:v2.13:log15/vendor/github.com/inconshreveable/log15
+GH_TUPLE+=	jinzhu:gorm:v1.9.1:gorm/vendor/github.com/jinzhu/gorm
+GH_TUPLE+=	jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection
+GH_TUPLE+=	k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp
+GH_TUPLE+=	knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe
+GH_TUPLE+=	htcat:htcat:v1.0.2:htcat/vendor/github.com/htcat/htcat
+GH_TUPLE+=	labstack:echo:6d227df:echo/vendor/github.com/labstack/echo
+GH_TUPLE+=	labstack:gommon:0.2.6:gommon/vendor/github.com/labstack/gommon
+GH_TUPLE+=	lib:pq:90697d6:pq/vendor/github.com/lib/pq
+GH_TUPLE+=	mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable
+GH_TUPLE+=	mattn:go-isatty:v0.0.3:goisatty/vendor/github.com/mattn/go-isatty
+GH_TUPLE+=	mattn:go-runewidth:v0.0.2:gorunewidth/vendor/github.com/mattn/go-runewidth
+GH_TUPLE+=	mattn:go-sqlite3:v1.9.0:gosqlite3/vendor/github.com/mattn/go-sqlite3
+GH_TUPLE+=	olekukonko:tablewriter:d4647c9:tablewriter/vendor/github.com/olekukonko/tablewriter
+GH_TUPLE+=	pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors
+GH_TUPLE+=	valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate
+
+GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION}"
 
 USERS=		vuls
 GROUPS=		vuls
@@ -60,22 +62,15 @@ post-patch:
 		${WRKSRC}/db/rdb.go \
 		${WRKSRC}/db/redis.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \
-		${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/util.go
+		${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/util.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \
-		${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go
+		${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \
-		${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go
+		${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \
-		${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/template.go
-
-do-build:
-	@cd ${GO_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \
-		${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \
-		-o ${WRKSRC}/${PORTNAME}
+		${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/template.go
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
 	${MKDIR} ${STAGEDIR}/var/db/vuls
 	${MKDIR} ${STAGEDIR}/var/log/vuls
 
diff --git a/security/meek/Makefile b/security/meek/Makefile
index 347f2634ec66..f8b8b8c5eec6 100644
--- a/security/meek/Makefile
+++ b/security/meek/Makefile
@@ -17,9 +17,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		go
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	golang:crypto:c126467:crypto/src/golang.org/x/crypto \
-		golang:net:a680a1e:net/src/golang.org/x/net \
-		golang:text:0605a83:text/src/golang.org/x/text
+GH_TUPLE=	golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \
+		golang:net:a680a1e:net/vendor/golang.org/x/net \
+		golang:text:0605a83:text/vendor/golang.org/x/text
+
+GO_TARGET=	./meek-client \
+		./meek-server
 
 GOPTLIBVERSION=	0.7
 
@@ -30,22 +33,18 @@ PLIST_FILES=	bin/meek-client \
 
 SUB_FILES=	pkg-message
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/src/git.torproject.org/pluggable-transports
-	@${LN} -s ${WRKDIR}/${PORTNAME}-${PORTVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/${PORTNAME}
-	@${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/goptlib.git
-
-do-build:
-	@cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
-	@cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
+post-patch:
+	@${MKDIR} ${WRKDIR}/src/git.torproject.org/pluggable-transports
+	@${LN} -s ${WRKSRC} ${WRKDIR}/src/git.torproject.org/pluggable-transports/${PORTNAME}
+	@${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKDIR}/src/git.torproject.org/pluggable-transports/goptlib.git
 
 do-test:
-	@cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test
-	@cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test
+.for t in ${GO_TARGET}
+	cd ${GO_WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} ${t}
+.endfor
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/meek-client/meek-client ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/meek-server/meek-server ${STAGEDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-server.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-client.1 ${STAGEDIR}${PREFIX}/man/man1
 
diff --git a/security/obfs4proxy-tor/Makefile b/security/obfs4proxy-tor/Makefile
index 2f338cf493cb..ef486fbbb0cf 100644
--- a/security/obfs4proxy-tor/Makefile
+++ b/security/obfs4proxy-tor/Makefile
@@ -13,42 +13,35 @@ COMMENT=	Pluggable transport proxy for Tor (obfs4, The Obfuscator)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/LICENSE
 
-USES=		cpe go tar:xz
+USES=		cpe go:modules tar:xz
 
 CPE_VENDOR=	torproject
 
-GO_TARGET=	gitlab.com/yawning/obfs4.git
-
 USE_GITHUB=	nodefault
-GH_TUPLE=	ahf:goptlib:7d56ec4:goptlib/src/git.torproject.org/pluggable-transports/goptlib.git \
-		agl:ed25519:5312a61:ed25519/src/github.com/agl/ed25519 \
-		dchest:siphash:v1.2.1:siphash/src/github.com/dchest/siphash \
-		dsnet:compress:v0.0.1:dsnet_compress/src/github.com/dsnet/compress \
-		golang:crypto:cc06ce4:golang_crypto/src/golang.org/x/crypto \
-		golang:net:3b0461e:golang_net/src/golang.org/x/net \
-		golang:text:v0.3.0:golang_text/src/golang.org/x/text \
-		golang:sys:d432491:golang_sys/src/golang.org/x/sys \
-		Yawning:bsaes:26d1add:Yawning_bsaes/src/git.schwanenlied.me/yawning/bsaes.git
+GH_TUPLE=	ahf:goptlib:7d56ec4:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \
+		agl:ed25519:5312a61:ed25519/vendor/github.com/agl/ed25519 \
+		dchest:siphash:v1.2.1:siphash/vendor/github.com/dchest/siphash \
+		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
+		golang:crypto:cc06ce4:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:3b0461e:golang_net/vendor/golang.org/x/net \
+		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
+		golang:sys:d432491:golang_sys/vendor/golang.org/x/sys \
+		Yawning:bsaes:26d1add:Yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git
 
 USE_GITLAB=	nodefault
-GL_TUPLE=	yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/src/gitlab.com/yawning/utls.git
+GL_TUPLE=	yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/vendor/gitlab.com/yawning/utls.git
+
+GO_TARGET=	../obfs4proxy
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/obfs4proxy \
 		man/man1/obfs4proxy.1.gz
 
-do-build:
-	@${RM} ${WRKDIR}/go.mod
-	@${MKDIR} ${GO_WRKSRC}/src/${GO_TARGET:H}
-	@${RLN} ${WRKDIR} ${GO_WRKSRC}/src/${GO_TARGET}
-	@${RLN} ${WRKDIR}/src ${GO_WRKSRC}/src/${GO_TARGET}/src
-	@(cd ${WRKDIR}/${PORTNAME} && \
-	  ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKDIR}/src/${PORTNAME} ${GO_CMD} \
-	  build ${GO_BUILDFLAGS} -o ${WRKDIR}/bin/${PORTNAME})
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+post-patch:
+	${LN} -s ${WRKSRC}/vendor ${WRKDIR}
+
+post-install:
 	${INSTALL_MAN} ${WRKDIR}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/onionscan/Makefile b/security/onionscan/Makefile
index 8fc3b2382bbd..bab1ce4f87a9 100644
--- a/security/onionscan/Makefile
+++ b/security/onionscan/Makefile
@@ -15,24 +15,14 @@ USES=		go
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	s-rah
-GH_TUPLE=	HouzuoGuo:tiedot:3.4:tiedot/github.com/HouzuoGuo/tiedot \
-		rwcarlsen:goexif:8d986c0:goexif/github.com/rwcarlsen/goexif \
-		golang:crypto:0e37d00:crypto/golang.org/x/crypto \
-		golang:net:26e67e7:net/golang.org/x/net \
-		golang:sys:1561086:sys/golang.org/x/sys
+GH_TUPLE=	HouzuoGuo:tiedot:3.4:tiedot/vendor/github.com/HouzuoGuo/tiedot \
+		rwcarlsen:goexif:8d986c0:goexif/vendor/github.com/rwcarlsen/goexif \
+		golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \
+		golang:net:26e67e7:net/vendor/golang.org/x/net \
+		golang:sys:1561086:sys/vendor/golang.org/x/sys
 
-PLIST_FILES=	bin/onionscan
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-do-build:
-	${MKDIR} ${WRKSRC}/github.com/${GH_ACCOUNT}
-	${RLN} ${WRKSRC} ${WRKSRC}/github.com/${GH_ACCOUNT}/${PORTNAME}
-	${RLN} ${WRKSRC} ${WRKSRC}/src
-	cd ${WRKSRC} && \
-	  ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \
-	  ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \
-		${STAGEDIR}/${LOCALBASE}/bin
+PLIST_FILES=	bin/onionscan
 
 .include <bsd.port.mk>
diff --git a/security/ssh-vault/Makefile b/security/ssh-vault/Makefile
index 7ab62db882cf..a31dc9e70da3 100644
--- a/security/ssh-vault/Makefile
+++ b/security/ssh-vault/Makefile
@@ -14,22 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go
 
 USE_GITHUB=	yes
-GH_TUPLE=	golang:crypto:c126467:gocrypto/src/golang.org/x/crypto \
-		golang:sys:bd9dbc1:gosys/src/golang.org/x/sys \
-		ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \
-		ssh-vault:ssh2pem:c1edc64:ssh2pem/src/github.com/ssh-vault/ssh2pem
+GH_TUPLE=	golang:crypto:c126467:gocrypto/vendor/golang.org/x/crypto \
+		golang:sys:bd9dbc1:gosys/vendor/golang.org/x/sys \
+		ssh-vault:crypto:ae180e0:crypto/vendor/github.com/ssh-vault/crypto \
+		ssh-vault:ssh2pem:c1edc64:ssh2pem/vendor/github.com/ssh-vault/ssh2pem
 
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags "-s -w -X main.version=${PORTVERSION}"
+GO_TARGET=	./cmd/ssh-vault
 
 PLIST_FILES=	bin/ssh-vault
 
-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 ssh-vault cmd/ssh-vault/main.go;
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ssh-vault/ssh-vault/ssh-vault \
-		${STAGEDIR}${PREFIX}/bin/ssh-vault
-
 .include <bsd.port.mk>
diff --git a/security/ssllabs-scan/Makefile b/security/ssllabs-scan/Makefile
index 813d57cfb258..371d8af6de6b 100644
--- a/security/ssllabs-scan/Makefile
+++ b/security/ssllabs-scan/Makefile
@@ -20,11 +20,4 @@ GH_ACCOUNT=	ssllabs
 
 PLIST_FILES=	bin/${PORTNAME}
 
-do-build:
-	@(cd ${GO_WRKSRC} && \
-	  ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME})
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/security/vuls/Makefile b/security/vuls/Makefile
index ac5f3dd36baf..318ff7876b77 100644
--- a/security/vuls/Makefile
+++ b/security/vuls/Makefile
@@ -19,117 +19,112 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	future-architect
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
-GH_TUPLE+=	Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/src/github.com/Azure/azure-sdk-for-go
-GH_TUPLE+=	Azure:go-autorest:v11.2.7:azuregoautorest/src/github.com/Azure/go-autorest
-GH_TUPLE+=	BurntSushi:toml:v0.3.1:toml/src/github.com/BurntSushi/toml
-GH_TUPLE+=	RackSec:srslog:a4725f0:srslog/src/github.com/RackSec/srslog
-GH_TUPLE+=	VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1
-GH_TUPLE+=	asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator
-GH_TUPLE+=	aws:aws-sdk-go:v1.15.77:awssdkgo/src/github.com/aws/aws-sdk-go
-GH_TUPLE+=	boltdb:bolt:v1.3.1:bolt/src/github.com/boltdb/bolt
-GH_TUPLE+=	cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff
-GH_TUPLE+=	cheggaaa:pb:v1.0.26:pbv1/src/gopkg.in/cheggaaa/pb.v1
-GH_TUPLE+=	cheggaaa:pb:v2.0.6:pb/src/github.com/cheggaaa/pb
-GH_TUPLE+=	census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/src/contrib.go.opencensus.io/exporter/ocagent
-GH_TUPLE+=	census-instrumentation:opencensus-go:v0.18.0:opencensusgo/src/go.opencensus.io
-GH_TUPLE+=	census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/src/github.com/census-instrumentation/opencensus-proto
-GH_TUPLE+=	dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go
-GH_TUPLE+=	fatih:color:v1.7.0:colorv1/src/github.com/fatih/color
-GH_TUPLE+=	fsnotify:fsnotify:v1.4.7:fsnotify/src/github.com/fsnotify/fsnotify
-GH_TUPLE+=	go-redis:redis:v6.14.2:redis/src/github.com/go-redis/redis
-GH_TUPLE+=	go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql
-GH_TUPLE+=	go-stack:stack:v1.8.0:gostack/src/github.com/go-stack/stack
-GH_TUPLE+=	go-yaml:yaml:v2.2.1:goyaml/src/gopkg.in/yaml.v2
-GH_TUPLE+=	golang:crypto:3d3f9f4:crypto/src/golang.org/x/crypto
-GH_TUPLE+=	golang:net:adae6a3:golangnet/src/golang.org/x/net
-GH_TUPLE+=	golang:protobuf:aa810b6:protobuf/src/github.com/golang/protobuf
-GH_TUPLE+=	golang:sync:42b3178:sync/src/golang.org/x/sync
-GH_TUPLE+=	golang:sys:66b7b13:sys/src/golang.org/x/sys
-GH_TUPLE+=	golang:text:f21a4df:golangtext/src/golang.org/x/text
-GH_TUPLE+=	google:go-genproto:b5d4398:gogenproto/src/google.golang.org/genproto
-GH_TUPLE+=	google:google-api-go-client:83a9d30:googleapigoclient/src/google.golang.org/api
-GH_TUPLE+=	google:subcommands:46f0354:subcommands/src/github.com/google/subcommands
-GH_TUPLE+=	gorilla:websocket:v1.4.0:websocket/src/github.com/gorilla/websocket
-GH_TUPLE+=	gosuri:uitable:36ee7e9:uitable/src/github.com/gosuri/uitable
-GH_TUPLE+=	grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/src/github.com/grokify/html-strip-tags-go
-GH_TUPLE+=	grpc:grpc-go:v1.16.0:grpcgo/src/google.golang.org/grpc
-GH_TUPLE+=	hashicorp:go-version:v1.0.0:goversion/src/github.com/hashicorp/go-version
-GH_TUPLE+=	hashicorp:hcl:v1.0.0:hcl/src/github.com/hashicorp/hcl
-GH_TUPLE+=	hashicorp:uuid:ebb0a03:hashicorpuuid/src/github.com/hashicorp/uuid
-GH_TUPLE+=	howeyc:gopass:bf9dde6:gopass/src/github.com/howeyc/gopass
-GH_TUPLE+=	inconshreveable:log15:v2.14:log15/src/github.com/inconshreveable/log15
-GH_TUPLE+=	jinzhu:gorm:6ed508e:gorm/src/github.com/jinzhu/gorm
-GH_TUPLE+=	jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection
-GH_TUPLE+=	jroimartin:gocui:c055c87:gocui/src/github.com/jroimartin/gocui
-GH_TUPLE+=	k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp
-GH_TUPLE+=	knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe
-GH_TUPLE+=	knqyf263:go-deb-version:9865fe1:godebversion/src/github.com/knqyf263/go-deb-version
-GH_TUPLE+=	knqyf263:go-rpm-version:74609b8:gorpmversion/src/github.com/knqyf263/go-rpm-version
-GH_TUPLE+=	knqyf263:gost:920046a:gost/src/github.com/knqyf263/gost
-GH_TUPLE+=	kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/src/github.com/kotakanbe/go-cve-dictionary
-GH_TUPLE+=	kotakanbe:go-pingscanner:v0.1.0:gopingscanner/src/github.com/kotakanbe/go-pingscanner
-GH_TUPLE+=	kotakanbe:goval-dictionary:v0.1.0:govaldictionary/src/github.com/kotakanbe/goval-dictionary
-GH_TUPLE+=	kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/src/github.com/kotakanbe/logrus-prefixed-formatter
-GH_TUPLE+=	labstack:gommon:7fd9f68:gommon/src/github.com/labstack/gommon
-GH_TUPLE+=	lib:pq:4ded0e9:pq/src/github.com/lib/pq
-GH_TUPLE+=	magiconair:properties:v1.8.0:properties/src/github.com/magiconair/properties
-GH_TUPLE+=	marstr:guid:v1.1.0:guid/src/github.com/marstr/guid
-GH_TUPLE+=	mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable
-GH_TUPLE+=	mattn:go-isatty:v0.0.4:goisatty/src/github.com/mattn/go-isatty
-GH_TUPLE+=	mattn:go-runewidth:v0.0.3:gorunewidth/src/github.com/mattn/go-runewidth
-GH_TUPLE+=	mattn:go-sqlite3:v1.10.0:gosqlite3/src/github.com/mattn/go-sqlite3
-GH_TUPLE+=	mgutz:ansi:9520e82:ansi/src/github.com/mgutz/ansi
-GH_TUPLE+=	mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir
-GH_TUPLE+=	mitchellh:mapstructure:v1.1.0:mapstructure/src/github.com/mitchellh/mapstructure
-GH_TUPLE+=	moul:http2curl:9ac6cf4:http2curl/src/github.com/moul/http2curl
-GH_TUPLE+=	mozqnet:go-exploitdb:48cac6d:goexploitdb/src/github.com/mozqnet/go-exploitdb
-GH_TUPLE+=	nlopes:slack:v0.4.0:slack/src/github.com/nlopes/slack
-GH_TUPLE+=	olekukonko:tablewriter:v0.0.1:tablewriter/src/github.com/olekukonko/tablewriter
-GH_TUPLE+=	nsf:termbox-go:60ab7e3:termboxgo/src/github.com/nsf/termbox-go
-GH_TUPLE+=	parnurzeal:gorequest:v0.2.15:gorequest/src/github.com/parnurzeal/gorequest
-GH_TUPLE+=	pelletier:go-toml:v1.2.0:gotoml/src/github.com/pelletier/go-toml
-GH_TUPLE+=	pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors
-GH_TUPLE+=	rifflock:lfshook:v2.4:lfshook/src/github.com/rifflock/lfshook
-GH_TUPLE+=	satori:go.uuid:v1.2.0:gouuid/src/github.com/satori/go.uuid
-GH_TUPLE+=	sirupsen:logrus:44067ab:logrus/src/github.com/sirupsen/logrus
-GH_TUPLE+=	spf13:afero:v1.1.2:afero/src/github.com/spf13/afero
-GH_TUPLE+=	spf13:cast:v1.3.0:cast/src/github.com/spf13/cast
-GH_TUPLE+=	spf13:jwalterweatherman:v1.0.0:jwalterweatherman/src/github.com/spf13/jwalterweatherman
-GH_TUPLE+=	spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag
-GH_TUPLE+=	spf13:viper:v1.2.1:viper/src/github.com/spf13/viper
-GH_TUPLE+=	valyala:bytebufferpool:v1.0.0:bytebufferpool/src/github.com/valyala/bytebufferpool
-GH_TUPLE+=	valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate
-GH_TUPLE+=	ymomoi:goval-parser:0a0be1d:govalparser/src/github.com/ymomoi/goval-parser
+GH_TUPLE+=	Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/vendor/github.com/Azure/azure-sdk-for-go
+GH_TUPLE+=	Azure:go-autorest:v11.2.7:azuregoautorest/vendor/github.com/Azure/go-autorest
+GH_TUPLE+=	BurntSushi:toml:v0.3.1:toml/vendor/github.com/BurntSushi/toml
+GH_TUPLE+=	RackSec:srslog:a4725f0:srslog/vendor/github.com/RackSec/srslog
+GH_TUPLE+=	VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1
+GH_TUPLE+=	asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator
+GH_TUPLE+=	aws:aws-sdk-go:v1.15.77:awssdkgo/vendor/github.com/aws/aws-sdk-go
+GH_TUPLE+=	boltdb:bolt:v1.3.1:bolt/vendor/github.com/boltdb/bolt
+GH_TUPLE+=	cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff
+GH_TUPLE+=	cheggaaa:pb:v1.0.26:pbv1/vendor/gopkg.in/cheggaaa/pb.v1
+GH_TUPLE+=	cheggaaa:pb:v2.0.6:pb/vendor/github.com/cheggaaa/pb
+GH_TUPLE+=	census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/vendor/contrib.go.opencensus.io/exporter/ocagent
+GH_TUPLE+=	census-instrumentation:opencensus-go:v0.18.0:opencensusgo/vendor/go.opencensus.io
+GH_TUPLE+=	census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/vendor/github.com/census-instrumentation/opencensus-proto
+GH_TUPLE+=	dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go
+GH_TUPLE+=	fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color
+GH_TUPLE+=	fsnotify:fsnotify:v1.4.7:fsnotify/vendor/github.com/fsnotify/fsnotify
+GH_TUPLE+=	go-redis:redis:v6.14.2:redis/vendor/github.com/go-redis/redis
+GH_TUPLE+=	go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql
+GH_TUPLE+=	go-stack:stack:v1.8.0:gostack/vendor/github.com/go-stack/stack
+GH_TUPLE+=	go-yaml:yaml:v2.2.1:goyaml/vendor/gopkg.in/yaml.v2
+GH_TUPLE+=	golang:crypto:3d3f9f4:crypto/vendor/golang.org/x/crypto
+GH_TUPLE+=	golang:net:adae6a3:golangnet/vendor/golang.org/x/net
+GH_TUPLE+=	golang:protobuf:aa810b6:protobuf/vendor/github.com/golang/protobuf
+GH_TUPLE+=	golang:sync:42b3178:sync/vendor/golang.org/x/sync
+GH_TUPLE+=	golang:sys:66b7b13:sys/vendor/golang.org/x/sys
+GH_TUPLE+=	golang:text:f21a4df:golangtext/vendor/golang.org/x/text
+GH_TUPLE+=	google:go-genproto:b5d4398:gogenproto/vendor/google.golang.org/genproto
+GH_TUPLE+=	google:google-api-go-client:83a9d30:googleapigoclient/vendor/google.golang.org/api
+GH_TUPLE+=	google:subcommands:46f0354:subcommands/vendor/github.com/google/subcommands
+GH_TUPLE+=	gorilla:websocket:v1.4.0:websocket/vendor/github.com/gorilla/websocket
+GH_TUPLE+=	gosuri:uitable:36ee7e9:uitable/vendor/github.com/gosuri/uitable
+GH_TUPLE+=	grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/vendor/github.com/grokify/html-strip-tags-go
+GH_TUPLE+=	grpc:grpc-go:v1.16.0:grpcgo/vendor/google.golang.org/grpc
+GH_TUPLE+=	hashicorp:go-version:v1.0.0:goversion/vendor/github.com/hashicorp/go-version
+GH_TUPLE+=	hashicorp:hcl:v1.0.0:hcl/vendor/github.com/hashicorp/hcl
+GH_TUPLE+=	hashicorp:uuid:ebb0a03:hashicorpuuid/vendor/github.com/hashicorp/uuid
+GH_TUPLE+=	howeyc:gopass:bf9dde6:gopass/vendor/github.com/howeyc/gopass
+GH_TUPLE+=	inconshreveable:log15:v2.14:log15/vendor/github.com/inconshreveable/log15
+GH_TUPLE+=	jinzhu:gorm:6ed508e:gorm/vendor/github.com/jinzhu/gorm
+GH_TUPLE+=	jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection
+GH_TUPLE+=	jroimartin:gocui:c055c87:gocui/vendor/github.com/jroimartin/gocui
+GH_TUPLE+=	k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp
+GH_TUPLE+=	knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe
+GH_TUPLE+=	knqyf263:go-deb-version:9865fe1:godebversion/vendor/github.com/knqyf263/go-deb-version
+GH_TUPLE+=	knqyf263:go-rpm-version:74609b8:gorpmversion/vendor/github.com/knqyf263/go-rpm-version
+GH_TUPLE+=	knqyf263:gost:920046a:gost/vendor/github.com/knqyf263/gost
+GH_TUPLE+=	kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/vendor/github.com/kotakanbe/go-cve-dictionary
+GH_TUPLE+=	kotakanbe:go-pingscanner:v0.1.0:gopingscanner/vendor/github.com/kotakanbe/go-pingscanner
+GH_TUPLE+=	kotakanbe:goval-dictionary:v0.1.0:govaldictionary/vendor/github.com/kotakanbe/goval-dictionary
+GH_TUPLE+=	kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/vendor/github.com/kotakanbe/logrus-prefixed-formatter
+GH_TUPLE+=	labstack:gommon:7fd9f68:gommon/vendor/github.com/labstack/gommon
+GH_TUPLE+=	lib:pq:4ded0e9:pq/vendor/github.com/lib/pq
+GH_TUPLE+=	magiconair:properties:v1.8.0:properties/vendor/github.com/magiconair/properties
+GH_TUPLE+=	marstr:guid:v1.1.0:guid/vendor/github.com/marstr/guid
+GH_TUPLE+=	mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable
+GH_TUPLE+=	mattn:go-isatty:v0.0.4:goisatty/vendor/github.com/mattn/go-isatty
+GH_TUPLE+=	mattn:go-runewidth:v0.0.3:gorunewidth/vendor/github.com/mattn/go-runewidth
+GH_TUPLE+=	mattn:go-sqlite3:v1.10.0:gosqlite3/vendor/github.com/mattn/go-sqlite3
+GH_TUPLE+=	mgutz:ansi:9520e82:ansi/vendor/github.com/mgutz/ansi
+GH_TUPLE+=	mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir
+GH_TUPLE+=	mitchellh:mapstructure:v1.1.0:mapstructure/vendor/github.com/mitchellh/mapstructure
+GH_TUPLE+=	moul:http2curl:9ac6cf4:http2curl/vendor/github.com/moul/http2curl
+GH_TUPLE+=	mozqnet:go-exploitdb:48cac6d:goexploitdb/vendor/github.com/mozqnet/go-exploitdb
+GH_TUPLE+=	nlopes:slack:v0.4.0:slack/vendor/github.com/nlopes/slack
+GH_TUPLE+=	olekukonko:tablewriter:v0.0.1:tablewriter/vendor/github.com/olekukonko/tablewriter
+GH_TUPLE+=	nsf:termbox-go:60ab7e3:termboxgo/vendor/github.com/nsf/termbox-go
+GH_TUPLE+=	parnurzeal:gorequest:v0.2.15:gorequest/vendor/github.com/parnurzeal/gorequest
+GH_TUPLE+=	pelletier:go-toml:v1.2.0:gotoml/vendor/github.com/pelletier/go-toml
+GH_TUPLE+=	pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors
+GH_TUPLE+=	rifflock:lfshook:v2.4:lfshook/vendor/github.com/rifflock/lfshook
+GH_TUPLE+=	satori:go.uuid:v1.2.0:gouuid/vendor/github.com/satori/go.uuid
+GH_TUPLE+=	sirupsen:logrus:44067ab:logrus/vendor/github.com/sirupsen/logrus
+GH_TUPLE+=	spf13:afero:v1.1.2:afero/vendor/github.com/spf13/afero
+GH_TUPLE+=	spf13:cast:v1.3.0:cast/vendor/github.com/spf13/cast
+GH_TUPLE+=	spf13:jwalterweatherman:v1.0.0:jwalterweatherman/vendor/github.com/spf13/jwalterweatherman
+GH_TUPLE+=	spf13:pflag:v1.0.3:pflag/vendor/github.com/spf13/pflag
+GH_TUPLE+=	spf13:viper:v1.2.1:viper/vendor/github.com/spf13/viper
+GH_TUPLE+=	valyala:bytebufferpool:v1.0.0:bytebufferpool/vendor/github.com/valyala/bytebufferpool
+GH_TUPLE+=	valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate
+GH_TUPLE+=	ymomoi:goval-parser:0a0be1d:govalparser/vendor/github.com/ymomoi/goval-parser
+
+GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR}/config.toml.sample"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Sirupsen|sirupsen|' \
-		${WRKSRC}/src/github.com/rifflock/lfshook/lfshook.go
+		${WRKSRC}/vendor/github.com/rifflock/lfshook/lfshook.go
 	@${REINPLACE_CMD} -e 's|"gopkg.in/cheggaaa/pb.v2/termutil"|"github.com/cheggaaa/pb/termutil"|' \
-		${WRKSRC}/src/github.com/cheggaaa/pb/pb.go
+		${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go
 	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' \
 		${WRKSRC}/commands/configtest.go \
 		${WRKSRC}/commands/report.go \
 		${WRKSRC}/commands/scan.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \
-		${WRKSRC}/src/github.com/cheggaaa/pb/util.go
+		${WRKSRC}/vendor/github.com/cheggaaa/pb/util.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \
-		${WRKSRC}/src/github.com/cheggaaa/pb/pb.go
+		${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \
-		${WRKSRC}/src/github.com/cheggaaa/pb/pb.go
+		${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go
 	@${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \
-		${WRKSRC}/src/github.com/cheggaaa/pb/template.go
-
-do-build:
-	@cd ${GO_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \
-		${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \
-		-o ${WRKSRC}/${PORTNAME}
+		${WRKSRC}/vendor/github.com/cheggaaa/pb/template.go
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/config.toml.sample ${STAGEDIR}${ETCDIR}