Index: head/devel/awless/Makefile
===================================================================
--- head/devel/awless/Makefile	(revision 512403)
+++ head/devel/awless/Makefile	(revision 512404)
@@ -1,35 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	awless
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.11
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Fast, powerful and easy-to-use CLI for AWS
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wallix
 GH_SUBDIR=	src/github.com/wallix/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/awless
 PORTDOCS=	README.md CHANGELOG.md
 
-do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/gogs/Makefile
===================================================================
--- head/devel/gogs/Makefile	(revision 512403)
+++ head/devel/gogs/Makefile	(revision 512404)
@@ -1,80 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	gogs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.91
 CATEGORIES=	devel www
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Painless self-hosted Git service
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git \
 		bash:shells/bash
 
 USES=		go
 
 GO_BUILDFLAGS=	-tags "sqlite pam cert"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gogs
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
+GO_TARGET=	:${PREFIX}/libexec/${PORTNAME}/${PORTNAME}
+
 OPTIONS_DEFINE=	DOCS
 
 USERS=		git
 GROUPS=		git
 
 GOGS_DBDIR?=	/var/db/gogs
 GOGS_LOGDIR?=	/var/log/gogs
 PORTNAME_FANCY=	Gogs
 
 SUB_FILES=	gogs \
 		gogs-service \
 		gogs-rm-data \
 		pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		PORTNAME_FANCY=${PORTNAME_FANCY} \
 		GOGS_USER=${USERS} \
 		GOGS_DBDIR=${GOGS_DBDIR} \
 		GOGS_LOGDIR=${GOGS_LOGDIR}
 PLIST_SUB=	GOGS_USER=${USERS} \
 		GOGS_GROUP=${GROUPS} \
 		GOGS_DBDIR=${GOGS_DBDIR} \
 		GOGS_LOGDIR=${GOGS_LOGDIR}
 
 PORTDOCS=	README.md
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/^# \!\!\!/d' \
 		-e 's|^RUN_USER = git$$|RUN_USER = ${USERS}|' \
 		-e 's|^RUN_MODE = dev$$|RUN_MODE = prod|' \
 		-e 's|^ROOT =$$|ROOT = ${GOGS_DBDIR}/repositories|' \
 		-e 's|^ROOT_PATH =$$|ROOT_PATH = ${GOGS_LOGDIR}|' \
 		-e 's|^DB_TYPE = mysql$$|DB_TYPE = sqlite3|' \
 		${WRKSRC}/conf/app.ini
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/
+post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gogs ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKDIR}/gogs-rm-data ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKDIR}/gogs-service ${STAGEDIR}${PREFIX}/etc/rc.d/gogs
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "conf public templates" ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/https
 	${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	@${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom
 	@${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories
 	@${LN} -sf ${GOGS_DBDIR}/data ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/data
 	@${MKDIR} ${STAGEDIR}${GOGS_LOGDIR}
 	@${LN} -sf ${GOGS_LOGDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/log
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/grv/Makefile
===================================================================
--- head/devel/grv/Makefile	(revision 512403)
+++ head/devel/grv/Makefile	(revision 512404)
@@ -1,56 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	grv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Terminal interface for viewing git repositories
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		go ncurses pkgconfig readline:port
 USE_GITHUB=	yes
 GH_ACCOUNT=	rgburke
 GH_SUBDIR=	src/github.com/rgburke/grv
-GH_TUPLE=	bradfitz:slice:2b758aa:slice/src/github.com/bradfitz/slice \
-		camlistore:go4:94abd69:reflectutil/src/go4.org \
-		davecgh:go-spew:d8f796a:spew/src/github.com/davecgh/go-spew \
-		gobwas:glob:e7a84e9:glob/src/github.com/gobwas/glob \
-		golang:crypto:a1f597e:crypto/src/golang.org/x/crypto \
-		golang:sys:fead790:sys/src/golang.org/x/sys \
-		mattn:go-runewidth:703b5e6:runewidth/src/github.com/mattn/go-runewidth \
-		pmezard:go-difflib:5d4384e:difflib/src/github.com/pmezard/go-difflib \
-		rgburke:goncurses:74f667a:goncurses/src/github.com/rgburke/goncurses \
-		rjeczalik:notify:629144b:notify/src/github.com/rjeczalik/notify \
-		Sirupsen:logrus:v1.4.0:logrus/src/github.com/Sirupsen/logrus \
-		stretchr:objx:c61a9df:objx/src/github.com/stretchr/objx \
-		stretchr:testify:34c6fa2:testify/src/github.com/stretchr/testify \
-		tchap:go-patricia:v2.3.0:patricia/src/github.com/tchap/go-patricia \
-		libgit2:git2go:ecaeb7a:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version
+GH_TUPLE=	bradfitz:slice:2b758aa:slice/vendor/github.com/bradfitz/slice \
+		camlistore:go4:94abd69:reflectutil/vendor/go4.org \
+		davecgh:go-spew:d8f796a:spew/vendor/github.com/davecgh/go-spew \
+		gobwas:glob:e7a84e9:glob/vendor/github.com/gobwas/glob \
+		golang:crypto:a1f597e:crypto/vendor/golang.org/x/crypto \
+		golang:sys:fead790:sys/vendor/golang.org/x/sys \
+		mattn:go-runewidth:703b5e6:runewidth/vendor/github.com/mattn/go-runewidth \
+		pmezard:go-difflib:5d4384e:difflib/vendor/github.com/pmezard/go-difflib \
+		rgburke:goncurses:74f667a:goncurses/vendor/github.com/rgburke/goncurses \
+		rjeczalik:notify:629144b:notify/vendor/github.com/rjeczalik/notify \
+		Sirupsen:logrus:v1.4.0:logrus/vendor/github.com/Sirupsen/logrus \
+		stretchr:objx:c61a9df:objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:34c6fa2:testify/vendor/github.com/stretchr/testify \
+		tchap:go-patricia:v2.3.0:patricia/vendor/github.com/tchap/go-patricia \
+		libgit2:git2go:ecaeb7a:git2go/vendor/gopkg.in/libgit2/git2go.v27 # Keep this in sync with devel/libgit2 version
 
+GO_TARGET=	./cmd/grv
+GO_BUILDFLAGS=	-ldflags "-X main.version=${PORTVERSION}"
+
 PLIST_FILES=	bin/grv
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build ./cmd/${PORTNAME}
-
 do-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test ./cmd/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDLAGS} ${GO_TARGET}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go
===================================================================
--- head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go	(revision 512403)
+++ head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go	(nonexistent)
@@ -1,20 +0,0 @@
---- src/gopkg.in/libgit2/git2go.v27/diff.go.orig	2018-07-05 13:56:38 UTC
-+++ src/gopkg.in/libgit2/git2go.v27/diff.go
-@@ -14,7 +14,7 @@ import (
- 	"unsafe"
- )
- 
--type DiffFlag int
-+type DiffFlag int64
- 
- const (
- 	DiffFlagBinary    DiffFlag = C.GIT_DIFF_FLAG_BINARY
-@@ -405,7 +405,7 @@ func (diff *Diff) Patch(deltaIndex int) 
- 	return newPatchFromC(patchPtr), nil
- }
- 
--type DiffOptionsFlag int
-+type DiffOptionsFlag int64
- 
- const (
- 	DiffNormal                 DiffOptionsFlag = C.GIT_DIFF_NORMAL

Property changes on: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_git__dynamic.go
===================================================================
--- head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_git__dynamic.go	(revision 512403)
+++ head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_git__dynamic.go	(nonexistent)
@@ -1,14 +0,0 @@
-Temporarily disable libgit2 version check in git2go until v0.28 tag is added.
-Upstream issue: https://github.com/libgit2/git2go/issues/502
---- src/gopkg.in/libgit2/git2go.v27/git_dynamic.go.orig	2019-03-23 19:12:03 UTC
-+++ src/gopkg.in/libgit2/git2go.v27/git_dynamic.go
-@@ -6,9 +6,5 @@ package git
- #include <git2.h>
- #cgo pkg-config: libgit2
- 
--#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27
--# error "Invalid libgit2 version; this git2go supports libgit2 v0.27"
--#endif
--
- */
- import "C"

Property changes on: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_git__dynamic.go
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_diff.go
===================================================================
--- head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_diff.go	(nonexistent)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_diff.go	(revision 512404)
@@ -0,0 +1,20 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/diff.go.orig	2018-07-05 13:56:38 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/diff.go
+@@ -14,7 +14,7 @@ import (
+ 	"unsafe"
+ )
+ 
+-type DiffFlag int
++type DiffFlag int64
+ 
+ const (
+ 	DiffFlagBinary    DiffFlag = C.GIT_DIFF_FLAG_BINARY
+@@ -405,7 +405,7 @@ func (diff *Diff) Patch(deltaIndex int) 
+ 	return newPatchFromC(patchPtr), nil
+ }
+ 
+-type DiffOptionsFlag int
++type DiffOptionsFlag int64
+ 
+ const (
+ 	DiffNormal                 DiffOptionsFlag = C.GIT_DIFF_NORMAL

Property changes on: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_diff.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_git__dynamic.go
===================================================================
--- head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_git__dynamic.go	(nonexistent)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_git__dynamic.go	(revision 512404)
@@ -0,0 +1,14 @@
+Temporarily disable libgit2 version check in git2go until v0.28 tag is added.
+Upstream issue: https://github.com/libgit2/git2go/issues/502
+--- vendor/gopkg.in/libgit2/git2go.v27/git_dynamic.go.orig	2019-03-23 19:12:03 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/git_dynamic.go
+@@ -6,9 +6,5 @@ package git
+ #include <git2.h>
+ #cgo pkg-config: libgit2
+ 
+-#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27
+-# error "Invalid libgit2 version; this git2go supports libgit2 v0.27"
+-#endif
+-
+ */
+ import "C"

Property changes on: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_git__dynamic.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net-im/slack-term/Makefile
===================================================================
--- head/net-im/slack-term/Makefile	(revision 512403)
+++ head/net-im/slack-term/Makefile	(revision 512404)
@@ -1,40 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	slack-term
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1
 CATEGORIES=	net-im
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Slack client for your terminal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	erroneousboat
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 
 PORTDOCS=	README.md
 
 PLIST_FILES=	bin/slack-term
 
 OPTIONS_DEFINE=	DOCS
 
-do-build:
-	cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/2fa/Makefile
===================================================================
--- head/security/2fa/Makefile	(revision 512403)
+++ head/security/2fa/Makefile	(revision 512404)
@@ -1,38 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	2fa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
 CATEGORIES=	security
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Two-factor authentication on the command line
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsc
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/2fa
 PORTDOCS=	README.md
 
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME}
-
 do-test:
-	@cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/docker-credential-pass/Makefile
===================================================================
--- head/sysutils/docker-credential-pass/Makefile	(revision 512403)
+++ head/sysutils/docker-credential-pass/Makefile	(revision 512404)
@@ -1,34 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	docker-credential-pass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Helper to use sysutils/password-store as Docker credentials store
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/bin/pass:sysutils/password-store
 
 USES=		go
 
 GO_PKGNAME=	github.com/docker/docker-credential-helpers
-GO_TARGET=	./pass/cmd
+GO_TARGET=	./pass/cmd:${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	docker
 GH_PROJECT=	docker-credential-helpers
 
 PLIST_FILES=	bin/docker-credential-pass
 
 pre-build:
 	${LN} -s ${GO_WRKSRC}/pass/cmd/main_linux.go ${GO_WRKSRC}/pass/cmd/main_freebsd.go
 	${LN} -s ${GO_WRKSRC}/pass/pass_linux.go ${GO_WRKSRC}/pass/pass_freebsd.go
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/cmd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>