Re: UPDATE: lang/go 1.6
Another attempt at updating go to version 1.6. Uses find and INSTALL_*, while taking care of installing api docs and tests and omitting bootstrap files. -- Dmitrij D. Czarkoff Index: Makefile === RCS file: /cvs/ports/lang/go/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile5 May 2016 10:46:50 - 1.30 +++ Makefile11 May 2016 10:21:23 - @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS} COMMENT = Go programming language -VERSION = 1.5.4 +VERSION = 1.6 EXTRACT_SUFX = .src.tar.gz DISTNAME = go${VERSION} PKGNAME = go-${VERSION} @@ -83,7 +83,7 @@ do-install: -exec ${INSTALL_DATA} -p {} \ ${GOROOT} \; -. for dir in doc lib misc src pkg +. for dir in api doc lib misc src pkg/include pkg/obj pkg/${GOCFG} test @cd ${WRKDIST} && \ find ${dir} -type d \ -exec ${INSTALL_DATA_DIR} \ @@ -94,7 +94,6 @@ do-install: ${GOROOT}/{} \; . endfor - # These get installed via `find' however we need them to be executable ${INSTALL_PROGRAM_DIR} ${GOROOT}/pkg/tool/${GOOS}_${GOARCH} ${INSTALL_PROGRAM} -p ${WRKDIST}/pkg/tool/${GOOS}_${GOARCH}/* \ ${GOROOT}/pkg/tool/${GOOS}_${GOARCH} Index: distinfo === RCS file: /cvs/ports/lang/go/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- distinfo14 Apr 2016 17:43:26 - 1.16 +++ distinfo11 May 2016 09:42:16 - @@ -1,2 +1,2 @@ -SHA256 (go1.5.4.src.tar.gz) = ACrKvOfdwUDQ1ViR+dT8+92Aa5My+4sRDJG8ka+wvJM= -SIZE (go1.5.4.src.tar.gz) = 12059752 +SHA256 (go1.6.src.tar.gz) = qWzOjOQ6m/mypMfUcLx+4MsAQQ2oFZgGgcg1Mhjc8UY= +SIZE (go1.6.src.tar.gz) = 12613308 Index: go.port.mk === RCS file: /cvs/ports/lang/go/go.port.mk,v retrieving revision 1.9 diff -u -p -r1.9 go.port.mk --- go.port.mk 8 May 2016 12:29:17 - 1.9 +++ go.port.mk 11 May 2016 00:58:28 - @@ -28,12 +28,18 @@ MODGO_BUILD_CMD = ${MODGO_CMD} install $ MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS} .if defined(GH_ACCOUNT) && defined(GH_PROJECT) -ALL_TARGET ?= github.com/${GH_ACCOUNT}/${GH_PROJECT} +MODGO_TOPLEVEL ?= github.com/${GH_ACCOUNT}/${GH_PROJECT} +.elif !empty(ALL_TARGET) +. for path in ${ALL_TARGET}# extract first word +MODGO_TOPLEVEL ?= ${path} +. endfor .endif + +ALL_TARGET ?= ${MODGO_TOPLEVEL} TEST_TARGET ?= ${ALL_TARGET} SEPARATE_BUILD ?= Yes -WRKSRC ?= ${MODGO_WORKSPACE}/src/${ALL_TARGET} +WRKSRC ?= ${MODGO_WORKSPACE}/src/${MODGO_TOPLEVEL} MODGO_SETUP_WORKSPACE =mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR} ${WRKSRC}; Index: pkg/PLIST === RCS file: /cvs/ports/lang/go/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 14 Apr 2016 17:43:26 - 1.14 +++ pkg/PLIST 11 May 2016 10:35:31 - @@ -9,6 +9,17 @@ go/LICENSE go/PATENTS go/README.md go/VERSION +go/api/ +go/api/README +go/api/except.txt +go/api/go1.1.txt +go/api/go1.2.txt +go/api/go1.3.txt +go/api/go1.4.txt +go/api/go1.5.txt +go/api/go1.6.txt +go/api/go1.txt +go/api/next.txt go/bin/ @bin go/bin/go @bin go/bin/gofmt @@ -74,6 +85,7 @@ go/doc/go1.2.html go/doc/go1.3.html go/doc/go1.4.html go/doc/go1.5.html +go/doc/go1.6.html go/doc/go1.html go/doc/go1compat.html go/doc/go_faq.html @@ -182,8 +194,14 @@ go/misc/cgo/errors/ go/misc/cgo/errors/err1.go go/misc/cgo/errors/err2.go go/misc/cgo/errors/err3.go +go/misc/cgo/errors/issue11097a.go +go/misc/cgo/errors/issue11097b.go +go/misc/cgo/errors/issue13129.go +go/misc/cgo/errors/issue13423.go +go/misc/cgo/errors/issue13635.go go/misc/cgo/errors/issue7757.go go/misc/cgo/errors/issue8442.go +go/misc/cgo/errors/ptr.go go/misc/cgo/errors/test.bash go/misc/cgo/gmp/ go/misc/cgo/gmp/fib.go @@ -221,6 +239,7 @@ go/misc/cgo/test/callback_c_gccgo.c go/misc/cgo/test/cflags.go go/misc/cgo/test/cgo_linux_test.go go/misc/cgo/test/cgo_test.go +go/misc/cgo/test/cgo_unix_test.go go/misc/cgo/test/cthread.go go/misc/cgo/test/cthread_unix.c go/misc/cgo/test/cthread_windows.c @@ -228,12 +247,18 @@ go/misc/cgo/test/duplicate_symbol.go go/misc/cgo/test/env.go go/misc/cgo/test/exports.go go/misc/cgo/test/fpvar.go +go/misc/cgo/test/gcc68255/ +go/misc/cgo/test/gcc68255.go +go/misc/cgo/test/gcc68255/a.go +go/misc/cgo/test/gcc68255/c.c +go/misc/cgo/test/gcc68255/c.h go/misc/cgo/test/helpers.go go/misc/cgo/test/issue10303.go go/misc/cgo/test/issue11925.go go/misc/cgo/test/issue12030.go go/misc/cgo/test/issue1222.go go/misc/cgo/test/issue1328.go +go/misc/cgo/tes
Re: UPDATE: lang/go 1.6
On Tuesday 05 April 2016 23:43:30 Dmitrij D. Czarkoff wrote: > Juan Francisco Cantero Hurtado said: > > The files will not show up again in the future in the PLIST. > > Indeed. Also > > > - I would prefer to keep the old behavior in do-install. INSTALL_* will > > > > use the correct permissions for every type of file/dir. > > We currently install everything (except bin/go and bin/gofmt) with > INSTALL_DATA, thus stripping executable bits from several tools and > scripts. I am not sure it is a good idea. FWIW I switched do-install > to cp because tests of some package wanted to use some script from go's > own tests, and assumed that it has 'x' permission bit set. Provided > that we don't package much software in go, it may be worth keeping > closer to upstream. > > Tracking permissions manually and using INSTALL_{PROGRAM,SCRIPT} when > needed would require much effort with no real benefit. Just using cp > instead we get > > $ find /usr/local/go -type f -exec stat -f '%Su %Sg %Sp' {} + | sort | > uniq -c 7483 root bin -r--r--r-- > 34 root bin -r-xr-xr-x > > with two lines of shell commands. Even if permission changes will be > required in future, it will likely be easier to chmod individual files. I share the same concern - the previous approach was deliberate and resulted in 19 executable files being installed by the package, all of which are binaries. By using cp instead we now have an unlimited number of executable files being installed, with whatever permissions have come from the source tar archive. Which packages are expecting to run scripts within Go's tests?
Re: UPDATE: lang/go 1.6
On Tue, Apr 05, 2016 at 11:43:30PM +0200, Dmitrij D. Czarkoff wrote: > Juan Francisco Cantero Hurtado said: > > The files will not show up again in the future in the PLIST. > > Indeed. Also > > > - I would prefer to keep the old behavior in do-install. INSTALL_* will > > use the correct permissions for every type of file/dir. > > We currently install everything (except bin/go and bin/gofmt) with > INSTALL_DATA, thus stripping executable bits from several tools and > scripts. I am not sure it is a good idea. FWIW I switched do-install > to cp because tests of some package wanted to use some script from go's > own tests, and assumed that it has 'x' permission bit set. Provided > that we don't package much software in go, it may be worth keeping > closer to upstream. > > Tracking permissions manually and using INSTALL_{PROGRAM,SCRIPT} when > needed would require much effort with no real benefit. Just using cp > instead we get > > $ find /usr/local/go -type f -exec stat -f '%Su %Sg %Sp' {} + | sort | uniq > -c > 7483 root bin -r--r--r-- > 34 root bin -r-xr-xr-x > > with two lines of shell commands. Even if permission changes will be > required in future, it will likely be easier to chmod individual files. Yes, maybe I'm being too conservative here. -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: lang/go 1.6
Juan Francisco Cantero Hurtado said: > The files will not show up again in the future in the PLIST. Indeed. Also > - I would prefer to keep the old behavior in do-install. INSTALL_* will > use the correct permissions for every type of file/dir. We currently install everything (except bin/go and bin/gofmt) with INSTALL_DATA, thus stripping executable bits from several tools and scripts. I am not sure it is a good idea. FWIW I switched do-install to cp because tests of some package wanted to use some script from go's own tests, and assumed that it has 'x' permission bit set. Provided that we don't package much software in go, it may be worth keeping closer to upstream. Tracking permissions manually and using INSTALL_{PROGRAM,SCRIPT} when needed would require much effort with no real benefit. Just using cp instead we get $ find /usr/local/go -type f -exec stat -f '%Su %Sg %Sp' {} + | sort | uniq -c 7483 root bin -r--r--r-- 34 root bin -r-xr-xr-x with two lines of shell commands. Even if permission changes will be required in future, it will likely be easier to chmod individual files. -- Dmitrij D. Czarkoff
Re: UPDATE: lang/go 1.6
On Tue, Apr 05, 2016 at 09:29:59PM +0100, Stuart Henderson wrote: > On 2016/04/05 21:15, Juan Francisco Cantero Hurtado wrote: > > On Tue, Apr 05, 2016 at 06:42:06PM +0100, Stuart Henderson wrote: > > > On 2016/04/05 00:51, Juan Francisco Cantero Hurtado wrote: > > > > > > > > > > Here is the whole go update as a single huge diff including lang/go, > > > > > devel/go-tools, three new go ports, websocketd update and > > > > > net/websocketd > > > > > removal. The changes to juanfra@'s lang/go diff boil down to > > > > > simplified > > > > > install stage - I copy over everything and then remove bootstrap. > > > > > > > > > > I considered removing tests, but upstream says that go implementation > > > > > should serve a reference for good practices in go development, so > > > > > these > > > > > tests may serve a reference implementation purposes. > > > > > > > > > > OK? > > > > > > > > Sorry for the delay. > > > > > > > > - Use "@comment" for the bootstrap lines in PLIST > > > > > > It's easier to handle updates if you rm rather than @comment. > > > But let's hear what the maintainer says first :-) > > > > Why is easier? update-plist would keep the lines with @comment, right? > > Yes and that is part of the problem, it will keep *all* the lines with > @comment (even if some of the files are removed), but it won't add any > new @comment markers for files in the same directory. > > For the same reason it's usually better to rm *.la rather than add them > as @comments. Forget about my comment. I didn't see the line "rm -R ${GOROOT}/pkg/bootstrap" in the Makefile. The files will not show up again in the future in the PLIST. -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: lang/go 1.6
On 2016/04/05 21:15, Juan Francisco Cantero Hurtado wrote: > On Tue, Apr 05, 2016 at 06:42:06PM +0100, Stuart Henderson wrote: > > On 2016/04/05 00:51, Juan Francisco Cantero Hurtado wrote: > > > > > > > > Here is the whole go update as a single huge diff including lang/go, > > > > devel/go-tools, three new go ports, websocketd update and net/websocketd > > > > removal. The changes to juanfra@'s lang/go diff boil down to simplified > > > > install stage - I copy over everything and then remove bootstrap. > > > > > > > > I considered removing tests, but upstream says that go implementation > > > > should serve a reference for good practices in go development, so these > > > > tests may serve a reference implementation purposes. > > > > > > > > OK? > > > > > > Sorry for the delay. > > > > > > - Use "@comment" for the bootstrap lines in PLIST > > > > It's easier to handle updates if you rm rather than @comment. > > But let's hear what the maintainer says first :-) > > Why is easier? update-plist would keep the lines with @comment, right? Yes and that is part of the problem, it will keep *all* the lines with @comment (even if some of the files are removed), but it won't add any new @comment markers for files in the same directory. For the same reason it's usually better to rm *.la rather than add them as @comments.
Re: UPDATE: lang/go 1.6
On Tue, Apr 05, 2016 at 06:42:06PM +0100, Stuart Henderson wrote: > On 2016/04/05 00:51, Juan Francisco Cantero Hurtado wrote: > > > > > > Here is the whole go update as a single huge diff including lang/go, > > > devel/go-tools, three new go ports, websocketd update and net/websocketd > > > removal. The changes to juanfra@'s lang/go diff boil down to simplified > > > install stage - I copy over everything and then remove bootstrap. > > > > > > I considered removing tests, but upstream says that go implementation > > > should serve a reference for good practices in go development, so these > > > tests may serve a reference implementation purposes. > > > > > > OK? > > > > Sorry for the delay. > > > > - Use "@comment" for the bootstrap lines in PLIST > > It's easier to handle updates if you rm rather than @comment. > But let's hear what the maintainer says first :-) Why is easier? update-plist would keep the lines with @comment, right? -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: lang/go 1.6
On 2016/04/05 00:51, Juan Francisco Cantero Hurtado wrote: > > > > Here is the whole go update as a single huge diff including lang/go, > > devel/go-tools, three new go ports, websocketd update and net/websocketd > > removal. The changes to juanfra@'s lang/go diff boil down to simplified > > install stage - I copy over everything and then remove bootstrap. > > > > I considered removing tests, but upstream says that go implementation > > should serve a reference for good practices in go development, so these > > tests may serve a reference implementation purposes. > > > > OK? > > Sorry for the delay. > > - Use "@comment" for the bootstrap lines in PLIST It's easier to handle updates if you rm rather than @comment. But let's hear what the maintainer says first :-)
Re: UPDATE: lang/go 1.6
On Sun, Apr 03, 2016 at 06:56:13AM +0200, Dmitrij D. Czarkoff wrote: > Dmitrij D. Czarkoff said: > > Dmitrij D. Czarkoff said: > > > Juan Francisco Cantero Hurtado said: > > > > I just ran "make test" on amd64, so any additional tests are welcome. > > > > > > > > OK? > > > > > > Corresponding update to devel/go-tools. > > > > In previous versions go-tools did not include present and html2article > > tools. This happened because both tools had dependencies on golang > > extra packages from golang.org/x/net which were not available in ports. > > For the sake of completeness I've ported golang.org/x/net and its > > dependencies golang.org/x/crypto and golang.org/x/text. > > > > As golang.org/x/net/websocket (net/go-websocket) is a part of > > golang.org/x/net package set, I suggest to remove it in favor of the > > whole package set. > > > > I have also updated net/websocketd, the only port depending on > > net/go-websocket. > > > > OKs? > > Here is the whole go update as a single huge diff including lang/go, > devel/go-tools, three new go ports, websocketd update and net/websocketd > removal. The changes to juanfra@'s lang/go diff boil down to simplified > install stage - I copy over everything and then remove bootstrap. > > I considered removing tests, but upstream says that go implementation > should serve a reference for good practices in go development, so these > tests may serve a reference implementation purposes. > > OK? Sorry for the delay. - Use "@comment" for the bootstrap lines in PLIST - I would prefer to keep the old behavior in do-install. INSTALL_* will use the correct permissions for every type of file/dir. With those changes, OK juanfra@ to everything. Please wait until the kspillner@ OK for the removal and the jsing@ OK for the go update. -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: lang/go 1.6
Dmitrij D. Czarkoff said: > Juan Francisco Cantero Hurtado said: > > I just ran "make test" on amd64, so any additional tests are welcome. > > > > OK? > > Corresponding update to devel/go-tools. In previous versions go-tools did not include present and html2article tools. This happened because both tools had dependencies on golang extra packages from golang.org/x/net which were not available in ports. For the sake of completeness I've ported golang.org/x/net and its dependencies golang.org/x/crypto and golang.org/x/text. As golang.org/x/net/websocket (net/go-websocket) is a part of golang.org/x/net package set, I suggest to remove it in favor of the whole package set. I have also updated net/websocketd, the only port depending on net/go-websocket. OKs? -- Dmitrij D. Czarkoff go-crypto-20160329.tgz Description: go-crypto-20160329.tgz go-net-20160331.tgz Description: go-net-20160331.tgz go-text-20160316.tgz Description: go-text-20160316.tgz Index: Makefile === RCS file: /cvs/ports/devel/go-tools/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile14 Jan 2016 16:11:17 - 1.6 +++ Makefile1 Apr 2016 09:35:19 - @@ -3,8 +3,8 @@ 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/ @@ -17,11 +17,14 @@ WANTLIB += c pthread MODULES = lang/go +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/bundle \ golang.org/x/tools/cmd/callgraph \ golang.org/x/tools/cmd/digraph \ golang.org/x/tools/cmd/eg \ @@ -31,18 +34,16 @@ ALL_TARGET =golang.org/x/tools/cmd/ben golang.org/x/tools/cmd/gomvpkg \ golang.org/x/tools/cmd/gorename \ golang.org/x/tools/cmd/gotype \ + golang.org/x/tools/cmd/html2article \ golang.org/x/tools/cmd/oracle \ + golang.org/x/tools/cmd/present \ 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 \ + golang.org/x/tools/cmd/tip MODGO_TYPE = bin - -post-patch: - mkdir -p ${MODGO_WORKSPACE}/src/golang.org/x - mv ${WRKDIST} ${MODGO_WORKSPACE}/src/golang.org/x/tools +WRKSRC = ${MODGO_WORKSPACE}/src/golang.org/x/tools # 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 Index: distinfo === RCS file: /cvs/ports/devel/go-tools/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo14 Jan 2016 16:11:17 - 1.2 +++ distinfo31 Mar 2016 23:40:31 - @@ -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 Index: pkg/PLIST === RCS file: /cvs/ports/devel/go-tools/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 14 Jan 2016 16:11:17 - 1.4 +++ pkg/PLIST 1 Apr 2016 09:38:31 - @@ -2,6 +2,7 @@ @conflict stress-* @pkgpath textproc/godoc @bin bin/benchcmp +@bin bin/bundle @bin bin/callgraph @bin bin/digraph @bin bin/eg @@ -12,8 +13,11 @@ @bin bin/gomvpkg @bin bin/gorename @bin bin/gotype +@bin bin/html2article @bin bin/oracle +@bin bin/present @bin bin/ssadump @bin bin/stress @bin bin/stringer +@bin bin/tip @rcscript ${RCDIR}/godoc Index: Makefile === RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.369 diff -u -p -r1.369 Makefile --- Makefile20 Mar 2016 20:42:47 - 1.369 +++ Makefile1 Apr 2016 10:04:41 - @@ -5,7 +5,7 @@ CATEGORIES =devel databases DISTFILES = # API.rev -PKGNAME = quirks-2.214 +PKGNAME = quirks-2.215 PKG_ARCH = * MAINT
Re: UPDATE: lang/go 1.6
2016-03-28 18:42 GMT-07:00 Juan Francisco Cantero Hurtado : > @@ -448,6 +501,7 @@ go/pkg/bootstrap/pkg${GOCFG}/bootstrap/c > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/arm64.a > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/big.a > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/gc.a > +go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/mips64.a > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/ppc64.a > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/compile/internal/x86.a > go/pkg/bootstrap/pkg${GOCFG}/bootstrap/internal/ FYI, the official Go binary releases do not include the pkg/bootstrap directory. It shouldn't cause any problems either, but it's just a waste of disk space.
Re: UPDATE: lang/go 1.6
Juan Francisco Cantero Hurtado said: > I just ran "make test" on amd64, so any additional tests are welcome. > > OK? Corresponding update to devel/go-tools. -- Dmitrij D. Czarkoff Index: Makefile === RCS file: /cvs/ports/devel/go-tools/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile14 Jan 2016 16:11:17 - 1.6 +++ Makefile31 Mar 2016 22:54:28 - @@ -3,8 +3,8 @@ 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/ @@ -22,6 +22,7 @@ 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/bundle \ golang.org/x/tools/cmd/callgraph \ golang.org/x/tools/cmd/digraph \ golang.org/x/tools/cmd/eg \ @@ -35,14 +36,12 @@ ALL_TARGET =golang.org/x/tools/cmd/ben golang.org/x/tools/cmd/ssadump \ golang.org/x/tools/cmd/stress \ golang.org/x/tools/cmd/stringer \ + golang.org/x/tools/cmd/tip # 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 +WRKSRC = ${MODGO_WORKSPACE}/src/golang.org/x/tools # 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 Index: distinfo === RCS file: /cvs/ports/devel/go-tools/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo14 Jan 2016 16:11:17 - 1.2 +++ distinfo31 Mar 2016 10:52:37 - @@ -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 Index: pkg/PLIST === RCS file: /cvs/ports/devel/go-tools/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 14 Jan 2016 16:11:17 - 1.4 +++ pkg/PLIST 31 Mar 2016 22:54:36 - @@ -2,6 +2,7 @@ @conflict stress-* @pkgpath textproc/godoc @bin bin/benchcmp +@bin bin/bundle @bin bin/callgraph @bin bin/digraph @bin bin/eg @@ -16,4 +17,5 @@ @bin bin/ssadump @bin bin/stress @bin bin/stringer +@bin bin/tip @rcscript ${RCDIR}/godoc
UPDATE: lang/go 1.6
I just ran "make test" on amd64, so any additional tests are welcome. OK? Index: Makefile === RCS file: /cvs/ports/lang/go/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- Makefile14 Jan 2016 12:11:50 - 1.28 +++ Makefile29 Mar 2016 01:26:05 - @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS} COMMENT = Go programming language -VERSION = 1.5.3 +VERSION = 1.6 EXTRACT_SUFX = .src.tar.gz DISTNAME = go${VERSION} PKGNAME = go-${VERSION} Index: distinfo === RCS file: /cvs/ports/lang/go/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo14 Jan 2016 12:11:50 - 1.15 +++ distinfo29 Mar 2016 01:26:05 - @@ -1,2 +1,2 @@ -SHA256 (go1.5.3.src.tar.gz) = dU4G2rHDGrFo/J254yWWc0AV6p4kvETK5/I39BfOTv4= -SIZE (go1.5.3.src.tar.gz) = 12057623 +SHA256 (go1.6.src.tar.gz) = qWzOjOQ6m/mypMfUcLx+4MsAQQ2oFZgGgcg1Mhjc8UY= +SIZE (go1.6.src.tar.gz) = 12613308 Index: pkg/PLIST === RCS file: /cvs/ports/lang/go/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 5 Dec 2015 05:01:24 - 1.13 +++ pkg/PLIST 29 Mar 2016 01:26:05 - @@ -74,6 +74,7 @@ go/doc/go1.2.html go/doc/go1.3.html go/doc/go1.4.html go/doc/go1.5.html +go/doc/go1.6.html go/doc/go1.html go/doc/go1compat.html go/doc/go_faq.html @@ -182,8 +183,14 @@ go/misc/cgo/errors/ go/misc/cgo/errors/err1.go go/misc/cgo/errors/err2.go go/misc/cgo/errors/err3.go +go/misc/cgo/errors/issue11097a.go +go/misc/cgo/errors/issue11097b.go +go/misc/cgo/errors/issue13129.go +go/misc/cgo/errors/issue13423.go +go/misc/cgo/errors/issue13635.go go/misc/cgo/errors/issue7757.go go/misc/cgo/errors/issue8442.go +go/misc/cgo/errors/ptr.go go/misc/cgo/errors/test.bash go/misc/cgo/gmp/ go/misc/cgo/gmp/fib.go @@ -221,6 +228,7 @@ go/misc/cgo/test/callback_c_gccgo.c go/misc/cgo/test/cflags.go go/misc/cgo/test/cgo_linux_test.go go/misc/cgo/test/cgo_test.go +go/misc/cgo/test/cgo_unix_test.go go/misc/cgo/test/cthread.go go/misc/cgo/test/cthread_unix.c go/misc/cgo/test/cthread_windows.c @@ -228,12 +236,18 @@ go/misc/cgo/test/duplicate_symbol.go go/misc/cgo/test/env.go go/misc/cgo/test/exports.go go/misc/cgo/test/fpvar.go +go/misc/cgo/test/gcc68255/ +go/misc/cgo/test/gcc68255.go +go/misc/cgo/test/gcc68255/a.go +go/misc/cgo/test/gcc68255/c.c +go/misc/cgo/test/gcc68255/c.h go/misc/cgo/test/helpers.go go/misc/cgo/test/issue10303.go go/misc/cgo/test/issue11925.go go/misc/cgo/test/issue12030.go go/misc/cgo/test/issue1222.go go/misc/cgo/test/issue1328.go +go/misc/cgo/test/issue13402.go go/misc/cgo/test/issue1560.go go/misc/cgo/test/issue1635.go go/misc/cgo/test/issue2462.go @@ -245,6 +259,7 @@ go/misc/cgo/test/issue3729w.go go/misc/cgo/test/issue3741.go go/misc/cgo/test/issue3775.go go/misc/cgo/test/issue3945.go +go/misc/cgo/test/issue4029.c go/misc/cgo/test/issue4029.go go/misc/cgo/test/issue4029w.go go/misc/cgo/test/issue4054a.go @@ -311,8 +326,14 @@ go/misc/cgo/test/issue9400/asm_ppc64x.s go/misc/cgo/test/issue9400/gccgo.go go/misc/cgo/test/issue9400/stubs.go go/misc/cgo/test/issue9400_linux.go +go/misc/cgo/test/issue9510.go +go/misc/cgo/test/issue9510a/ +go/misc/cgo/test/issue9510a/a.go +go/misc/cgo/test/issue9510b/ +go/misc/cgo/test/issue9510b/b.go go/misc/cgo/test/issue9557.go go/misc/cgo/test/setgid_linux.go +go/misc/cgo/test/sigaltstack.go go/misc/cgo/test/sigprocmask_linux.c go/misc/cgo/test/sigprocmask_linux.go go/misc/cgo/test/sleep_windows_386.go @@ -320,9 +341,18 @@ go/misc/cgo/testasan/ go/misc/cgo/testasan/main.go go/misc/cgo/testcarchive/ go/misc/cgo/testcarchive/main.c +go/misc/cgo/testcarchive/main2.c +go/misc/cgo/testcarchive/main3.c +go/misc/cgo/testcarchive/main4.c go/misc/cgo/testcarchive/src/ go/misc/cgo/testcarchive/src/libgo/ go/misc/cgo/testcarchive/src/libgo/libgo.go +go/misc/cgo/testcarchive/src/libgo2/ +go/misc/cgo/testcarchive/src/libgo2/libgo2.go +go/misc/cgo/testcarchive/src/libgo3/ +go/misc/cgo/testcarchive/src/libgo3/libgo3.go +go/misc/cgo/testcarchive/src/libgo4/ +go/misc/cgo/testcarchive/src/libgo4/libgo4.go go/misc/cgo/testcarchive/src/p/ go/misc/cgo/testcarchive/src/p/p.go go/misc/cgo/testcarchive/test.bash @@ -331,11 +361,19 @@ go/misc/cgo/testcshared/main0.c go/misc/cgo/testcshared/main1.c go/misc/cgo/testcshared/main2.c go/misc/cgo/testcshared/main3.c +go/misc/cgo/testcshared/main4.c +go/misc/cgo/testcshared/main5.c go/misc/cgo/testcshared/src/ go/misc/cgo/testcshared/src/libgo/ go/misc/cgo/testcshared/src/libgo/libgo.go go/misc/cgo/testcshared/src/libgo2/ +go/misc/cgo/testcshared/src/libgo2/dup2.go +go/misc/cgo/testcshared/src/libgo2/dup3.go go/misc/cgo/testcshared/src/libgo2/libgo2.go +go/misc/cgo/testcshared/src/libgo4/ +go/misc/cgo/