Straight forward update working fine with all tests passing on amd64:

        go1.9.3 (released 2018/01/22) includes fixes to the compiler,
        runtime, and the database/sql, math/big, net/http, and net/url
        packages. See the Go 1.9.3 milestone[0] on our issue tracker for
        details.

0: https://github.com/golang/go/issues?q=milestone%3AGo1.9.3

Can anyone test this on i386, please?

I also took the liberty and changed do-install so that it's shorter and
a bit easier to read. find(1) walks have been merged, GOCFG used where
appropiate and one level of indentation removed from the .for loop.

Feedback?

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile    28 Nov 2017 16:27:21 -0000      1.48
+++ Makefile    4 Feb 2018 18:10:53 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =        ${GO_ARCHS}
 
 COMMENT =              Go programming language
 
-VERSION =              1.9.2
+VERSION =              1.9.3
 EXTRACT_SUFX =         .src.tar.gz
 DISTNAME =             go${VERSION}
 PKGNAME =              go-${VERSION}
@@ -22,7 +22,8 @@ WANTLIB =             c pthread
 
 MASTER_SITES =         https://golang.org/dl/
 
-BUILD_DEPENDS =                lang/go-bootstrap shells/bash
+BUILD_DEPENDS =                lang/go-bootstrap \
+                       shells/bash
 
 SEPARATE_BUILD =       simple
 CONFIGURE_STYLE =      None
@@ -47,11 +48,10 @@ GOARCH =            386
 GOCFG =                        /${GOOS}_${GOARCH}
 
 do-configure:
-.      if ${GOARCH} == "unknown"
-               @echo "Unable to determine GOARCH for ${MACHINE_ARCH}."
-               @exit 1
-.      endif
-
+.if ${GOARCH} == "unknown"
+       @echo "Unable to determine GOARCH for ${MACHINE_ARCH}."
+       @exit 1
+.endif
 
 do-build:
        @cd ${WRKSRC} && \
@@ -69,34 +69,26 @@ do-test:
                PATH=${WRKDIST}/bin:${PATH} GOROOT=${WRKDIST} ./run.bash
 
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${GOROOT}
-
-       ${INSTALL_PROGRAM_DIR} ${GOROOT}/bin
-       ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/go{,fmt} ${GOROOT}/bin
+       ${INSTALL_PROGRAM_DIR} ${GOROOT}{,/bin}
 
-       @cd ${PREFIX}/bin && \
-               ln -sf ../go/bin/go go
-       @cd ${PREFIX}/bin && \
-               ln -sf ../go/bin/gofmt gofmt
-
-       @cd ${WRKDIST} && \
-               find . -type f -maxdepth 1 \
-                       -exec ${INSTALL_DATA} -p {} \
-                       ${GOROOT} \;
-
-.      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} \
-                               ${GOROOT}/{} \;
-               @cd ${WRKDIST} && \
-                       find ${dir} ! -name \*.orig -type f \
-                               -exec ${INSTALL_DATA} -p {} \
-                               ${GOROOT}/{} \;
-.      endfor
-
-       ${INSTALL_PROGRAM_DIR} ${GOROOT}/pkg/tool/${GOOS}_${GOARCH}
-       ${INSTALL_PROGRAM} -p ${WRKDIST}/pkg/tool/${GOOS}_${GOARCH}/* \
-               ${GOROOT}/pkg/tool/${GOOS}_${GOARCH}
+.for prog in go gofmt
+       ${INSTALL_PROGRAM} -p ${WRKDIST}/bin/${prog} ${GOROOT}/bin
+       @ln -s ../go/bin/${prog} ${PREFIX}/bin/${prog}
+.endfor
+
+       find ${WRKDIST} -maxdepth 1 -type f \
+               -exec ${INSTALL_DATA} -p {} ${GOROOT} \;
+
+.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} ${GOROOT}/{} \; \
+                   -o -type f ! -name \*.orig \
+                       -exec ${INSTALL_DATA} -p {} ${GOROOT}/{} \;
+.endfor
+
+       ${INSTALL_PROGRAM_DIR} ${GOROOT}/pkg/tool/${GOCFG}
+       ${INSTALL_PROGRAM} -p ${WRKDIST}/pkg/tool/${GOCFG}/* \
+               ${GOROOT}/pkg/tool/${GOCFG}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/go/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo    28 Nov 2017 16:27:21 -0000      1.28
+++ distinfo    4 Feb 2018 18:10:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (go1.9.2.src.tar.gz) = Zl8YS/isiZhs/VpEYHNpdvYLV99rMgrXGtTO9TuxQ9w=
-SIZE (go1.9.2.src.tar.gz) = 16383591
+SHA256 (go1.9.3.src.tar.gz) = Tj0K1ukeAu+nfVTobIueNPvhy8KTW204eE3KkzMcR64=
+SIZE (go1.9.3.src.tar.gz) = 16385451
Index: patches/patch-src_cmd_go_go_test_go
===================================================================
RCS file: patches/patch-src_cmd_go_go_test_go
diff -N patches/patch-src_cmd_go_go_test_go
--- patches/patch-src_cmd_go_go_test_go 28 Nov 2017 16:27:21 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_cmd_go_go_test_go,v 1.3 2017/11/28 16:27:21 jsing Exp $
-Index: src/cmd/go/go_test.go
---- src/cmd/go/go_test.go.orig
-+++ src/cmd/go/go_test.go
-@@ -3493,6 +3493,9 @@ func TestCgoConsistentResults(t *testing.T) {
-       switch runtime.GOOS {
-       case "freebsd":
-               testenv.SkipFlaky(t, 15405)
-+      case "openbsd":
-+              // TODO(jsing): Figure out why this is occurring and re-enable.
-+              t.Skip("skipping because test fails with clang under a ports 
build")
-       case "solaris":
-               testenv.SkipFlaky(t, 13247)
-       }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/go/pkg/PLIST,v
retrieving revision 1.24
diff -u -p -r1.24 PLIST
--- pkg/PLIST   28 Nov 2017 16:27:22 -0000      1.24
+++ pkg/PLIST   4 Feb 2018 18:10:55 -0000
@@ -5352,6 +5352,7 @@ go/src/runtime/testdata/testprogcgo/numg
 go/src/runtime/testdata/testprogcgo/pprof.go
 go/src/runtime/testdata/testprogcgo/raceprof.go
 go/src/runtime/testdata/testprogcgo/racesig.go
+go/src/runtime/testdata/testprogcgo/sigstack.go
 go/src/runtime/testdata/testprogcgo/threadpanic.go
 go/src/runtime/testdata/testprogcgo/threadpanic_unix.c
 go/src/runtime/testdata/testprogcgo/threadpanic_windows.c
@@ -7216,6 +7217,11 @@ go/test/fixedbugs/issue21120.go
 go/test/fixedbugs/issue21655.go
 go/test/fixedbugs/issue21963.go
 go/test/fixedbugs/issue22083.go
+go/test/fixedbugs/issue22429.go
+go/test/fixedbugs/issue22458.go
+go/test/fixedbugs/issue22683.go
+go/test/fixedbugs/issue22683.out
+go/test/fixedbugs/issue22781.go
 go/test/fixedbugs/issue2615.go
 go/test/fixedbugs/issue3552.dir/
 go/test/fixedbugs/issue3552.dir/one.go

Reply via email to