Thanks. I'd prefer to run with the following, which: - Updates to go 1.0.3. - Fixes a bug in the regress tests that may result in the tests being built/run with the installed binaries rather than the new binaries. - Fixes a bug related to 'go install' trying to rebuild non-writeable $GOROOT packages, when used with a $GOPATH (issue 4106). - Includes the 'misc' part of the package, which includes editor configuration files, etc.
Passes regress on amd64 and i386. ok? Index: Makefile =================================================================== RCS file: /cvs/ports/lang/go/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 19 Sep 2012 21:10:38 -0000 1.6 +++ Makefile 28 Sep 2012 16:20:37 -0000 @@ -4,8 +4,7 @@ ONLY_FOR_ARCHS = amd64 i386 COMMENT = Go programming language -VERSION = 1.0.2 -REVISION = 0 +VERSION = 1.0.3 EXTRACT_SUFX = .src.tar.gz DISTNAME = go${VERSION} PKGNAME = go-${VERSION} @@ -71,7 +70,7 @@ do-build: do-regress: @cd ${WRKSRC} && \ ulimit -n 256 -d 2097152 && \ - PATH=${PATH}:${WRKDIST}/bin GOROOT=${WRKDIST} ./run.bash + PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} ./run.bash do-install: ${INSTALL_PROGRAM} ${WRKDIST}/bin/go{,doc,fmt} ${PREFIX}/bin @@ -83,7 +82,7 @@ do-install: -exec ${INSTALL_DATA} {} \ ${GOROOT} \; -. for dir in doc include lib src pkg +. for dir in doc include lib misc src pkg @cd ${WRKDIST} && \ find ${dir} -type d \ -exec ${INSTALL_DATA_DIR} \ Index: distinfo =================================================================== RCS file: /cvs/ports/lang/go/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 4 Jul 2012 15:18:39 -0000 1.3 +++ distinfo 28 Sep 2012 16:20:37 -0000 @@ -1,5 +1,2 @@ -MD5 (go1.0.2.src.tar.gz) = IUk2WY/PvUu6YeoT9UIHfg== -RMD160 (go1.0.2.src.tar.gz) = aEpImSzvTzPJ3lEkOnBWx17N+5M= -SHA1 (go1.0.2.src.tar.gz) = QIuzYd+MNLG7pBODgSFU6TKQdSY= -SHA256 (go1.0.2.src.tar.gz) = cPz7RVCHwUzFm3plx4AD/NEyPXP5uZHB5S21Nda8lag= -SIZE (go1.0.2.src.tar.gz) = 9676404 +SHA256 (go1.0.3.src.tar.gz) = f7o1M9Fy8TYp09innlfGIGMrC9B1q+EddpizOL4K498= +SIZE (go1.0.3.src.tar.gz) = 7404849 Index: patches/patch-src_cmd_go_pkg_go =================================================================== RCS file: patches/patch-src_cmd_go_pkg_go diff -N patches/patch-src_cmd_go_pkg_go --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_cmd_go_pkg_go 28 Sep 2012 16:20:37 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ +--- src/cmd/go/pkg.go.orig Thu Jun 14 13:23:36 2012 ++++ src/cmd/go/pkg.go Sat Sep 22 01:39:59 2012 +@@ -494,11 +494,15 @@ func isStale(p *Package, topRoot map[string]bool) bool + // the linker. This heuristic will not work if the binaries are back-dated, + // as some binary distributions may do, but it does handle a very + // common case. See issue 3036. +- if olderThan(buildToolchain.compiler()) { +- return true +- } +- if p.build.IsCommand() && olderThan(buildToolchain.linker()) { +- return true ++ // Assume that code in $GOROOT is up to date, as it might not be ++ // writeable. See issue 4106. ++ if p.Root != goroot { ++ if olderThan(buildToolchain.compiler()) { ++ return true ++ } ++ if p.build.IsCommand() && olderThan(buildToolchain.linker()) { ++ return true ++ } + } + + // Have installed copy, probably built using current compilers, Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/go/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 4 Jul 2012 15:18:39 -0000 1.4 +++ pkg/PLIST 28 Sep 2012 16:20:39 -0000 @@ -1,9 +1,9 @@ @comment $OpenBSD: PLIST,v 1.3 2012/05/20 16:32:51 jsing Exp $ %%amd64%% %%i386%% -bin/go -bin/godoc -bin/gofmt +@bin bin/go +@bin bin/godoc +@bin bin/gofmt go/ go/AUTHORS go/CONTRIBUTORS @@ -71,7 +71,6 @@ go/doc/articles/wiki/test_view.good go/doc/articles/wiki/view.html go/doc/cmd.html go/doc/code.html -go/doc/codereview_with_mq.html go/doc/codewalk/ go/doc/codewalk/codewalk.css go/doc/codewalk/codewalk.js @@ -177,25 +176,6 @@ go/doc/root.html go/doc/share.png go/doc/sieve.gif go/doc/style.css -go/doc/talks/ -go/doc/talks/go_talk-20091030.pdf -go/doc/talks/go_talk-20100112.html -go/doc/talks/go_talk-20100121.html -go/doc/talks/go_talk-20100323.html -go/doc/talks/gofrontend-gcc-summit-2010.pdf -go/doc/talks/io2010/ -go/doc/talks/io2010/balance.go -go/doc/talks/io2010/decrypt.go -go/doc/talks/io2010/encrypt.go -go/doc/talks/io2010/eval1.go -go/doc/talks/io2010/eval2.go -go/doc/talks/io2010/talk.pdf -go/doc/talks/io2011/ -go/doc/talks/io2011/Real_World_Go.pdf -go/doc/talks/io2011/Writing_Web_Apps_in_Go.pdf -go/doc/talks/java-typing.png -go/doc/talks/slidy.css -go/doc/talks/slidy.js go/doc/tos.html go/favicon.ico go/include/ @@ -235,6 +215,180 @@ go/lib/time/ go/lib/time/README go/lib/time/update.bash go/lib/time/zoneinfo.zip +go/misc/ +go/misc/IntelliJIDEA/ +go/misc/IntelliJIDEA/Go.xml +go/misc/arm/ +go/misc/arm/a +go/misc/bash/ +go/misc/bash/go +go/misc/bbedit/ +go/misc/bbedit/Go.plist +go/misc/benchcmp +go/misc/cgo/ +go/misc/cgo/gmp/ +go/misc/cgo/gmp/fib.go +go/misc/cgo/gmp/gmp.go +go/misc/cgo/gmp/pi.go +go/misc/cgo/life/ +go/misc/cgo/life/c-life.c +go/misc/cgo/life/golden.out +go/misc/cgo/life/life.go +go/misc/cgo/life/life.h +go/misc/cgo/life/main.go +go/misc/cgo/life/test.bash +go/misc/cgo/stdio/ +go/misc/cgo/stdio/chain.go +go/misc/cgo/stdio/fib.go +go/misc/cgo/stdio/file.go +go/misc/cgo/stdio/golden.out +go/misc/cgo/stdio/hello.go +go/misc/cgo/stdio/test.bash +go/misc/cgo/test/ +go/misc/cgo/test/Makefile +go/misc/cgo/test/align.go +go/misc/cgo/test/backdoor/ +go/misc/cgo/test/backdoor/backdoor.go +go/misc/cgo/test/backdoor/runtime.c +go/misc/cgo/test/basic.go +go/misc/cgo/test/callback.go +go/misc/cgo/test/callback_c.c +go/misc/cgo/test/cgo_test.go +go/misc/cgo/test/duplicate_symbol.go +go/misc/cgo/test/env.go +go/misc/cgo/test/exports.go +go/misc/cgo/test/helpers.go +go/misc/cgo/test/issue1222.go +go/misc/cgo/test/issue1328.go +go/misc/cgo/test/issue1560.go +go/misc/cgo/test/issue1635.go +go/misc/cgo/test/issue2462.go +go/misc/cgo/test/issue3945.go +go/misc/cgo/test/sleep_windows.go +go/misc/cgo/testso/ +go/misc/cgo/testso/cgoso.go +go/misc/cgo/testso/cgoso_c.c +go/misc/cgo/testso/main.go +go/misc/cgo/testso/test.bash +go/misc/chrome/ +go/misc/chrome/gophertool/ +go/misc/chrome/gophertool/README.txt +go/misc/chrome/gophertool/background.html +go/misc/chrome/gophertool/gopher.js +go/misc/chrome/gophertool/gopher.png +go/misc/chrome/gophertool/manifest.json +go/misc/chrome/gophertool/popup.html +go/misc/dashboard/ +go/misc/dashboard/README +go/misc/dashboard/app/ +go/misc/dashboard/app/app.yaml +go/misc/dashboard/app/build/ +go/misc/dashboard/app/build/build.go +go/misc/dashboard/app/build/handler.go +go/misc/dashboard/app/build/init.go +go/misc/dashboard/app/build/key.go +go/misc/dashboard/app/build/notify.go +go/misc/dashboard/app/build/notify.txt +go/misc/dashboard/app/build/test.go +go/misc/dashboard/app/build/ui.go +go/misc/dashboard/app/build/ui.html +go/misc/dashboard/app/cache/ +go/misc/dashboard/app/cache/cache.go +go/misc/dashboard/app/static/ +go/misc/dashboard/app/static/status_alert.gif +go/misc/dashboard/app/static/status_good.gif +go/misc/dashboard/builder/ +go/misc/dashboard/builder/Makefile +go/misc/dashboard/builder/doc.go +go/misc/dashboard/builder/exec.go +go/misc/dashboard/builder/http.go +go/misc/dashboard/builder/main.go +go/misc/dist/ +go/misc/dist/bindist.go +go/misc/dist/darwin/ +go/misc/dist/darwin/etc/ +go/misc/dist/darwin/etc/paths.d/ +go/misc/dist/darwin/etc/paths.d/go +go/misc/dist/darwin/scripts/ +go/misc/dist/darwin/scripts/postinstall +go/misc/dist/stat_darwin.go +go/misc/dist/stat_linux.go +go/misc/dist/windows/ +go/misc/dist/windows/LICENSE.rtf +go/misc/dist/windows/README.txt +go/misc/dist/windows/images/ +go/misc/dist/windows/images/Banner.jpg +go/misc/dist/windows/images/Dialog.jpg +go/misc/dist/windows/images/DialogLeft.jpg +go/misc/dist/windows/images/gopher.ico +go/misc/dist/windows/installer.wxs +go/misc/emacs/ +go/misc/emacs/go-mode-load.el +go/misc/emacs/go-mode.el +go/misc/fraise/ +go/misc/fraise/go.plist +go/misc/fraise/readme.txt +go/misc/goplay/ +go/misc/goplay/Makefile +go/misc/goplay/README +go/misc/goplay/doc.go +go/misc/goplay/goplay.go +go/misc/kate/ +go/misc/kate/go.xml +go/misc/notepadplus/ +go/misc/notepadplus/README +go/misc/notepadplus/go.xml +go/misc/notepadplus/userDefineLang.xml +go/misc/osx/ +go/misc/osx/README +go/misc/osx/etc/ +go/misc/osx/etc/paths.d/ +go/misc/osx/etc/paths.d/go +go/misc/osx/package.bash +go/misc/osx/scripts/ +go/misc/osx/scripts/postinstall +go/misc/pprof +go/misc/swig/ +go/misc/swig/callback/ +go/misc/swig/callback/Makefile +go/misc/swig/callback/callback.h +go/misc/swig/callback/callback.swigcxx +go/misc/swig/callback/run.go +go/misc/swig/stdio/ +go/misc/swig/stdio/Makefile +go/misc/swig/stdio/file.swig +go/misc/swig/stdio/hello.go +go/misc/vim/ +go/misc/vim/autoload/ +go/misc/vim/autoload/go/ +go/misc/vim/autoload/go/complete.vim +go/misc/vim/ftdetect/ +go/misc/vim/ftdetect/gofiletype.vim +go/misc/vim/ftplugin/ +go/misc/vim/ftplugin/go/ +go/misc/vim/ftplugin/go/fmt.vim +go/misc/vim/ftplugin/go/godoc.vim +go/misc/vim/ftplugin/go/import.vim +go/misc/vim/ftplugin/go/test.sh +go/misc/vim/indent/ +go/misc/vim/indent/go.vim +go/misc/vim/plugin/ +go/misc/vim/plugin/godoc.vim +go/misc/vim/readme.txt +go/misc/vim/syntax/ +go/misc/vim/syntax/go.vim +go/misc/vim/syntax/godoc.vim +go/misc/xcode/ +go/misc/xcode/3/ +go/misc/xcode/3/README +go/misc/xcode/3/go.pbfilespec +go/misc/xcode/3/go.xclangspec +go/misc/xcode/4/ +go/misc/xcode/4/README +go/misc/xcode/4/go.xclangspec +go/misc/xcode/4/go4xcode.sh +go/misc/zsh/ +go/misc/zsh/go go/pkg/ go/pkg/obj/ go/pkg/obj${GOCFG}/ @@ -409,16 +563,16 @@ go/pkg/tool${GOCFG}/ @bin go/pkg/tool${GOEXE}g @bin go/pkg/tool${GOEXE}l @bin go/pkg/tool${GOCFG}/addr2line -go/pkg/tool${GOCFG}/api -go/pkg/tool${GOCFG}/cgo +@bin go/pkg/tool${GOCFG}/api +@bin go/pkg/tool${GOCFG}/cgo @bin go/pkg/tool${GOCFG}/dist -go/pkg/tool${GOCFG}/fix +@bin go/pkg/tool${GOCFG}/fix @bin go/pkg/tool${GOCFG}/nm @bin go/pkg/tool${GOCFG}/objdump @bin go/pkg/tool${GOCFG}/pack go/pkg/tool${GOCFG}/pprof -go/pkg/tool${GOCFG}/vet -go/pkg/tool${GOCFG}/yacc +@bin go/pkg/tool${GOCFG}/vet +@bin go/pkg/tool${GOCFG}/yacc go/robots.txt go/src/ go/src/Make.dist @@ -1145,6 +1299,7 @@ go/src/pkg/compress/flate/flate_test.go go/src/pkg/compress/flate/huffman_bit_writer.go go/src/pkg/compress/flate/huffman_code.go go/src/pkg/compress/flate/inflate.go +go/src/pkg/compress/flate/reader_test.go go/src/pkg/compress/flate/reverse_bits.go go/src/pkg/compress/flate/token.go go/src/pkg/compress/gzip/ @@ -1220,6 +1375,7 @@ go/src/pkg/crypto/md5/md5.go go/src/pkg/crypto/md5/md5_test.go go/src/pkg/crypto/md5/md5block.go go/src/pkg/crypto/rand/ +go/src/pkg/crypto/rand/example_test.go go/src/pkg/crypto/rand/rand.go go/src/pkg/crypto/rand/rand_test.go go/src/pkg/crypto/rand/rand_unix.go @@ -2013,6 +2169,7 @@ go/src/pkg/net/mail/message.go go/src/pkg/net/mail/message_test.go go/src/pkg/net/multicast_test.go go/src/pkg/net/net.go +go/src/pkg/net/net_posix.go go/src/pkg/net/net_test.go go/src/pkg/net/newpollserver.go go/src/pkg/net/parse.go @@ -2094,6 +2251,7 @@ go/src/pkg/os/error_plan9.go go/src/pkg/os/error_posix.go go/src/pkg/os/error_test.go go/src/pkg/os/error_windows.go +go/src/pkg/os/error_windows_test.go go/src/pkg/os/exec/ go/src/pkg/os/exec.go go/src/pkg/os/exec/example_test.go @@ -2231,6 +2389,7 @@ go/src/pkg/runtime/cgo/gcc_windows_386.c go/src/pkg/runtime/cgo/gcc_windows_amd64.c go/src/pkg/runtime/cgo/iscgo.c go/src/pkg/runtime/cgo/libcgo.h +go/src/pkg/runtime/cgo/netbsd.c go/src/pkg/runtime/cgocall.c go/src/pkg/runtime/cgocall.h go/src/pkg/runtime/chan.c @@ -2404,6 +2563,7 @@ go/src/pkg/runtime/traceback_arm.c go/src/pkg/runtime/traceback_x86.c go/src/pkg/runtime/type.go go/src/pkg/runtime/type.h +go/src/pkg/runtime/vdso_linux_amd64.c go/src/pkg/runtime/vlop_386.s go/src/pkg/runtime/vlop_arm.s go/src/pkg/runtime/vlrt_386.c -- "Stop assuming that systems are secure unless demonstrated insecure; start assuming that systems are insecure unless designed securely." - Bruce Schneier