Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Jul 2019 09:20:49 +0000 (UTC)
From:      Julien Laffaye <jlaffaye@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r506918 - head/lang/go14
Message-ID:  <201907190920.x6J9Knvk044495@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jlaffaye
Date: Fri Jul 19 09:20:49 2019
New Revision: 506918
URL: https://svnweb.freebsd.org/changeset/ports/506918

Log:
  lang/go14: fixes QA errors and remove unneeded files
  
  PR:		239154
  Submitted by:	Dmitri Goutnik <dg@syrec.org>

Modified:
  head/lang/go14/Makefile
  head/lang/go14/pkg-plist

Modified: head/lang/go14/Makefile
==============================================================================
--- head/lang/go14/Makefile	Fri Jul 19 09:02:17 2019	(r506917)
+++ head/lang/go14/Makefile	Fri Jul 19 09:20:49 2019	(r506918)
@@ -2,7 +2,7 @@
 
 PORTNAME=	go14
 PORTVERSION=	1.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	https://dl.google.com/go/
 DISTNAME=	go1.4-bootstrap-20171003
@@ -15,29 +15,13 @@ LICENSE=	BSD3CLAUSE
 ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 USES=		compiler shebangfix
-SHEBANG_LANG=	sh perl
-SHEBANG_FILES=	src/*.bash \
-		src/cmd/go/*.bash \
-		doc/progs/run \
-		doc/articles/wiki/*.bash \
-		test/bench/shootout/timing.sh \
-		misc/nacl/*_exec misc/benchcmp \
-		src/net/http/cgi/testdata/*.cgi \
-		src/regexp/syntax/*.pl \
-		lib/codereview/*.sh
 
-sh_OLD_CMD=	"/usr/bin/env bash"
-sh_CMD=		${SH}
+SHEBANG_GLOB=	*.bash *.pl *.cgi
 
 WRKSRC=		${WRKDIR}/go
 
 .include <bsd.port.pre.mk>
 
-# If cc is clang, change it to clang to help Go identify the compiler
-.if ${COMPILER_TYPE} == "clang" && ${CC} == "cc"
-CC=clang
-.endif
-
 .if ${ARCH} == i386
 GOARCH=386
 GOOBJ=8
@@ -56,15 +40,19 @@ PLIST_SUB+=	ARCH=${GOARCH} \
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
+	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
+	@${REINPLACE_CMD} -e 's|<<<.int main() {}.|< $$\(echo "int main() {}"\)|' ${WRKSRC}/src/run.bash
 
 do-build:
 	cd ${WRKSRC}/src && \
-		CC=${CC} \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		GO386=387 \
 		CGO_ENABLED=0 \
 		${SH} make.bash
+	${RM} ${WRKSRC}/.[a-z]* ${WRKSRC}/favicon.ico ${WRKSRC}/robots.txt
+	${RM} -r ${WRKSRC}/lib/codereview ${WRKSRC}/misc \
+		${WRKSRC}/pkg/obj ${WRKSRC}/pkg/${OPSYS:tl}_${GOARCH}/cmd
 
 do-install:
 	@${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}/go14

Modified: head/lang/go14/pkg-plist
==============================================================================
--- head/lang/go14/pkg-plist	Fri Jul 19 09:02:17 2019	(r506917)
+++ head/lang/go14/pkg-plist	Fri Jul 19 09:20:49 2019	(r506918)
@@ -1,5 +1,3 @@
-go14/.hgignore
-go14/.hgtags
 go14/AUTHORS
 go14/CONTRIBUTORS
 go14/LICENSE
@@ -168,7 +166,6 @@ go14/doc/root.html
 go14/doc/share.png
 go14/doc/sieve.gif
 go14/doc/tos.html
-go14/favicon.ico
 go14/include/README
 go14/include/ar.h
 go14/include/bio.h
@@ -188,224 +185,14 @@ go14/include/plan9/stdarg.h
 go14/include/plan9/utf.h
 go14/include/u.h
 go14/include/utf.h
-go14/lib/codereview/codereview.cfg
-go14/lib/codereview/codereview.py
-go14/lib/codereview/test.sh
 go14/lib/time/README
 go14/lib/time/update.bash
 go14/lib/time/zoneinfo.zip
-go14/misc/android/README
-go14/misc/android/go_android_exec.go
-go14/misc/arm/a
-go14/misc/benchcmp
-go14/misc/cgo/errors/err1.go
-go14/misc/cgo/errors/err2.go
-go14/misc/cgo/errors/err3.go
-go14/misc/cgo/errors/issue7757.go
-go14/misc/cgo/errors/issue8442.go
-go14/misc/cgo/errors/test.bash
-go14/misc/cgo/gmp/fib.go
-go14/misc/cgo/gmp/gmp.go
-go14/misc/cgo/gmp/pi.go
-go14/misc/cgo/life/c-life.c
-go14/misc/cgo/life/life.go
-go14/misc/cgo/life/life.h
-go14/misc/cgo/life/main.go
-go14/misc/cgo/life/main.out
-go14/misc/cgo/nocgo/nocgo.go
-go14/misc/cgo/nocgo/nocgo_test.go
-go14/misc/cgo/stdio/chain.go
-go14/misc/cgo/stdio/chain.out
-go14/misc/cgo/stdio/fib.go
-go14/misc/cgo/stdio/fib.out
-go14/misc/cgo/stdio/file.go
-go14/misc/cgo/stdio/hello.go
-go14/misc/cgo/stdio/hello.out
-go14/misc/cgo/stdio/run.out
-go14/misc/cgo/stdio/stdio.go
-go14/misc/cgo/test/align.go
-go14/misc/cgo/test/api.go
-go14/misc/cgo/test/backdoor/backdoor.go
-go14/misc/cgo/test/backdoor/runtime_gccgo.c
-go14/misc/cgo/test/backdoor/thunk.s
-go14/misc/cgo/test/basic.go
-go14/misc/cgo/test/buildid_linux.go
-go14/misc/cgo/test/callback.go
-go14/misc/cgo/test/callback_c.c
-go14/misc/cgo/test/callback_c_gc.c
-go14/misc/cgo/test/callback_c_gccgo.c
-go14/misc/cgo/test/cflags.go
-go14/misc/cgo/test/cgo_linux_test.go
-go14/misc/cgo/test/cgo_test.go
-go14/misc/cgo/test/cthread.go
-go14/misc/cgo/test/cthread_unix.c
-go14/misc/cgo/test/cthread_windows.c
-go14/misc/cgo/test/duplicate_symbol.go
-go14/misc/cgo/test/env.go
-go14/misc/cgo/test/exports.go
-go14/misc/cgo/test/fpvar.go
-go14/misc/cgo/test/helpers.go
-go14/misc/cgo/test/issue1222.go
-go14/misc/cgo/test/issue1328.go
-go14/misc/cgo/test/issue1560.go
-go14/misc/cgo/test/issue1635.go
-go14/misc/cgo/test/issue2462.go
-go14/misc/cgo/test/issue3250.go
-go14/misc/cgo/test/issue3250w.go
-go14/misc/cgo/test/issue3261.go
-go14/misc/cgo/test/issue3729.go
-go14/misc/cgo/test/issue3729w.go
-go14/misc/cgo/test/issue3741.go
-go14/misc/cgo/test/issue3775.go
-go14/misc/cgo/test/issue3945.go
-go14/misc/cgo/test/issue4029.go
-go14/misc/cgo/test/issue4029w.go
-go14/misc/cgo/test/issue4054a.go
-go14/misc/cgo/test/issue4054b.go
-go14/misc/cgo/test/issue4273.c
-go14/misc/cgo/test/issue4273b.c
-go14/misc/cgo/test/issue4339.c
-go14/misc/cgo/test/issue4339.go
-go14/misc/cgo/test/issue4339.h
-go14/misc/cgo/test/issue4417.go
-go14/misc/cgo/test/issue4857.go
-go14/misc/cgo/test/issue5227.go
-go14/misc/cgo/test/issue5242.go
-go14/misc/cgo/test/issue5337.go
-go14/misc/cgo/test/issue5337w.go
-go14/misc/cgo/test/issue5548.go
-go14/misc/cgo/test/issue5548_c.c
-go14/misc/cgo/test/issue5603.go
-go14/misc/cgo/test/issue5740.go
-go14/misc/cgo/test/issue5740a.c
-go14/misc/cgo/test/issue5740b.c
-go14/misc/cgo/test/issue5986.go
-go14/misc/cgo/test/issue6128.go
-go14/misc/cgo/test/issue6390.go
-go14/misc/cgo/test/issue6472.go
-go14/misc/cgo/test/issue6506.go
-go14/misc/cgo/test/issue6612.go
-go14/misc/cgo/test/issue6833.go
-go14/misc/cgo/test/issue6833_c.c
-go14/misc/cgo/test/issue6997_linux.c
-go14/misc/cgo/test/issue6997_linux.go
-go14/misc/cgo/test/issue7234_test.go
-go14/misc/cgo/test/issue7560.go
-go14/misc/cgo/test/issue7665.go
-go14/misc/cgo/test/issue7786.go
-go14/misc/cgo/test/issue7978.go
-go14/misc/cgo/test/issue8092.go
-go14/misc/cgo/test/issue8148.go
-go14/misc/cgo/test/issue8331.h
-go14/misc/cgo/test/issue8331a.go
-go14/misc/cgo/test/issue8331b.go
-go14/misc/cgo/test/issue8428.go
-go14/misc/cgo/test/issue8441.go
-go14/misc/cgo/test/issue8517.go
-go14/misc/cgo/test/issue8517_windows.c
-go14/misc/cgo/test/issue8517_windows.go
-go14/misc/cgo/test/issue8694.go
-go14/misc/cgo/test/issue8811.c
-go14/misc/cgo/test/issue8811.go
-go14/misc/cgo/test/issue8828.go
-go14/misc/cgo/test/issue8828/issue8828.c
-go14/misc/cgo/test/issue8828/trivial.go
-go14/misc/cgo/test/issue9026.go
-go14/misc/cgo/test/issue9026/issue9026.go
-go14/misc/cgo/test/setgid_linux.go
-go14/misc/cgo/test/sleep_windows_386.go
-go14/misc/cgo/testasan/main.go
-go14/misc/cgo/testcdefs/cdefstest.c
-go14/misc/cgo/testcdefs/cdefstest.go
-go14/misc/cgo/testcdefs/main.c
-go14/misc/cgo/testcdefs/main.go
-go14/misc/cgo/testcdefs/test.bash
-go14/misc/cgo/testgodefs/anonunion.go
-go14/misc/cgo/testgodefs/issue8478.go
-go14/misc/cgo/testgodefs/main.go
-go14/misc/cgo/testgodefs/test.bash
-go14/misc/cgo/testso/cgoso.c
-go14/misc/cgo/testso/cgoso.go
-go14/misc/cgo/testso/cgoso_c.c
-go14/misc/cgo/testso/cgoso_unix.go
-go14/misc/cgo/testso/main.go
-go14/misc/cgo/testso/test.bash
-go14/misc/cgo/testso/test.bat
-go14/misc/cgo/testtls/tls.go
-go14/misc/cgo/testtls/tls_test.go
-go14/misc/cgo/testtls/tls_unix.c
-go14/misc/chrome/gophertool/README.txt
-go14/misc/chrome/gophertool/background.html
-go14/misc/chrome/gophertool/background.js
-go14/misc/chrome/gophertool/gopher.js
-go14/misc/chrome/gophertool/gopher.png
-go14/misc/chrome/gophertool/manifest.json
-go14/misc/chrome/gophertool/popup.html
-go14/misc/chrome/gophertool/popup.js
-go14/misc/dashboard/codereview/app.yaml
-go14/misc/dashboard/codereview/cron.yaml
-go14/misc/dashboard/codereview/dashboard/cl.go
-go14/misc/dashboard/codereview/dashboard/front.go
-go14/misc/dashboard/codereview/dashboard/gc.go
-go14/misc/dashboard/codereview/dashboard/mail.go
-go14/misc/dashboard/codereview/dashboard/people.go
-go14/misc/dashboard/codereview/index.yaml
-go14/misc/dashboard/codereview/queue.yaml
-go14/misc/dashboard/codereview/static/gopherstamp.jpg
-go14/misc/dashboard/codereview/static/icon.png
-go14/misc/editors
-go14/misc/git/pre-commit
-go14/misc/linkcheck/linkcheck.go
-go14/misc/makerelease/darwin/Distribution
-go14/misc/makerelease/darwin/Resources/bg.png
-go14/misc/makerelease/darwin/etc/paths.d/go
-go14/misc/makerelease/darwin/scripts/postinstall
-go14/misc/makerelease/darwin/scripts/preinstall
-go14/misc/makerelease/makerelease.go
-go14/misc/makerelease/windows/LICENSE.rtf
-go14/misc/makerelease/windows/README.txt
-go14/misc/makerelease/windows/images/Banner.jpg
-go14/misc/makerelease/windows/images/Dialog.jpg
-go14/misc/makerelease/windows/images/DialogLeft.jpg
-go14/misc/makerelease/windows/images/gopher.ico
-go14/misc/makerelease/windows/installer.wxs
-go14/misc/nacl/README
-go14/misc/nacl/go_nacl_386_exec
-go14/misc/nacl/go_nacl_amd64p32_exec
-go14/misc/nacl/go_nacl_arm_exec
-go14/misc/nacl/mkzip.go
-go14/misc/nacl/testdata/bin/placeholder
-go14/misc/nacl/testdata/empty
-go14/misc/nacl/testdata/group
-go14/misc/nacl/testdata/hosts
-go14/misc/nacl/testdata/mime.types
-go14/misc/nacl/testzip.proto
-go14/misc/swig/callback/callback.cc
-go14/misc/swig/callback/callback.go
-go14/misc/swig/callback/callback.h
-go14/misc/swig/callback/callback.swigcxx
-go14/misc/swig/callback/callback_test.go
-go14/misc/swig/stdio/file.swig
-go14/misc/swig/stdio/file_test.go
 go14/pkg/freebsd_%%ARCH%%/archive/tar.a
 go14/pkg/freebsd_%%ARCH%%/archive/zip.a
 go14/pkg/freebsd_%%ARCH%%/bufio.a
 go14/pkg/freebsd_%%ARCH%%/bytes.a
 go14/pkg/freebsd_%%ARCH%%/cgocall.h
-go14/pkg/freebsd_%%ARCH%%/cmd/internal/goobj.a
-go14/pkg/freebsd_%%ARCH%%/cmd/internal/objfile.a
-go14/pkg/freebsd_%%ARCH%%/cmd/internal/rsc.io/arm/armasm.a
-go14/pkg/freebsd_%%ARCH%%/cmd/internal/rsc.io/x86/x86asm.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/commands.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/driver.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/fetch.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/plugin.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/profile.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/report.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/svg.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/symbolizer.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/symbolz.a
-go14/pkg/freebsd_%%ARCH%%/cmd/pprof/internal/tempfile.a
 go14/pkg/freebsd_%%ARCH%%/compress/bzip2.a
 go14/pkg/freebsd_%%ARCH%%/compress/flate.a
 go14/pkg/freebsd_%%ARCH%%/compress/gzip.a
@@ -538,11 +325,6 @@ go14/pkg/freebsd_%%ARCH%%/time.a
 go14/pkg/freebsd_%%ARCH%%/unicode.a
 go14/pkg/freebsd_%%ARCH%%/unicode/utf16.a
 go14/pkg/freebsd_%%ARCH%%/unicode/utf8.a
-go14/pkg/obj/freebsd_%%ARCH%%/lib9.a
-go14/pkg/obj/freebsd_%%ARCH%%/libbio.a
-go14/pkg/obj/freebsd_%%ARCH%%/libcc.a
-go14/pkg/obj/freebsd_%%ARCH%%/libgc.a
-go14/pkg/obj/freebsd_%%ARCH%%/liblink.a
 go14/pkg/tool/freebsd_%%ARCH%%/%%GOOBJ%%a
 go14/pkg/tool/freebsd_%%ARCH%%/%%GOOBJ%%c
 go14/pkg/tool/freebsd_%%ARCH%%/%%GOOBJ%%g
@@ -556,7 +338,6 @@ go14/pkg/tool/freebsd_%%ARCH%%/objdump
 go14/pkg/tool/freebsd_%%ARCH%%/pack
 go14/pkg/tool/freebsd_%%ARCH%%/pprof
 go14/pkg/tool/freebsd_%%ARCH%%/yacc
-go14/robots.txt
 go14/src/Make.dist
 go14/src/all.bash
 go14/src/all.bat



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907190920.x6J9Knvk044495>