CVS commit: pkgsrc/lang/go112

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Mar 13 10:40:19 UTC 2019

Modified Files:
        pkgsrc/lang/go112: Makefile PLIST

Log Message:
go112: paper over issues with filenames containing umlauts.

- extract using gtar (hopefully more lenient than bsdtar)
- remove the files in question in post-extract

While here, re-add a PLIST.route conditional that was accidentally removed,
breaking the build on Linux (PR pkg/54054).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/go112/Makefile pkgsrc/lang/go112/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go112/Makefile
diff -u pkgsrc/lang/go112/Makefile:1.1 pkgsrc/lang/go112/Makefile:1.2
--- pkgsrc/lang/go112/Makefile:1.1      Sat Mar  9 09:29:30 2019
+++ pkgsrc/lang/go112/Makefile  Wed Mar 13 10:40:19 2019
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/03/09 09:29:30 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/13 10:40:19 bsiegert Exp $
 
 .include "../../lang/go/version.mk"
 
 DISTNAME=      go${GO112_VERSION}.src
 PKGNAME=       go112-${GO112_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://storage.googleapis.com/golang/
-EXTRACT_USING= bsdtar
+EXTRACT_USING= gtar
 
 MAINTAINER=    bsiegert%NetBSD.org@localhost
 HOMEPAGE=      http://golang.org/
@@ -100,6 +101,9 @@ PLIST.pty=  yes
 PLIST.route=   yes
 .endif
 
+post-extract:
+       ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
+
 do-build:
        cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash
 # for RELRO build:
Index: pkgsrc/lang/go112/PLIST
diff -u pkgsrc/lang/go112/PLIST:1.1 pkgsrc/lang/go112/PLIST:1.2
--- pkgsrc/lang/go112/PLIST:1.1 Sat Mar  9 09:29:30 2019
+++ pkgsrc/lang/go112/PLIST     Wed Mar 13 10:40:19 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/09 09:29:30 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/03/13 10:40:19 bsiegert Exp $
 bin/go${GOVERSSUFFIX}
 bin/gofmt${GOVERSSUFFIX}
 go112/AUTHORS
@@ -1510,7 +1510,7 @@ go112/pkg/${GO_PLATFORM}/internal/x/net/
 go112/pkg/${GO_PLATFORM}/internal/x/net/idna.a
 go112/pkg/${GO_PLATFORM}/internal/x/net/internal/nettest.a
 go112/pkg/${GO_PLATFORM}/internal/x/net/nettest.a
-go112/pkg/${GO_PLATFORM}/internal/x/net/route.a
+${PLIST.route}go112/pkg/${GO_PLATFORM}/internal/x/net/route.a
 go112/pkg/${GO_PLATFORM}/internal/x/text/secure.a
 go112/pkg/${GO_PLATFORM}/internal/x/text/secure/bidirule.a
 go112/pkg/${GO_PLATFORM}/internal/x/text/transform.a
@@ -8918,9 +8918,6 @@ go112/test/fixedbugs/issue27695b.go
 go112/test/fixedbugs/issue27695c.go
 go112/test/fixedbugs/issue27718.go
 go112/test/fixedbugs/issue27829.go
-go112/test/fixedbugs/issue27836.dir/Äfoo.go
-go112/test/fixedbugs/issue27836.dir/Ämain.go
-go112/test/fixedbugs/issue27836.go
 go112/test/fixedbugs/issue27938.go
 go112/test/fixedbugs/issue27961.go
 go112/test/fixedbugs/issue28055.go