From 889fc2747b527015227e5474eede1d697799c981 Mon Sep 17 00:00:00 2001 From: czarkoff Date: Sat, 21 May 2016 01:29:09 +0000 Subject: [PATCH] update to go-tools 1.6 OK and fixes from jsing@ kspillner@ --- devel/go-tools/Makefile | 41 +++++++++++++--------------------------- devel/go-tools/distinfo | 4 ++-- devel/go-tools/pkg/DESCR | 12 ++++++++---- devel/go-tools/pkg/PLIST | 4 +++- 4 files changed, 26 insertions(+), 35 deletions(-) diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index 640b2b8dc52..198a1755e1d 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2016/05/08 17:14:07 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.8 2016/05/21 01:29:09 czarkoff Exp $ COMMENT = various tools for the Go programming language GH_ACCOUNT = golang GH_PROJECT = tools -GH_COMMIT = 99c318c742339e824d89d23ba3b3bff4f4ab27a8 -DISTNAME = go-tools-1.5.20151226 +GH_COMMIT = c887be1b2ebd11663d4bf2fbca508c449172339e +DISTNAME = go-tools-1.6.20160204 CATEGORIES = devel -HOMEPAGE = http://golang.org/ +HOMEPAGE = https://godoc.org/golang.org/x/tools MAINTAINER = Dmitrij D. Czarkoff @@ -18,39 +18,24 @@ WANTLIB += c pthread MODULES = lang/go MODGO_ENV = PATH="${PORTPATH}" +BUILD_DEPENDS = net/go-net RUN_DEPENDS = ${MODGO_RUN_DEPENDS} GODOC_TARGET = golang.org/x/tools/cmd/godoc -ALL_TARGET = golang.org/x/tools/cmd/benchcmp \ - golang.org/x/tools/cmd/callgraph \ - golang.org/x/tools/cmd/digraph \ - golang.org/x/tools/cmd/eg \ - golang.org/x/tools/cmd/fiximports \ - golang.org/x/tools/cmd/godex \ - golang.org/x/tools/cmd/goimports \ - golang.org/x/tools/cmd/gomvpkg \ - golang.org/x/tools/cmd/gorename \ - golang.org/x/tools/cmd/gotype \ - golang.org/x/tools/cmd/oracle \ - golang.org/x/tools/cmd/ssadump \ - golang.org/x/tools/cmd/stress \ - golang.org/x/tools/cmd/stringer \ -# golang.org/x/tools/cmd/html2article \ -# golang.org/x/tools/cmd/present \ - -MODGO_TYPE = bin - -post-patch: - mkdir -p ${MODGO_WORKSPACE}/src/golang.org/x - mv ${WRKDIST} ${MODGO_WORKSPACE}/src/golang.org/x/tools +_MAIN = golang.org/x/tools +_SUBPKGS = benchcmp bundle callgraph digraph eg fiximports \ + godex goimports gomvpkg gorename gotype \ + html2article oracle ssadump stress stringer +ALL_TARGET = ${_SUBPKGS:%=${_MAIN}/cmd/%} +WRKSRC = ${MODGO_WORKSPACE}/src/${_MAIN} # godoc needs special handling - prior to Go 1.2, godoc was part of the base # distribution and there is a remaining mapping that causes 'go install' to # install godoc in $GOROOT/bin instead of $GOPATH/bin (golang.org/issue/6654). do-build: - mkdir -p ${MODGO_WORKSPACE}/bin - ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc ${GODOC_TARGET} ${MODGO_BUILD_TARGET} + ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc \ + ${GODOC_TARGET} .include diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo index 4362445613f..fbc6b827cd2 100644 --- a/devel/go-tools/distinfo +++ b/devel/go-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (go-tools-1.5.20151226.tar.gz) = JDNfXzok6DwT7pexMzVL4DCxVSOXoYOJqcCkC8mLWd4= -SIZE (go-tools-1.5.20151226.tar.gz) = 1661993 +SHA256 (go-tools-1.6.20160204.tar.gz) = lV5aEZurrTVtnPAM2q88J2SNRFEQm0Z8hy+tjMlNW1Y= +SIZE (go-tools-1.6.20160204.tar.gz) = 1768790 diff --git a/devel/go-tools/pkg/DESCR b/devel/go-tools/pkg/DESCR index 59f68bc8c3f..9ab249a9f1d 100644 --- a/devel/go-tools/pkg/DESCR +++ b/devel/go-tools/pkg/DESCR @@ -2,7 +2,9 @@ This package holds the source for various packages and tools that support the Go programming language: * benchcmp displays performance changes between benchmarks - * callgraph reports the call graph of a Go program + * bundle creates a single-source-file version of a source package suitable + for inclusion in a particular target package + * callgraph a tool for reporting the call graph of a Go program * digraph performs queries over unlabelled directed graphs represented in text form * eg performs example-based refactoring @@ -13,8 +15,10 @@ programming language: * goimports updates Go import lines * gomvpkg moves go packages, updating import declarations * gorename performs precise type-safe renaming of identifiers in Go code - * gotype does syntactic and semantic analysis of Go files and packages + * gotype syntactic and semantic analysis of Go files and packages + * html2article takes an HTML file and outputs a corresponding article file in + present format * oracle answers questions about Go source code * ssadump displays and interprets the SSA form of Go programs - * stress runs a given process in parallel in a loop and collects failures - * stringer creats of methods that satisfy the fmt.Stringer interface + * stress utility intended for catching of episodic failures + * stringer creation of methods that satisfy the fmt.Stringer interface diff --git a/devel/go-tools/pkg/PLIST b/devel/go-tools/pkg/PLIST index 32f54de43a1..0b623127980 100644 --- a/devel/go-tools/pkg/PLIST +++ b/devel/go-tools/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.4 2016/01/14 16:11:17 jsing Exp $ +@comment $OpenBSD: PLIST,v 1.5 2016/05/21 01:29:09 czarkoff Exp $ @conflict stress-* @pkgpath textproc/godoc @bin bin/benchcmp +@bin bin/bundle @bin bin/callgraph @bin bin/digraph @bin bin/eg @@ -12,6 +13,7 @@ @bin bin/gomvpkg @bin bin/gorename @bin bin/gotype +@bin bin/html2article @bin bin/oracle @bin bin/ssadump @bin bin/stress