Wed Dec 31 11:40:14 2014 UTC ()
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.


(bsiegert)
diff -r1.22 -r1.23 pkgsrc/lang/go/Makefile
diff -r1.14 -r1.15 pkgsrc/lang/go/PLIST
diff -r1.16 -r1.17 pkgsrc/lang/go/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/go/version.mk
diff -r0 -r1.1 pkgsrc/lang/go/patches/patch-src_cmd_go_pkg.go
cvs diff -r1.22 -r1.23 pkgsrc/lang/go/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/go/Makefile 2014/12/12 09:41:40 1.22
+++ pkgsrc/lang/go/Makefile 2014/12/31 11:40:14 1.23
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.22 2014/12/12 09:41:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2014/12/31 11:40:14 bsiegert Exp $
2 2
3.include "version.mk" 3.include "version.mk"
4 4
5DISTNAME= go${GO_VERSION}.src 5DISTNAME= go${GO_VERSION}.src
6PKGNAME= go-${GO_VERSION} 6PKGNAME= go-${GO_VERSION}
 7PKGREVISION= 1
7CATEGORIES= lang 8CATEGORIES= lang
8MASTER_SITES= https://storage.googleapis.com/golang/ 9MASTER_SITES= https://storage.googleapis.com/golang/
9PATCH_SITES= https://codereview.appspot.com/download/ 10PATCH_SITES= https://codereview.appspot.com/download/
10 11
11MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
12HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
13COMMENT= The Go programming language 14COMMENT= The Go programming language
14LICENSE= modified-bsd 15LICENSE= modified-bsd
15 16
16WRKSRC= ${WRKDIR}/go 17WRKSRC= ${WRKDIR}/go
17USE_TOOLS+= bash:run perl:run pax 18USE_TOOLS+= bash:run perl:run pax
18 19
19# uses ulimit -T 20# uses ulimit -T
cvs diff -r1.14 -r1.15 pkgsrc/lang/go/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/go/Attic/PLIST 2014/12/13 15:14:26 1.14
+++ pkgsrc/lang/go/Attic/PLIST 2014/12/31 11:40:14 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2014/12/13 15:14:26 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.15 2014/12/31 11:40:14 bsiegert Exp $
2bin/go 2bin/go
3bin/gofmt 3bin/gofmt
4go/AUTHORS 4go/AUTHORS
5go/CONTRIBUTORS 5go/CONTRIBUTORS
6go/LICENSE 6go/LICENSE
7go/PATENTS 7go/PATENTS
8go/README 8go/README
9go/VERSION 9go/VERSION
10go/api/README 10go/api/README
11go/api/except.txt 11go/api/except.txt
12go/api/go1.1.txt 12go/api/go1.1.txt
13go/api/go1.2.txt 13go/api/go1.2.txt
14go/api/go1.3.txt 14go/api/go1.3.txt
@@ -527,30 +527,30 @@ go/pkg/${GO_PLATFORM}/sync/atomic.a @@ -527,30 +527,30 @@ go/pkg/${GO_PLATFORM}/sync/atomic.a
527go/pkg/${GO_PLATFORM}/syscall.a 527go/pkg/${GO_PLATFORM}/syscall.a
528go/pkg/${GO_PLATFORM}/testing.a 528go/pkg/${GO_PLATFORM}/testing.a
529go/pkg/${GO_PLATFORM}/testing/iotest.a 529go/pkg/${GO_PLATFORM}/testing/iotest.a
530go/pkg/${GO_PLATFORM}/testing/quick.a 530go/pkg/${GO_PLATFORM}/testing/quick.a
531go/pkg/${GO_PLATFORM}/text/scanner.a 531go/pkg/${GO_PLATFORM}/text/scanner.a
532go/pkg/${GO_PLATFORM}/text/tabwriter.a 532go/pkg/${GO_PLATFORM}/text/tabwriter.a
533go/pkg/${GO_PLATFORM}/text/template.a 533go/pkg/${GO_PLATFORM}/text/template.a
534go/pkg/${GO_PLATFORM}/text/template/parse.a 534go/pkg/${GO_PLATFORM}/text/template/parse.a
535go/pkg/${GO_PLATFORM}/textflag.h 535go/pkg/${GO_PLATFORM}/textflag.h
536go/pkg/${GO_PLATFORM}/time.a 536go/pkg/${GO_PLATFORM}/time.a
537go/pkg/${GO_PLATFORM}/unicode.a 537go/pkg/${GO_PLATFORM}/unicode.a
538go/pkg/${GO_PLATFORM}/unicode/utf16.a 538go/pkg/${GO_PLATFORM}/unicode/utf16.a
539go/pkg/${GO_PLATFORM}/unicode/utf8.a 539go/pkg/${GO_PLATFORM}/unicode/utf8.a
540go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}a 540go/pkg/tool/${GO_PLATFORM}/${GOCHAR}a
541go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}c 541go/pkg/tool/${GO_PLATFORM}/${GOCHAR}c
542go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}g 542go/pkg/tool/${GO_PLATFORM}/${GOCHAR}g
543go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}l 543go/pkg/tool/${GO_PLATFORM}/${GOCHAR}l
544go/pkg/tool/${GO_PLATFORM}/addr2line 544go/pkg/tool/${GO_PLATFORM}/addr2line
545go/pkg/tool/${GO_PLATFORM}/cgo 545go/pkg/tool/${GO_PLATFORM}/cgo
546go/pkg/tool/${GO_PLATFORM}/dist 546go/pkg/tool/${GO_PLATFORM}/dist
547go/pkg/tool/${GO_PLATFORM}/fix 547go/pkg/tool/${GO_PLATFORM}/fix
548go/pkg/tool/${GO_PLATFORM}/nm 548go/pkg/tool/${GO_PLATFORM}/nm
549go/pkg/tool/${GO_PLATFORM}/objdump 549go/pkg/tool/${GO_PLATFORM}/objdump
550go/pkg/tool/${GO_PLATFORM}/pack 550go/pkg/tool/${GO_PLATFORM}/pack
551go/pkg/tool/${GO_PLATFORM}/pprof 551go/pkg/tool/${GO_PLATFORM}/pprof
552go/pkg/tool/${GO_PLATFORM}/yacc 552go/pkg/tool/${GO_PLATFORM}/yacc
553go/robots.txt 553go/robots.txt
554go/src/Make.dist 554go/src/Make.dist
555go/src/all.bash 555go/src/all.bash
556go/src/all.bat 556go/src/all.bat
cvs diff -r1.16 -r1.17 pkgsrc/lang/go/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/go/Attic/distinfo 2014/12/12 09:41:40 1.16
+++ pkgsrc/lang/go/Attic/distinfo 2014/12/31 11:40:14 1.17
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.16 2014/12/12 09:41:40 wiz Exp $ 1$NetBSD: distinfo,v 1.17 2014/12/31 11:40:14 bsiegert Exp $
2 2
3SHA1 (go1.4.src.tar.gz) = 6a7d9bd90550ae1e164d7803b3e945dc8309252b 3SHA1 (go1.4.src.tar.gz) = 6a7d9bd90550ae1e164d7803b3e945dc8309252b
4RMD160 (go1.4.src.tar.gz) = b9ddec14cf5a9f99225d3d3e5bd88ed9ea37207f 4RMD160 (go1.4.src.tar.gz) = b9ddec14cf5a9f99225d3d3e5bd88ed9ea37207f
5Size (go1.4.src.tar.gz) = 10911274 bytes 5Size (go1.4.src.tar.gz) = 10911274 bytes
 6SHA1 (patch-src_cmd_go_pkg.go) = e70441f3fdf312eb389e4dd5408c207a4d4b8350
6SHA1 (patch-src_crypto_x509_root__unix.go) = c933f334da1c8de48a06d23abd12da01f73776e6 7SHA1 (patch-src_crypto_x509_root__unix.go) = c933f334da1c8de48a06d23abd12da01f73776e6
cvs diff -r1.2 -r1.3 pkgsrc/lang/go/version.mk (expand / switch to unified diff)

--- pkgsrc/lang/go/version.mk 2014/12/12 09:41:40 1.2
+++ pkgsrc/lang/go/version.mk 2014/12/31 11:40:14 1.3
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: version.mk,v 1.2 2014/12/12 09:41:40 wiz Exp $ 1# $NetBSD: version.mk,v 1.3 2014/12/31 11:40:14 bsiegert Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5GO_VERSION= 1.4 5GO_VERSION= 1.4
6 6
7ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-evbarm 7ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-evbarm
8NOT_FOR_PLATFORM= SunOS-*-i386 8NOT_FOR_PLATFORM= SunOS-*-i386
9.if ${MACHINE_ARCH} == "i386" 9.if ${MACHINE_ARCH} == "i386"
10GOARCH= 386 10GOARCH= 386
11GO_COMPILER= 8 11GOCHAR= 8
12.elif ${MACHINE_ARCH} == "x86_64" 12.elif ${MACHINE_ARCH} == "x86_64"
13GOARCH= amd64 13GOARCH= amd64
14GO_COMPILER= 6 14GOCHAR= 6
15.elif ${MACHINE_ARCH} == "evbarm" 15.elif ${MACHINE_ARCH} == "evbarm"
16GOARCH= arm 16GOARCH= arm
17GO_COMPILER= 5 17GOCHAR= 5
18.endif 18.endif
19PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q} 19PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
20PLIST_SUBST+= GO_COMPILER=${GO_COMPILER:Q} 20PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
File Added: pkgsrc/lang/go/patches/Attic/patch-src_cmd_go_pkg.go
$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,