Index: sysutils/docker-credential-pass/Makefile
===================================================================
--- sysutils/docker-credential-pass/Makefile	(revision 500722)
+++ sysutils/docker-credential-pass/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	docker-credential-pass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
+DISTVERSION=	0.6.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	dg@syrec.org
@@ -11,23 +11,24 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 RUN_DEPENDS=	${LOCALBASE}/bin/pass:sysutils/password-store
 
+USES=		go
+
+GO_PKGNAME=	github.com/docker/docker-credential-helpers
+GO_TARGET=	./pass/cmd
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	docker
 GH_PROJECT=	docker-credential-helpers
-GH_SUBDIR=	src/github.com/docker/docker-credential-helpers
 
 PLIST_FILES=	bin/docker-credential-pass
 
-do-build:
-	${CP} ${WRKSRC}/${GH_SUBDIR}/pass/cmd/main_linux.go ${WRKSRC}/${GH_SUBDIR}/pass/cmd/main_freebsd.go
-	${CP} ${WRKSRC}/${GH_SUBDIR}/pass/pass_linux.go ${WRKSRC}/${GH_SUBDIR}/pass/pass_freebsd.go
-	cd ${WRKSRC}/${GH_SUBDIR}/pass && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} ./cmd
+pre-build:
+	${CP} ${GO_WRKSRC}/pass/cmd/main_linux.go ${GO_WRKSRC}/pass/cmd/main_freebsd.go
+	${CP} ${GO_WRKSRC}/pass/pass_linux.go ${GO_WRKSRC}/pass/pass_freebsd.go
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/pass/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/cmd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: sysutils/docker-credential-pass/distinfo
===================================================================
--- sysutils/docker-credential-pass/distinfo	(revision 500722)
+++ sysutils/docker-credential-pass/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533314093
-SHA256 (docker-docker-credential-helpers-v0.6.1_GH0.tar.gz) = 9b36ae15d5bceaaf3496b80413acafa6325c633af3ae211ce10724dfa7046883
-SIZE (docker-docker-credential-helpers-v0.6.1_GH0.tar.gz) = 27723
+TIMESTAMP = 1556886368
+SHA256 (docker-docker-credential-helpers-v0.6.2_GH0.tar.gz) = 1b332d40e3d50ce084e54feea09750e18c87dadcfdfd2e8e9bd4622cbbf461b2
+SIZE (docker-docker-credential-helpers-v0.6.2_GH0.tar.gz) = 28238