summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2018-03-11 20:00:34 +0000
committerbsiegert <bsiegert@pkgsrc.org>2018-03-11 20:00:34 +0000
commit768a02fe78c2e0edd7bad9ab26828963c8cdab94 (patch)
treedcbf79959ed519045e1ae2d073192c9f01c51559
parentbeafb0464ef6cd75958c0f55aa25ed552adc3d37 (diff)
downloadpkgsrc-768a02fe78c2e0edd7bad9ab26828963c8cdab94.tar.gz
Fix build with Go 1.10, bump revision.
-rw-r--r--net/gcloud-golang-metadata/Makefile7
-rw-r--r--net/gcloud-golang-metadata/PLIST3
-rw-r--r--net/go-grpc/Makefile5
-rw-r--r--net/go-grpc/PLIST3
4 files changed, 10 insertions, 8 deletions
diff --git a/net/gcloud-golang-metadata/Makefile b/net/gcloud-golang-metadata/Makefile
index 691563a2287..c59f05d44d4 100644
--- a/net/gcloud-golang-metadata/Makefile
+++ b/net/gcloud-golang-metadata/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2018/03/04 15:52:17 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/11 20:00:34 bsiegert Exp $
#
DISTNAME= gcloud-golang
PKGNAME= gcloud-golang-metadata-20150310
-PKGREVISION= 9
+PKGREVISION= 10
GITHUB_PROJECT= ${DISTNAME}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=GoogleCloudPlatform/}
@@ -30,6 +30,9 @@ pre-patch:
${RM} -fr ${WRKSRC}/internal/datastore
${RM} -fr ${WRKSRC}/internal/testutil
+pre-install:
+ ${RM} -f ${WRKDIR}/pkg/${GO_PLATFORM}/google.golang.org/cloud/internal.a
+
.include "../../net/go-net/buildlink3.mk"
.include "../../lang/go/go-package.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gcloud-golang-metadata/PLIST b/net/gcloud-golang-metadata/PLIST
index 06331c36cba..d1780f4bd16 100644
--- a/net/gcloud-golang-metadata/PLIST
+++ b/net/gcloud-golang-metadata/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2015/05/11 13:02:21 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/03/11 20:00:34 bsiegert Exp $
gopkg/pkg/${GO_PLATFORM}/google.golang.org/cloud/compute/metadata.a
-gopkg/pkg/${GO_PLATFORM}/google.golang.org/cloud/internal.a
gopkg/src/google.golang.org/cloud/compute/metadata/go13.go
gopkg/src/google.golang.org/cloud/compute/metadata/metadata.go
gopkg/src/google.golang.org/cloud/container/container.go
diff --git a/net/go-grpc/Makefile b/net/go-grpc/Makefile
index 5242eb297b5..fd74dec629d 100644
--- a/net/go-grpc/Makefile
+++ b/net/go-grpc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/03/04 15:52:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/11 20:04:16 bsiegert Exp $
DISTNAME= go-grpc-1.0.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/}
GITHUB_PROJECT= grpc-go
@@ -33,6 +33,7 @@ REPLACE_SH+= coverage.sh
# due to patch
post-install:
${RM} -f ${DESTDIR}${PREFIX}/gopkg/src/google.golang.org/grpc/coverage.sh.orig
+ ${RM} -f ${DESTDIR}${PREFIX}/gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal.a
.include "../../devel/go-glog/buildlink3.mk"
.include "../../devel/go-protobuf/buildlink3.mk"
diff --git a/net/go-grpc/PLIST b/net/go-grpc/PLIST
index 25b88f3d085..fe115790801 100644
--- a/net/go-grpc/PLIST
+++ b/net/go-grpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/11 09:52:41 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/03/11 20:04:16 bsiegert Exp $
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/codes.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/credentials.a
@@ -7,7 +7,6 @@ gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/grpclog.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/grpclog/glogger.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/health.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/health/grpc_health_v1.a
-gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/internal.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/metadata.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/naming.a
gopkg/pkg/${GO_PLATFORM}/google.golang.org/grpc/peer.a