CVS commit: pkgsrc/lang/go

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Aug 31 14:15:33 UTC 2016

Modified Files:
        pkgsrc/lang/go: Makefile PLIST

Log Message:
Fix install on Linux and SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/go/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/go/PLIST

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

Modified files:

Index: pkgsrc/lang/go/Makefile
diff -u pkgsrc/lang/go/Makefile:1.45 pkgsrc/lang/go/Makefile:1.46
--- pkgsrc/lang/go/Makefile:1.45        Sat Aug 20 06:22:38 2016
+++ pkgsrc/lang/go/Makefile     Wed Aug 31 14:15:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/08/20 06:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2016/08/31 14:15:33 jperkin Exp $
 
 .include "version.mk"
 
@@ -72,6 +72,14 @@ CHECK_INTERPRETER_SKIP+=     go/src/run.rc
 BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
 GOROOT_BOOTSTRAP=      ${PREFIX}/go14
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=   route
+
+.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
+PLIST.route=   yes
+.endif
+
 pre-build:
        cd ${WRKSRC}/src/syscall && \
                env GOOS=${LOWER_OPSYS:Q} GOARCH=${GOARCH:Q} \

Index: pkgsrc/lang/go/PLIST
diff -u pkgsrc/lang/go/PLIST:1.25 pkgsrc/lang/go/PLIST:1.26
--- pkgsrc/lang/go/PLIST:1.25   Fri Aug 19 09:38:06 2016
+++ pkgsrc/lang/go/PLIST        Wed Aug 31 14:15:33 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2016/08/19 09:38:06 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.26 2016/08/31 14:15:33 jperkin Exp $
 bin/go
 bin/gofmt
 go/AUTHORS
@@ -1038,7 +1038,7 @@ go/pkg/${GO_PLATFORM}/unicode/utf16.a
 go/pkg/${GO_PLATFORM}/unicode/utf8.a
 go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/http2/hpack.a
 go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/lex/httplex.a
-go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a
+${PLIST.route}go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a
 go/pkg/tool/${GO_PLATFORM}/addr2line
 go/pkg/tool/${GO_PLATFORM}/api
 go/pkg/tool/${GO_PLATFORM}/asm