Real buildlink support for Go, hacked with wiz@.

Go packages now define a set of files to buildlink in their buildlink3.mk.
go-packages.mk no longer looks in ${PREFIX}/gopkg during the build. This
should also fix the spurious issues with rebuilds of .a files during bulk
builds of Go packages.

7 files changed, 29 insertions, 7 deletions

diff --git a/devel/go-nbreader/buildlink3.mk b/devel/go-nbreader/buildlink3.mk
new file mode 100644
index 00000000000..c695640ed1e
--- /dev/null
+++ b/devel/go-nbreader/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/12/29 21:47:48 bsiegert Exp $
+
+BUILDLINK_TREE+=	go-nbreader
+
+.if !defined(GO_NBREADER_BUILDLINK3_MK)
+GO_NBREADER_BUILDLINK3_MK:=
+
+BUILDLINK_CONTENTS_FILTER.go-nbreader=	${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-nbreader?=		build
+
+BUILDLINK_API_DEPENDS.go-nbreader+=	go-nbreader>=0.0.20150201
+BUILDLINK_PKGSRCDIR.go-nbreader?=	../../devel/go-nbreader
+.endif	# GO_NBREADER_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-go-nbreader
diff --git a/devel/google-api-go-client/buildlink3.mk b/devel/google-api-go-client/buildlink3.mk
index 5e2bd771966..cb19f661da8 100644
--- a/devel/google-api-go-client/buildlink3.mk
+++ b/devel/google-api-go-client/buildlink3.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/05/11 14:28:43 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
 
 BUILDLINK_TREE+=	google-api-go-client
 
 .if !defined(GOOGLE_API_GO_CLIENT_BUILDLINK3_MK)
 GOOGLE_API_GO_CLIENT_BUILDLINK3_MK:=
 
+BUILDLINK_CONTENTS_FILTER.google-api-go-client=  ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.google-api-go-client?=	build
 BUILDLINK_API_DEPENDS.google-api-go-client+=	google-api-go-client>=20150507
 BUILDLINK_PKGSRCDIR.google-api-go-client?=	../../devel/google-api-go-client
diff --git a/lang/go/go-package.mk b/lang/go/go-package.mk
index 7bdf3ccc701..a6be537d3a5 100644
--- a/lang/go/go-package.mk
+++ b/lang/go/go-package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.6 2015/12/27 19:41:10 wiz Exp $
+# $NetBSD: go-package.mk,v 1.7 2015/12/29 21:47:48 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 # The compiled Go code is tied to a specific compiler version, and the
@@ -61,7 +61,7 @@ post-extract:
 	${MV} ${WRKDIR}/`basename ${GO_DIST_BASE}`/* ${WRKSRC}
 
 do-build:
-	env GOPATH=${WRKDIR}:${PREFIX}/gopkg go install -v ${GO_BUILD_PATTERN}
+	env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go install -v ${GO_BUILD_PATTERN}
 
 do-install:
 	-cd ${WRKDIR} && [ -d bin ] && ${PAX} -rw bin ${DESTDIR}${PREFIX}
diff --git a/net/gcloud-golang-metadata/buildlink3.mk b/net/gcloud-golang-metadata/buildlink3.mk
index bafa1f5a7c4..4ec34e28381 100644
--- a/net/gcloud-golang-metadata/buildlink3.mk
+++ b/net/gcloud-golang-metadata/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
 
 BUILDLINK_TREE+=	gcloud-golang-metadata
 
@@ -8,6 +8,7 @@ GCLOUD_GOLANG_METADATA_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.gcloud-golang-metadata+=	gcloud-golang-metadata>=20150310
 BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?=	../../net/gcloud-golang-metadata
 BUILDLINK_DEPMETHOD.gcloud-golang-metadata?=	build
+BUILDLINK_CONTENTS_FILTER.gcloud-golang-metadata= ${EGREP} gopkg/
 
 .include "../../net/go-net/buildlink3.mk"
 .endif	# GCLOUD_GOLANG_METADATA_BUILDLINK3_MK
diff --git a/net/go-net/buildlink3.mk b/net/go-net/buildlink3.mk
index 7cca37ff4ae..3b0b9e4c7e6 100644
--- a/net/go-net/buildlink3.mk
+++ b/net/go-net/buildlink3.mk
@@ -1,11 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/03/10 21:28:45 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-net
 
 .if !defined(GO_NET_BUILDLINK3_MK)
 GO_NET_BUILDLINK3_MK:=
 
+BUILDLINK_CONTENTS_FILTER.go-net= ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-net?=	build
+
 BUILDLINK_API_DEPENDS.go-net+=	go-net>=20150310
 BUILDLINK_PKGSRCDIR.go-net?=	../../net/go-net
 
diff --git a/security/go-oauth2/buildlink3.mk b/security/go-oauth2/buildlink3.mk
index 2bce104da56..887837557fb 100644
--- a/security/go-oauth2/buildlink3.mk
+++ b/security/go-oauth2/buildlink3.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/05/11 13:27:16 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-oauth2
 
 .if !defined(GO_OAUTH2_BUILDLINK3_MK)
 GO_OAUTH2_BUILDLINK3_MK:=
 
+BUILDLINK_CONTENTS_FILTER.go-oauth2= ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-oauth2?=	build
 BUILDLINK_API_DEPENDS.go-oauth2+=	go-oauth2>=20150310
 BUILDLINK_PKGSRCDIR.go-oauth2?=	../../security/go-oauth2
diff --git a/textproc/go-text/buildlink3.mk b/textproc/go-text/buildlink3.mk
index 96f3b27e216..f20a24ac844 100644
--- a/textproc/go-text/buildlink3.mk
+++ b/textproc/go-text/buildlink3.mk
@@ -1,11 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/03/10 19:57:18 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $
 
 BUILDLINK_TREE+=	go-text
 
 .if !defined(GO_TEXT_BUILDLINK3_MK)
 GO_TEXT_BUILDLINK3_MK:=
 
+BUILDLINK_CONTENTS_FILTER.go-text= ${EGREP} gopkg/
 BUILDLINK_DEPMETHOD.go-text?=	build
+
 BUILDLINK_API_DEPENDS.go-text+=	go-text>=20150310
 BUILDLINK_PKGSRCDIR.go-text?=	../../textproc/go-text
 .endif	# GO_TEXT_BUILDLINK3_MK