Re: CVS commit: pkgsrc/lang

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Hello Ryo, Benny and pkgsrc-changes@!

Ryo ONODERA writes:
> [...]
> Thanks for your update, however I have gotten the following errors.
> My environment is NetBSD/amd64 8.99.25 of yesterday.
> Could you take a look at this?
> [...]

Possible patch that does that (but, Benny, I will wait for your
feedback if it looks good!):

 <https://www.NetBSD.org/~leot/pkgsrc-patches/go-1.11.1-plist-fixes.patch>

...and, despite few lines, and not completely related to this problem
but hopefully will save some time for the next print-PLIST in
lang/go*!:

 <https://www.NetBSD.org/~leot/pkgsrc-patches/go-print-plist-improvements.patch>

(I will attach both patches in this email too for completeness.)


Possible further changes regarding the latter (but better to postpone
in separate commits and surely minor)...
At least for lang/go{110,111}, it misses possible PLIST_PRINT_AWK regarding
PLIST.pty and PLIST.route.  If this can be handy I think it would be
better to add the PRINT_PLIST_AWK directly in lang/go{110,111}/Makefile.
For lang/go111 probably a PLIST_PRINT_AWK can be added as well in order
to automatically substitute `${GOVERSSUFFIX}' in bin/go{,fmt}.


Thanks!

go111: Add missing entries to PLIST

Reported on pkgsrc-changes@ by <ryoon>.

Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/go111/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- PLIST       2 Oct 2018 18:19:56 -0000       1.5
+++ PLIST       3 Oct 2018 12:58:50 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/02 18:19:56 bsiegert Exp $
+@comment $NetBSD$
 bin/go${GOVERSSUFFIX}
 bin/gofmt${GOVERSSUFFIX}
 go111/AUTHORS
@@ -2400,6 +2400,7 @@ go111/src/cmd/go/testdata/script/README
 go111/src/cmd/go/testdata/script/binary_only.txt
 go111/src/cmd/go/testdata/script/build_GOTMPDIR.txt
 go111/src/cmd/go/testdata/script/build_cache_compile.txt
+go111/src/cmd/go/testdata/script/build_cache_gomips.txt
 go111/src/cmd/go/testdata/script/build_cache_link.txt
 go111/src/cmd/go/testdata/script/build_cache_output.txt
 go111/src/cmd/go/testdata/script/cover_atomic_pkgall.txt
@@ -8461,6 +8462,11 @@ go111/test/fixedbugs/issue26416.go
 go111/test/fixedbugs/issue26426.go
 go111/test/fixedbugs/issue26438.go
 go111/test/fixedbugs/issue26495.go
+go111/test/fixedbugs/issue27143.go
+go111/test/fixedbugs/issue27278.go
+go111/test/fixedbugs/issue27289.go
+go111/test/fixedbugs/issue27695.go
+go111/test/fixedbugs/issue27695b.go
 go111/test/fixedbugs/issue3552.dir/one.go
 go111/test/fixedbugs/issue3552.dir/two.go
 go111/test/fixedbugs/issue3552.go
@@ -9080,4 +9086,3 @@ go111/test/varerr.go
 go111/test/varinit.go
 go111/test/writebarrier.go
 go111/test/zerodivide.go
-@pkgdir bin

go: Improve PRINT_PLIST_AWK patterns and avoid possible double definition

- Move GO_PLATFORM definition in lang/go/version.mk in order that also lang/go*
  packages can (re)use it
- Change PRINT_PLIST_AWK pattern that replace all ${GO_PLATFORM} and apply it
  only when ${GO_PLATFORM} is a directory (between two "/").  There are only
  3 exceptions to that in lang/go14.
  Move it to version.mk so lang/go* PLIST can be mostly automatically
  generated.

These changes should help to avoid (most) manual editing of
lang/go*/PLIST.

Index: go-package.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/go/go-package.mk,v
retrieving revision 1.18
diff -u -p -r1.18 go-package.mk
--- go-package.mk       22 Sep 2018 19:44:21 -0000      1.18
+++ go-package.mk       3 Oct 2018 13:01:12 -0000
@@ -62,12 +62,8 @@ USE_TOOLS+=          pax
 
 BUILD_DEPENDS+=                ${GO_PACKAGE_DEP}
 
-GO_PLATFORM=           ${LOWER_OPSYS}_${GOARCH}
 GOTOOLDIR=             ${PREFIX}/go/pkg/tool/${GO_PLATFORM}
 
-PRINT_PLIST_AWK+=      /${GO_PLATFORM}/ { gsub(/${GO_PLATFORM}/, \
-                       "$${GO_PLATFORM}"); \
-                       print; next; }
 PRINT_PLIST_AWK+=      /^@pkgdir bin$$/ { next; }
 PRINT_PLIST_AWK+=      /^@pkgdir gopkg$$/ { next; }
 
Index: version.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/go/version.mk,v
retrieving revision 1.46
diff -u -p -r1.46 version.mk
--- version.mk  2 Oct 2018 18:19:56 -0000       1.46
+++ version.mk  3 Oct 2018 13:01:12 -0000
@@ -44,5 +44,8 @@ GOOPT=                GOARM=6
 .elif ${MACHINE_ARCH} == "earmv7hf"
 GOOPT=         GOARM=7
 .endif
-PLIST_SUBST+=  GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
+GO_PLATFORM=   ${LOWER_OPSYS}_${GOARCH}
+PLIST_SUBST+=  GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q}
 PLIST_SUBST+=  GOCHAR=${GOCHAR:Q}
+
+PRINT_PLIST_AWK+=      { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") }