Index: head/devel/go-bindata/Makefile
===================================================================
--- head/devel/go-bindata/Makefile	(revision 390869)
+++ head/devel/go-bindata/Makefile	(revision 390870)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	go-bindata
-PORTVERSION=	3.0.5
+PORTVERSION=	3.0.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generates Go code from any file
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jteeuwen
 
 PLIST_FILES=	bin/go-bindata
 
 PORTDOCS=	CONTRIBUTING.md LICENSE README.md
 
 STRIP=		# stripping can break go binaries
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-	${CP} -R CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
+	${MV} CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
 	config.go convert.go debug.go doc.go go-bindata release.go \
 	stringwriter.go testdata toc.go \
 	src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 do-build:
 	cd ${WRKSRC} ; \
-		${SETENV} GOPATH=${WRKSRC} go build -o ${PORTNAME}/${PORTNAME} ${PORTNAME}/main.go ${PORTNAME}/version.go
+		${SETENV} GOPATH=${WRKSRC} go install ./...
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${PORTNAME} \
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MDOCS}
 .for x in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${x} \
+	${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/go-bindata/distinfo
===================================================================
--- head/devel/go-bindata/distinfo	(revision 390869)
+++ head/devel/go-bindata/distinfo	(revision 390870)
@@ -1,2 +1,2 @@
-SHA256 (jteeuwen-go-bindata-v3.0.5_GH0.tar.gz) = 8cdeda986e457e079d8d241906fc824688f51e33be21b793f34f3025322bdb61
-SIZE (jteeuwen-go-bindata-v3.0.5_GH0.tar.gz) = 11604
+SHA256 (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 77a7214479e5ce9004e4afa6d0eb8ce14289030fadc55a3444249ab1fe2c7980
+SIZE (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 13855