On Sat, 05 Dec 2015 04:35:45 +1100 Joel Sing <j...@sing.id.au> wrote:
> On Friday 04 December 2015 03:12:16 Joel Sing wrote: > > The following updates lang/go to 1.5.1 - this depends on the > > lang/go-bootstrap package just sent to ports@. > > > > One difference is that this now installs the go binary in > > /usr/local/go/bin/go, which allows the package to be used as a > > bootstrap to build Go from source. Symbolic links are installed > > for /usr/bin/go and /usr/bin/gofmt so that they're still available > > in the previous locations (and don't require PATH changes). > > > > Passes regress on i386 and amd64. > > > > ok? > > Revised for Go 1.5.2. Also simplify the Makefile now that we no longer > have/need PFRAGs - GOEXE is now unused as well. > > ok? > On both this patch and the previous one I have a failed hunk when applying the diff. -------------------------- |Index: patches/patch-src_net_textproto_reader_test_go |=================================================================== |RCS file: patches/patch-src_net_textproto_reader_test_go |diff -N patches/patch-src_net_textproto_reader_test_go |--- patches/patch-src_net_textproto_reader_test_go 19 Aug 2015 06:57:20 -0000 1.1 |+++ /dev/null 1 Jan 1970 00:00:00 -0000 -------------------------- Patching file patches/patch-src_net_textproto_reader_test_go using Plan A... Empty context always matches. Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to patches/patch-src_net_textproto_reader_test_go.rej Hmm... The next patch looks like a unified diff to me... Which makes the port fail on make clean patch $ make clean patch ===> Cleaning for go-1.5.2 ===> go-1.5.2 depends on: go-bootstrap-* -> go-bootstrap-1.4.3 ===> go-1.5.2 depends on: bash-* -> bash-4.3.42 ===> Verifying specs: c m pthread ===> found c.84.2 m.9.0 pthread.20.1 ===> Checking files for go-1.5.2 `/usr/ports/distfiles/go1.5.2.src.tar.gz' is up to date. >> (SHA256) go1.5.2.src.tar.gz: OK ===> Extracting for go-1.5.2 ===> Patching for go-1.5.2 ===> Ignoring empty patchfile patch-src_net_http_header_go ===> Ignoring empty patchfile patch-src_net_http_readrequest_test_go ===> Ignoring empty patchfile patch-src_net_http_transfer_go ===> Ignoring empty patchfile patch-src_net_textproto_reader_go Ignoring previously applied (or reversed) patch. 2 out of 2 hunks ignored--saving rejects to src/net/textproto/reader_test.go.rej ***> patch-src_net_textproto_reader_test_go did not apply cleanly *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2692 '/usr/ports/pobj/go-1.5.2/.patch_done': @if cd /usr/ports/lang/go/patches 2>...) *** Error 1 in /usr/ports/lang/go (/usr/ports/infrastructure/mk/bsd.port.mk:2491 'patch') I can proceed by removing the patch-src_net_textproto_reader_test_go patch. $ go version go version go1.4.2 openbsd/amd64 $ make install ===> Verifying specs: c m pthread ===> found c.84.2 m.9.0 pthread.20.1 ===> Installing go-1.5.2 from /usr/ports/packages/amd64/all/ Password: go-1.4.2p0->1.5.2: ok Read shared items: ok Password: $ go version go version go1.5.2 openbsd/amd64 All in all, the compiler works and installs cleanly. Tested on amd64 -current snapshot from 28th November. Regards, Adam Wolk
