CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Sep 21 20:35:56 UTC 2018

Modified Files:
        pkgsrc/lang/go: go-package.mk

Log Message:
Use lang/go111, not lang/go, for package builds.

This moves builds of packages using Go off the unversioned lang/go package
and onto Go 1.11 or Go 1.9 (on NetBSD 6) by default.

There is a new, user-settable variable GO_VERSION_DEFAULT.

NOTE: not all Go packages completely implement this yet. For example,
net/syncthing does its own thing. This will be fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/go/go-package.mk

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/go-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.16 pkgsrc/lang/go/go-package.mk:1.17
--- pkgsrc/lang/go/go-package.mk:1.16   Sat Sep 15 00:31:11 2018
+++ pkgsrc/lang/go/go-package.mk        Fri Sep 21 20:35:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.16 2018/09/15 00:31:11 minskim Exp $
+# $NetBSD: go-package.mk,v 1.17 2018/09/21 20:35:56 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -57,7 +57,18 @@ GO_BUILD_PATTERN?=   ${GO_SRCPATH}/...
 
 WRKSRC=                        ${WRKDIR}/src/${GO_SRCPATH}
 
-BUILD_DEPENDS+=                go-${GO_VERSION}*:../../lang/go
+.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*}
+# 1.9 is the last Go version to support NetBSD 6
+GO_VERSION_DEFAULT?=   19
+.else
+GO_VERSION_DEFAULT?=   111
+.endif
+
+.if !empty(GO_VERSION_DEFAULT)
+GOVERSSUFFIX=          ${GO_VERSION_DEFAULT}
+.endif
+
+BUILD_DEPENDS+=                go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${GOVERSSUFFIX}
 
 MAKE_JOBS_SAFE=                no
 INSTALLATION_DIRS+=    bin gopkg