Update go-tools to 1.5. cover and vet are no longer in the tools subdirectory

as they are now delivered with the main Go release as well.

From David Bariod via email to pkgsrc-users.

3 files changed, 36 insertions, 21 deletions

diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 418493ae05e..fbb7262b288 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2015/09/13 14:34:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.3 2015/12/28 11:58:12 bsiegert Exp $
 #
 
 DISTNAME=		tools
-PKGNAME=		go-tools-20150504
-PKGREVISION=		1
+PKGNAME=		go-tools-1.5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=		${DISTNAME}
-GITHUB_TAG=		d00f0cb57d
+GITHUB_TAG=		d02228d
 
 MAINTAINER=		bsiegert@NetBSD.org
 HOMEPAGE=		http://golang.org/
@@ -17,13 +16,9 @@ LICENSE=		modified-bsd
 GO_SRCPATH=		golang.org/x/tools
 GO_DIST_BASE=		${DISTNAME}-${GITHUB_TAG}*
 
-.include "../../lang/go/go-package.mk"
-
-INSTALLATION_DIRS+=	${GOTOOLDIR}
-
-post-install:
-	mv ${DESTDIR}${PREFIX}/bin/cover ${DESTDIR}${GOTOOLDIR}
-	mv ${DESTDIR}${PREFIX}/bin/vet ${DESTDIR}${GOTOOLDIR}
+USE_TOOLS+=		bash
+REPLACE_BASH=		cmd/godoc/setup-godoc-app.bash
 
+.include "../../lang/go/go-package.mk"
 .include "../../devel/google-api-go-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/go-tools/PLIST b/devel/go-tools/PLIST
index e1bbe442d95..e93ebad0826 100644
--- a/devel/go-tools/PLIST
+++ b/devel/go-tools/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2015/05/11 14:45:32 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/12/28 11:58:12 bsiegert Exp $
 bin/benchcmp
 bin/callgraph
+bin/cover
 bin/digraph
 bin/eg
+bin/fiximports
 bin/godex
 bin/godoc
 bin/goimports
@@ -16,8 +18,7 @@ bin/ssadump
 bin/stress
 bin/stringer
 bin/tipgodoc
-go/pkg/tool/${GO_PLATFORM}/cover
-go/pkg/tool/${GO_PLATFORM}/vet
+bin/vet
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/benchmark/parse.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/blog.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/blog/atom.a
@@ -93,6 +94,16 @@ gopkg/src/golang.org/x/tools/cmd/cover/testdata/test.go
 gopkg/src/golang.org/x/tools/cmd/digraph/digraph.go
 gopkg/src/golang.org/x/tools/cmd/digraph/digraph_test.go
 gopkg/src/golang.org/x/tools/cmd/eg/eg.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/main.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/main_test.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/banana/banana.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/orange/orange.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/pear/pear.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/new.com/one/one.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/bad/bad.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/one/one.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/bar/bar.go
+gopkg/src/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/foo/foo.go
 gopkg/src/golang.org/x/tools/cmd/godex/doc.go
 gopkg/src/golang.org/x/tools/cmd/godex/gc.go
 gopkg/src/golang.org/x/tools/cmd/godex/gccgo.go
@@ -153,6 +164,7 @@ gopkg/src/golang.org/x/tools/cmd/stringer/testdata/num.go
 gopkg/src/golang.org/x/tools/cmd/stringer/testdata/number.go
 gopkg/src/golang.org/x/tools/cmd/stringer/testdata/prime.go
 gopkg/src/golang.org/x/tools/cmd/stringer/testdata/unum.go
+gopkg/src/golang.org/x/tools/cmd/stringer/testdata/unum2.go
 gopkg/src/golang.org/x/tools/cmd/stringer/util_test.go
 gopkg/src/golang.org/x/tools/cmd/tipgodoc/Dockerfile
 gopkg/src/golang.org/x/tools/cmd/tipgodoc/README
@@ -196,6 +208,8 @@ gopkg/src/golang.org/x/tools/cmd/vet/testdata/rangeloop.go
 gopkg/src/golang.org/x/tools/cmd/vet/testdata/shadow.go
 gopkg/src/golang.org/x/tools/cmd/vet/testdata/shift.go
 gopkg/src/golang.org/x/tools/cmd/vet/testdata/structtag.go
+gopkg/src/golang.org/x/tools/cmd/vet/testdata/tagtest/file1.go
+gopkg/src/golang.org/x/tools/cmd/vet/testdata/tagtest/file2.go
 gopkg/src/golang.org/x/tools/cmd/vet/testdata/unsafeptr.go
 gopkg/src/golang.org/x/tools/cmd/vet/testdata/unused.go
 gopkg/src/golang.org/x/tools/cmd/vet/types.go
@@ -261,6 +275,7 @@ gopkg/src/golang.org/x/tools/go/importer/import_test.go
 gopkg/src/golang.org/x/tools/go/importer/predefined.go
 gopkg/src/golang.org/x/tools/go/loader/cgo.go
 gopkg/src/golang.org/x/tools/go/loader/doc.go
+gopkg/src/golang.org/x/tools/go/loader/example14_test.go
 gopkg/src/golang.org/x/tools/go/loader/example_test.go
 gopkg/src/golang.org/x/tools/go/loader/loader.go
 gopkg/src/golang.org/x/tools/go/loader/loader_test.go
@@ -398,7 +413,6 @@ gopkg/src/golang.org/x/tools/go/types/issues_test.go
 gopkg/src/golang.org/x/tools/go/types/labels.go
 gopkg/src/golang.org/x/tools/go/types/lookup.go
 gopkg/src/golang.org/x/tools/go/types/methodset.go
-gopkg/src/golang.org/x/tools/go/types/methodsetcache.go
 gopkg/src/golang.org/x/tools/go/types/object.go
 gopkg/src/golang.org/x/tools/go/types/objset.go
 gopkg/src/golang.org/x/tools/go/types/operand.go
@@ -459,6 +473,7 @@ gopkg/src/golang.org/x/tools/go/types/typeutil/imports.go
 gopkg/src/golang.org/x/tools/go/types/typeutil/imports_test.go
 gopkg/src/golang.org/x/tools/go/types/typeutil/map.go
 gopkg/src/golang.org/x/tools/go/types/typeutil/map_test.go
+gopkg/src/golang.org/x/tools/go/types/typeutil/methodsetcache.go
 gopkg/src/golang.org/x/tools/go/types/typeutil/ui.go
 gopkg/src/golang.org/x/tools/go/types/typexpr.go
 gopkg/src/golang.org/x/tools/go/types/universe.go
@@ -492,7 +507,6 @@ gopkg/src/golang.org/x/tools/godoc/redirect/hash.go
 gopkg/src/golang.org/x/tools/godoc/redirect/redirect.go
 gopkg/src/golang.org/x/tools/godoc/search.go
 gopkg/src/golang.org/x/tools/godoc/server.go
-gopkg/src/golang.org/x/tools/godoc/server_test.go
 gopkg/src/golang.org/x/tools/godoc/snippet.go
 gopkg/src/golang.org/x/tools/godoc/spec.go
 gopkg/src/golang.org/x/tools/godoc/spot.go
@@ -671,6 +685,12 @@ gopkg/src/golang.org/x/tools/refactor/eg/testdata/E1.golden
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/F.template
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/F1.go
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/F1.golden
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/G.template
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/G1.go
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/G1.golden
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/H.template
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/H1.go
+gopkg/src/golang.org/x/tools/refactor/eg/testdata/H1.golden
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/bad_type.template
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/expr_type_mismatch.template
 gopkg/src/golang.org/x/tools/refactor/eg/testdata/no_after_return.template
diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo
index 55590d5cbf0..11260983419 100644
--- a/devel/go-tools/distinfo
+++ b/devel/go-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:29 agc Exp $
+$NetBSD: distinfo,v 1.3 2015/12/28 11:58:12 bsiegert Exp $
 
-SHA1 (tools-d00f0cb57d.tar.gz) = f0b894faa4e42166e82ca3176ec114ff7011005d
-RMD160 (tools-d00f0cb57d.tar.gz) = 784b144c11b3b5b56829390d5597252a55a390d1
-SHA512 (tools-d00f0cb57d.tar.gz) = b890c4996b12259d85e572829f992bbf6369b08fe132656aade09f4aa44f8a2ad9543bd86bae619fe45a97f3b42e61c57acad2f36b278e96f3728cce4c206c12
-Size (tools-d00f0cb57d.tar.gz) = 1618876 bytes
+SHA1 (tools-d02228d.tar.gz) = 329d8da1b9b894d1e3f2aaacdb338f141ec6022e
+RMD160 (tools-d02228d.tar.gz) = 55bfe5ee2a9b49439ccc56cf6897bbe083538bfb
+SHA512 (tools-d02228d.tar.gz) = 80813c2da74c7b25fa2cfd15b2505757e7f466469ac701cb22d190dc83a607f091c4dea207a2e371e53d7a1f5459e7b53e5eea53c95565e958a6eb7fcb212359
+Size (tools-d02228d.tar.gz) = 1633388 bytes