Remove special case for golang.org/x/tools from the go command.

We handle it differently in the go-tools package. While here, rename
GO_COMPILER to GOCHAR, which is the name upstream uses.

Bump PKGREVISION.

5 files changed, 31 insertions, 12 deletions

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 661c566d8f0..81ffadcfd7f 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2014/12/12 09:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2014/12/31 11:40:14 bsiegert Exp $
 
 .include "version.mk"
 
 DISTNAME=	go${GO_VERSION}.src
 PKGNAME=	go-${GO_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://storage.googleapis.com/golang/
 PATCH_SITES=	https://codereview.appspot.com/download/
diff --git a/lang/go/PLIST b/lang/go/PLIST
index 265f65b59e5..41a51009575 100644
--- a/lang/go/PLIST
+++ b/lang/go/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2014/12/13 15:14:26 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/12/31 11:40:14 bsiegert Exp $
 bin/go
 bin/gofmt
 go/AUTHORS
@@ -537,10 +537,10 @@ go/pkg/${GO_PLATFORM}/time.a
 go/pkg/${GO_PLATFORM}/unicode.a
 go/pkg/${GO_PLATFORM}/unicode/utf16.a
 go/pkg/${GO_PLATFORM}/unicode/utf8.a
-go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}a
-go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}c
-go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}g
-go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}l
+go/pkg/tool/${GO_PLATFORM}/${GOCHAR}a
+go/pkg/tool/${GO_PLATFORM}/${GOCHAR}c
+go/pkg/tool/${GO_PLATFORM}/${GOCHAR}g
+go/pkg/tool/${GO_PLATFORM}/${GOCHAR}l
 go/pkg/tool/${GO_PLATFORM}/addr2line
 go/pkg/tool/${GO_PLATFORM}/cgo
 go/pkg/tool/${GO_PLATFORM}/dist
diff --git a/lang/go/distinfo b/lang/go/distinfo
index faba4e2fa81..a131c5df417 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2014/12/12 09:41:40 wiz Exp $
+$NetBSD: distinfo,v 1.17 2014/12/31 11:40:14 bsiegert Exp $
 
 SHA1 (go1.4.src.tar.gz) = 6a7d9bd90550ae1e164d7803b3e945dc8309252b
 RMD160 (go1.4.src.tar.gz) = b9ddec14cf5a9f99225d3d3e5bd88ed9ea37207f
 Size (go1.4.src.tar.gz) = 10911274 bytes
+SHA1 (patch-src_cmd_go_pkg.go) = e70441f3fdf312eb389e4dd5408c207a4d4b8350
 SHA1 (patch-src_crypto_x509_root__unix.go) = c933f334da1c8de48a06d23abd12da01f73776e6
diff --git a/lang/go/patches/patch-src_cmd_go_pkg.go b/lang/go/patches/patch-src_cmd_go_pkg.go
new file mode 100644
index 00000000000..48d362402dc
--- /dev/null
+++ b/lang/go/patches/patch-src_cmd_go_pkg.go
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_cmd_go_pkg.go,v 1.1 2014/12/31 11:40:14 bsiegert Exp $
+
+Do not try to install go-tools into GOROOT. This is done in the
+go-tools package instead.
+
+--- src/cmd/go/pkg.go.orig	2014-12-11 01:18:10.000000000 +0000
++++ src/cmd/go/pkg.go
+@@ -401,9 +401,6 @@ var goTools = map[string]targetDir{
+ 	"cmd/pack":                             toTool,
+ 	"cmd/pprof":                            toTool,
+ 	"cmd/yacc":                             toTool,
+-	"golang.org/x/tools/cmd/cover":         toTool,
+-	"golang.org/x/tools/cmd/godoc":         toBin,
+-	"golang.org/x/tools/cmd/vet":           toTool,
+ 	"code.google.com/p/go.tools/cmd/cover": stalePath,
+ 	"code.google.com/p/go.tools/cmd/godoc": stalePath,
+ 	"code.google.com/p/go.tools/cmd/vet":   stalePath,
diff --git a/lang/go/version.mk b/lang/go/version.mk
index 8a60f2f7fbc..a0802c144fb 100644
--- a/lang/go/version.mk
+++ b/lang/go/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.2 2014/12/12 09:41:40 wiz Exp $
+# $NetBSD: version.mk,v 1.3 2014/12/31 11:40:14 bsiegert Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -8,13 +8,13 @@ ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64 *-*-evbarm
 NOT_FOR_PLATFORM=	SunOS-*-i386
 .if ${MACHINE_ARCH} == "i386"
 GOARCH=		386
-GO_COMPILER=	8
+GOCHAR=		8
 .elif ${MACHINE_ARCH} == "x86_64"
 GOARCH=		amd64
-GO_COMPILER=	6
+GOCHAR=		6
 .elif ${MACHINE_ARCH} == "evbarm"
 GOARCH=		arm
-GO_COMPILER=	5
+GOCHAR=		5
 .endif
 PLIST_SUBST+=	GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
-PLIST_SUBST+=	GO_COMPILER=${GO_COMPILER:Q}
+PLIST_SUBST+=	GOCHAR=${GOCHAR:Q}