CVS commit: pkgsrc/devel/go-protobuf

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Mar 11 19:45:21 UTC 2018

Modified Files:
        pkgsrc/devel/go-protobuf: Makefile PLIST

Log Message:
Fix build with Go 1.10, bump revision.

Go 1.10 no longer builds a .a file from the testdata (which are not
supposed to be compiled anyway). Remove from PLIST and remove it explicitly
in the build, so this can be compiled with older Go too.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/go-protobuf/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/go-protobuf/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/go-protobuf/Makefile
diff -u pkgsrc/devel/go-protobuf/Makefile:1.7 pkgsrc/devel/go-protobuf/Makefile:1.8
--- pkgsrc/devel/go-protobuf/Makefile:1.7       Sun Mar  4 15:52:16 2018
+++ pkgsrc/devel/go-protobuf/Makefile   Sun Mar 11 19:45:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/03/04 15:52:16 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/11 19:45:21 bsiegert Exp $
 
 DISTNAME=              go-protobuf-20160829
 PKGREVISION=           5
@@ -18,5 +18,8 @@ REPLACE_SH+=          ptypes/regen.sh
 
 CHECK_RELRO_SKIP+=     bin/protoc-gen-go
 
+pre-install:
+       ${RM} -f ${WRKSRC}/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/testdata.a
+
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/go-protobuf/PLIST
diff -u pkgsrc/devel/go-protobuf/PLIST:1.1 pkgsrc/devel/go-protobuf/PLIST:1.2
--- pkgsrc/devel/go-protobuf/PLIST:1.1  Sun Sep 11 08:02:30 2016
+++ pkgsrc/devel/go-protobuf/PLIST      Sun Mar 11 19:45:21 2018
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/11 08:02:30 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/03/11 19:45:21 bsiegert Exp $
 bin/protoc-gen-go
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/jsonpb.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/jsonpb/jsonpb_test_proto.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/proto3_proto.a
-gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/proto/testdata.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/descriptor.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/generator.a
 gopkg/pkg/${GO_PLATFORM}/github.com/golang/protobuf/protoc-gen-go/grpc.a