pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/go-tools go-tools: fix build, bump revision



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f58605d6ccc9
branches:  trunk
changeset: 442967:f58605d6ccc9
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Fri Dec 04 11:31:16 2020 +0000

description:
go-tools: fix build, bump revision

Apologies for breaking this package so hard with the previous update.

- add missing buildlinks to go-mod, go-crypto and goldmark
- remove bin/server (which is the "getgo" App Engine app, not useful locally)
- update PLIST

diffstat:

 devel/go-tools/Makefile |    59 ++-
 devel/go-tools/PLIST    |  1097 +++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 980 insertions(+), 176 deletions(-)

diffs (truncated from 1604 to 300 lines):

diff -r 15ab20b573ca -r f58605d6ccc9 devel/go-tools/Makefile
--- a/devel/go-tools/Makefile   Fri Dec 04 10:37:39 2020 +0000
+++ b/devel/go-tools/Makefile   Fri Dec 04 11:31:16 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2020/11/13 19:26:14 bsiegert Exp $
+# $NetBSD: Makefile,v 1.47 2020/12/04 11:31:16 bsiegert Exp $
 
 DISTNAME=              tools
 PKGNAME=               go-tools-1.15.20201026
-PKGREVISION=           2
+PKGREVISION=           4
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=golang/}
 GITHUB_PROJECT=                ${DISTNAME}
@@ -20,9 +20,7 @@
 REPLACE_BASH+=         cmd/getgo/*.bash
 REPLACE_BASH+=         cmd/godoc/*.bash
 REPLACE_BASH+=         cmd/toolstash/buildall
-
-PLIST_SUBST+=          GOTOOLDIR=${GOTOOLDIR:Q}
-INSTALLATION_DIRS+=    ${GOTOOLDIR}
+REPLACE_BASH+=         internal/lsp/reset_golden.sh
 
 CHECK_RELRO_SKIP+=     bin/benchcmp
 CHECK_RELRO_SKIP+=     bin/bundle
@@ -47,14 +45,57 @@
 CHECK_RELRO_SKIP+=     bin/stringer
 CHECK_RELRO_SKIP+=     bin/tip
 CHECK_RELRO_SKIP+=     bin/toolstash
+CHECK_RELRO_SKIP+=     bin/authtest
+CHECK_RELRO_SKIP+=     bin/benchcmp
+CHECK_RELRO_SKIP+=     bin/bundle
+CHECK_RELRO_SKIP+=     bin/callgraph
+CHECK_RELRO_SKIP+=     bin/compilebench
+CHECK_RELRO_SKIP+=     bin/cookieauth
+CHECK_RELRO_SKIP+=     bin/cover
+CHECK_RELRO_SKIP+=     bin/digraph
+CHECK_RELRO_SKIP+=     bin/eg
+CHECK_RELRO_SKIP+=     bin/findcall
+CHECK_RELRO_SKIP+=     bin/fiximports
+CHECK_RELRO_SKIP+=     bin/genapijson
+CHECK_RELRO_SKIP+=     bin/getgo
+CHECK_RELRO_SKIP+=     bin/gitauth
+CHECK_RELRO_SKIP+=     bin/go-contrib-init
+CHECK_RELRO_SKIP+=     bin/godex
+CHECK_RELRO_SKIP+=     bin/godoc
+CHECK_RELRO_SKIP+=     bin/goimports
+CHECK_RELRO_SKIP+=     bin/gomvpkg
+CHECK_RELRO_SKIP+=     bin/gopackages
+CHECK_RELRO_SKIP+=     bin/gorename
+CHECK_RELRO_SKIP+=     bin/gostacks
+CHECK_RELRO_SKIP+=     bin/gotype
+CHECK_RELRO_SKIP+=     bin/goyacc
+CHECK_RELRO_SKIP+=     bin/guru
+CHECK_RELRO_SKIP+=     bin/helper
+CHECK_RELRO_SKIP+=     bin/html2article
+CHECK_RELRO_SKIP+=     bin/ifaceassert
+CHECK_RELRO_SKIP+=     bin/lostcancel
+CHECK_RELRO_SKIP+=     bin/netrcauth
+CHECK_RELRO_SKIP+=     bin/nilness
+CHECK_RELRO_SKIP+=     bin/present
+CHECK_RELRO_SKIP+=     bin/present2md
+CHECK_RELRO_SKIP+=     bin/server
+CHECK_RELRO_SKIP+=     bin/shadow
+CHECK_RELRO_SKIP+=     bin/splitdwarf
+CHECK_RELRO_SKIP+=     bin/ssadump
+CHECK_RELRO_SKIP+=     bin/stress
+CHECK_RELRO_SKIP+=     bin/stringer
+CHECK_RELRO_SKIP+=     bin/stringintconv
+CHECK_RELRO_SKIP+=     bin/toolstash
+CHECK_RELRO_SKIP+=     bin/unmarshal
 
 pre-patch:
-       ${RM} -rf ${WRKSRC}/gopls
-
-post-install:
-       cd ${DESTDIR}${PREFIX} && mv bin/analyze ${GOTOOLDIR}
+       ${RM} -rf ${WRKSRC}/gopls ${WRKSRC}/cmd/getgo/server
 
 .include "../../lang/go/go-package.mk"
+.include "../../devel/go-mod/buildlink3.mk"
+.include "../../devel/go-sync/buildlink3.mk"
+.include "../../devel/go-xerrors/buildlink3.mk"
 .include "../../devel/google-api-go-client/buildlink3.mk"
 .include "../../security/go-crypto/buildlink3.mk"
+.include "../../textproc/go-goldmark/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 15ab20b573ca -r f58605d6ccc9 devel/go-tools/PLIST
--- a/devel/go-tools/PLIST      Fri Dec 04 10:37:39 2020 +0000
+++ b/devel/go-tools/PLIST      Fri Dec 04 11:31:16 2020 +0000
@@ -1,67 +1,96 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/14 18:53:00 bsiegert Exp $
-${GOTOOLDIR}/analyze
+@comment $NetBSD: PLIST,v 1.6 2020/12/04 11:31:16 bsiegert Exp $
+bin/authtest
 bin/benchcmp
 bin/bundle
 bin/callgraph
 bin/compilebench
+bin/cookieauth
 bin/cover
 bin/digraph
 bin/eg
 bin/findcall
 bin/fiximports
+bin/genapijson
 bin/getgo
+bin/gitauth
 bin/go-contrib-init
 bin/godex
 bin/godoc
 bin/goimports
-bin/golsp
 bin/gomvpkg
 bin/gopackages
 bin/gorename
+bin/gostacks
 bin/gotype
 bin/goyacc
 bin/guru
-bin/heapview
+bin/helper
 bin/html2article
+bin/ifaceassert
 bin/lostcancel
+bin/netrcauth
+bin/nilness
 bin/present
+bin/present2md
+bin/shadow
+bin/splitdwarf
 bin/ssadump
 bin/stress
 bin/stringer
-bin/tip
+bin/stringintconv
 bin/toolstash
+bin/unmarshal
 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
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/cmd/getgo/server.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/cmd/guru/serial.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/cmd/heapview/internal/core.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/cmd/splitdwarf/internal/macho.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/container/intsets.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/cover.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/analysistest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/internal/analysisflags.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/internal/checker.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/internal/facts.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/multichecker.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/asmdecl.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/assign.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/atomic.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/atomicalign.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/bools.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/buildssa.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/buildtag.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/cgocall.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/composite.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/copylock.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/ctrlflow.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/deepequalerrors.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/errorsas.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/findcall.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/httpresponse.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/ifaceassert.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/inspect.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/internal/analysisutil.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/loopclosure.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/lostcancel.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/nilfunc.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/nilness.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/pkgfact.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/printf.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/shadow.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/shift.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/sortslice.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/stdmethods.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/stringintconv.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/structtag.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/testinggoroutine.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/tests.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/unmarshal.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/unreachable.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/unsafeptr.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/unusedresult.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/passes/vet/internal/whitelist.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/singlechecker.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/analysis/unitchecker.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/ast/astutil.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/ast/inspector.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/buildutil.a
@@ -70,13 +99,16 @@
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/callgraph/rta.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/callgraph/static.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/cfg.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/expect.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/gccgoexportdata.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/gcexportdata.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/internal/cgo.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/internal/gccgoimporter.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/internal/gcimporter.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/internal/packagesdriver.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/loader.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/packages.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/packages/packagestest.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/pointer.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/ssa.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/ssa/interp.a
@@ -86,11 +118,8 @@
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/go/vcs.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/analysis.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/dl.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/env.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/proxy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/golangorgenv.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/redirect.a
-gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/short.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/static.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/util.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/vfs.a
@@ -99,10 +128,63 @@
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/vfs/mapfs.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/godoc/vfs/zipfs.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/imports.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/analysisinternal.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/apidiff.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/core.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export/eventtest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export/metric.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export/ocagent.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export/ocagent/wire.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/export/prometheus.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/keys.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/event/label.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/fakenet.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/fastwalk.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/gocommand.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/gopathwalk.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/imports.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/jsonrpc2.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/jsonrpc2/servertest.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/fillreturns.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/fillstruct.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/nonewvars.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/noresultvalues.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/simplifycompositelit.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/simplifyrange.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/simplifyslice.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/undeclaredname.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/analysis/unusedparams.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/browser.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/cache.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/cmd.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/cmd/test.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/debug.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/debug/tag.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/diff.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/diff/difftest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/diff/myers.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/fake.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/fuzzy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/lsprpc.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/mod.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/protocol.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/snippet.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/source.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/source/completion.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/lsp/tests.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/memoize.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/packagesinternal.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/proxydir.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/span.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/stack.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/stack/stacktest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/testenv.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/tool.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/typesinternal.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/internal/xcontext.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/playground.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/playground/socket.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/present.a
@@ -110,6 +192,7 @@
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/refactor/importgraph.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/refactor/rename.a
 gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/refactor/satisfy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/tools/txtar.a
 gopkg/src/golang.org/x/tools/AUTHORS
 gopkg/src/golang.org/x/tools/CONTRIBUTING.md
 gopkg/src/golang.org/x/tools/CONTRIBUTORS
@@ -121,6 +204,10 @@
 gopkg/src/golang.org/x/tools/blog/atom/atom.go
 gopkg/src/golang.org/x/tools/blog/blog.go



Home | Main Index | Thread Index | Old Index