From 0be89c302740701922ea41392393ecbcfa5248e7 Mon Sep 17 00:00:00 2001 From: op Date: Wed, 25 Jan 2023 19:37:03 +0000 Subject: [PATCH] update devel/go-tools to 0.5.0 need to set EPOCH due to the version change. Switches the port to MODGO_MODNAME to fetch the modules needed, dropping the BDEP on net/go-net. godoc doesn't need hacks now to be built, but gopls is not included anymore: it's provided by new devel/gopls port. While here sync DESCR with reality and fold long lines, update HOMEPAGE and drop redundant MODGO_TYPE=bin. tested by Laurent Cheylus (thanks!) ok sthen@ --- devel/go-tools/Makefile | 38 +++++++++++++++----------------------- devel/go-tools/distinfo | 34 ++++++++++++++++++++++++++++++++-- devel/go-tools/modules.inc | 12 ++++++++++++ devel/go-tools/pkg/DESCR | 31 +++++++++++++++++++------------ devel/go-tools/pkg/PLIST | 1 - 5 files changed, 78 insertions(+), 38 deletions(-) create mode 100644 devel/go-tools/modules.inc diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index 78e6946994e..f3c06dfc765 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -1,11 +1,13 @@ COMMENT = various tools for the Go programming language -GH_ACCOUNT = golang -GH_PROJECT = tools -GH_COMMIT = f727befe758c04ce68d52abc6e69ad111e2c6797 -DISTNAME = go-tools-1.12.20190226 + +MODGO_MODNAME = golang.org/x/tools +MODGO_VERSION = v0.5.0 + +DISTNAME = go-tools-${MODGO_VERSION} +EPOCH = 0 + CATEGORIES = devel -HOMEPAGE = https://godoc.org/golang.org/x/tools -REVISION = 2 +HOMEPAGE = https://pkg.go.dev/golang.org/x/tools # 3-clause BSD PERMIT_PACKAGE = Yes @@ -13,14 +15,9 @@ PERMIT_PACKAGE = Yes WANTLIB += c pthread MODULES = lang/go -MODGO_TYPE = bin -BUILD_DEPENDS = net/go-net RUN_DEPENDS = ${MODGO_RUN_DEPENDS} -GODOC_TARGET = golang.org/x/tools/cmd/godoc - -_MAIN = golang.org/x/tools _SUBPKGS = benchcmp \ bundle \ callgraph \ @@ -30,9 +27,9 @@ _SUBPKGS = benchcmp \ fiximports \ go-contrib-init \ godex \ + godoc \ goimports \ gomvpkg \ - gopls \ gorename \ gotype \ goyacc \ @@ -44,18 +41,13 @@ _SUBPKGS = benchcmp \ stringer \ toolstash -ALL_TARGET = ${_SUBPKGS:%=${_MAIN}/cmd/%} -WRKSRC = ${MODGO_WORKSPACE}/src/${_MAIN} +ALL_TARGET = ${_SUBPKGS:%=golang.org/x/tools/cmd/%} +WRKDIST = ${WRKSRC} -post-extract: - mkdir -p ${MODGO_WORKSPACE}/pkg - -# 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). +# default do-build set by go.port.mk would build everything under +# cmd/... regardless of ALL_TARGET. do-build: - ${MODGO_BUILD_TARGET} - ${MODGO_CMD} build ${MODGO_FLAGS} -o ${MODGO_WORKSPACE}/bin/godoc \ - ${GODOC_TARGET} + cd ${WRKSRC} && ${MODGO_BUILD_TARGET} +.include "modules.inc" .include diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo index e71f24e646a..75baadb7716 100644 --- a/devel/go-tools/distinfo +++ b/devel/go-tools/distinfo @@ -1,2 +1,32 @@ -SHA256 (go-tools-1.12.20190226-f727befe.tar.gz) = zF8/BaUh7sY45AxfoyMYjGcS/bMv3aCdrd1qUwAcXM8= -SIZE (go-tools-1.12.20190226-f727befe.tar.gz) = 2643081 +SHA256 (go-tools-v0.5.0.zip) = +Iunkk24qtwqk8kWE2tS9/zUZx5234cWqgLeWGqdGHE= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM= +SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM= +SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ= +SHA256 (go_modules/golang.org/x/mod/@v/v0.7.0.zip) = JKvR2xMymHPXIDTcJ++tCcvDfTnPKLj/e7PCrcju3vc= +SHA256 (go_modules/golang.org/x/net/@v/v0.5.0.mod) = XDe+Zi2TeArML0PMnG6heErvFMEaDyJ971zm23u4pwQ= +SHA256 (go_modules/golang.org/x/net/@v/v0.5.0.zip) = DmBoge6y9XKz1hrSpjnnnK0AIGQJDHXIOKovT+ymHI4= +SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw= +SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 9RC+xgCeGYgtGZU+cnMTfTTfhsZZSTRdcvEjolXC7NI= +SHA256 (go_modules/golang.org/x/sys/@v/v0.4.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ= +SHA256 (go_modules/golang.org/x/sys/@v/v0.4.0.zip) = 76k1T8qnCYJbuxyGuD4jR867U0n0MmzEyMy5cq0yAyw= +SHA256 (go_modules/golang.org/x/term/@v/v0.4.0.mod) = zeXNBcC9PaC/rF4royqoXCVwjmVJPn4bfXPDCXcKd7o= +SHA256 (go_modules/golang.org/x/term/@v/v0.4.0.zip) = R3Dzfqp9VJkacfRu7I4pZBCRg7Ai649k1vqOaJNOL3w= +SHA256 (go_modules/golang.org/x/text/@v/v0.6.0.mod) = FZKedvzgSupMkqNUQmu0M3BoRkWk7gPy510MLrFGYwQ= +SHA256 (go_modules/golang.org/x/text/@v/v0.6.0.zip) = nsc+hEJDazM+fQkg3ARujXHacd5YZvJtRHYgeUam34M= +SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = KouTZYmPCCL6zmW6CJoTU+aKZdNC8wDKMXzOzN5kIfM= +SIZE (go-tools-v0.5.0.zip) = 2984292 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41 +SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017 +SIZE (go_modules/golang.org/x/mod/@v/v0.7.0.mod) = 84 +SIZE (go_modules/golang.org/x/mod/@v/v0.7.0.zip) = 161744 +SIZE (go_modules/golang.org/x/net/@v/v0.5.0.mod) = 123 +SIZE (go_modules/golang.org/x/net/@v/v0.5.0.zip) = 1555050 +SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = 25 +SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 27781 +SIZE (go_modules/golang.org/x/sys/@v/v0.4.0.mod) = 33 +SIZE (go_modules/golang.org/x/sys/@v/v0.4.0.zip) = 1881264 +SIZE (go_modules/golang.org/x/term/@v/v0.4.0.mod) = 67 +SIZE (go_modules/golang.org/x/term/@v/v0.4.0.zip) = 19924 +SIZE (go_modules/golang.org/x/text/@v/v0.6.0.mod) = 258 +SIZE (go_modules/golang.org/x/text/@v/v0.6.0.zip) = 8614583 +SIZE (go_modules/golang.org/x/tools/@v/v0.1.12.mod) = 327 diff --git a/devel/go-tools/modules.inc b/devel/go-tools/modules.inc new file mode 100644 index 00000000000..b11a27488e4 --- /dev/null +++ b/devel/go-tools/modules.inc @@ -0,0 +1,12 @@ +MODGO_MODULES = \ + github.com/yuin/goldmark v1.4.13 \ + golang.org/x/mod v0.7.0 \ + golang.org/x/net v0.5.0 \ + golang.org/x/sync v0.1.0 \ + golang.org/x/sys v0.4.0 \ + golang.org/x/term v0.4.0 \ + golang.org/x/text v0.6.0 + +MODGO_MODFILES = \ + golang.org/x/tools v0.1.12 + diff --git a/devel/go-tools/pkg/DESCR b/devel/go-tools/pkg/DESCR index 9ab249a9f1d..5a80b08aeac 100644 --- a/devel/go-tools/pkg/DESCR +++ b/devel/go-tools/pkg/DESCR @@ -1,24 +1,31 @@ -This package holds the source for various packages and tools that support the Go -programming language: +This package holds the source for various packages and tools that +support the Go programming language: * benchcmp displays performance changes between benchmarks - * bundle creates a single-source-file version of a source package suitable - for inclusion in a particular target package + * 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 + * compilebench benchmarks the speed of the Go compiler + * digraph performs queries over unlabelled directed graphs represented + in text form * eg performs example-based refactoring - * fiximports fixes import declarations to use the canonical import path for - packages that have an "import comment" + * fiximports fixes import declarations to use the canonical import path + for packages that have an "import comment" + * go-contrib-init helps new Go contributors to get their development + environment set up for the Go contribution process. * godex dumps exported information of packages or selected objects * godoc extracts and generates documentation for Go programs * goimports updates Go import lines * gomvpkg moves go packages, updating import declarations * gorename performs precise type-safe renaming of identifiers in Go code * 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 + * goyacc Go version of yacc + * guru tool for answering questions about Go source code + * html2article takes an HTML file and outputs a corresponding article file + in present format + * present displayslide presentations and articles + * ssadump display and interpret the SSA form of Go programs * stress utility intended for catching of episodic failures * stringer creation of methods that satisfy the fmt.Stringer interface + * toolstash save, run and restore a known good copy of the Go toolchain + and compare the object files generated by two toolchains diff --git a/devel/go-tools/pkg/PLIST b/devel/go-tools/pkg/PLIST index fb652d09cc2..ec5a916fd72 100644 --- a/devel/go-tools/pkg/PLIST +++ b/devel/go-tools/pkg/PLIST @@ -14,7 +14,6 @@ @bin bin/godoc @bin bin/goimports @bin bin/gomvpkg -@bin bin/gopls @bin bin/gorename @bin bin/gotype @bin bin/goyacc