Attachment 234379 Details for Bug 264336 – D35346-fixed.diff

[patch] D35346-fixed.diff

D35346.diff (text/plain), 25.23 KB, created by Dmitri Goutnik on 2022-06-01 20:23:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2022-06-01 20:23:20 UTC

Size: 25.23 KB

patch

obsolete

>diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
>index 39585e0c9946..69e7c4417626 100644
>--- a/Mk/Uses/go.mk
>+++ b/Mk/Uses/go.mk
>@@ -3,9 +3,10 @@
> #
> # Feature:	go
> # Usage:	USES=go
>-# Valid ARGS:	(none), modules, no_targets, run
>+# Valid ARGS:	(none), N.NN, devel, modules, no_targets, run
> #
>-# (none)	Setup GOPATH and build in GOPATH mode.
>+# (none)	Setup GOPATH and build in GOPATH mode using default Go version.
>+# N.NN | devel	Specify Go version
> # modules	If the upstream uses Go modules, this can be set to build
> #		in modules-aware mode.
> # no_targets	Indicates that Go is needed at build time as a part of
>@@ -52,25 +53,34 @@
> # GO_TESTFLAGS
> #	Additional build arguments to be passed to the `go test` command
> #
>-# GO_PORT
>-#	The Go port to use.  By default this is lang/go but can be set
>-#	to lang/go-devel in make.conf for testing with future Go versions.
>-#
>-#	This variable must not be set by individual ports!
>-#
> # MAINTAINER: ports@FreeBSD.org
> 
> .if !defined(_INCLUDE_USES_GO_MK)
> _INCLUDE_USES_GO_MK=	yes
> 
>-.  if !empty(go_ARGS:Nmodules:Nno_targets:Nrun)
>-IGNORE=	USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun}
>+# When adding a version, please keep the comment in
>+# Mk/bsd.default-versions.mk in sync.
>+GO_VALID_VERSIONS=	1.17 1.18 devel
>+
>+# Check arguments sanity
>+.  if !empty(go_ARGS:N[1-9].[0-9][0-9]:Ndevel:Nmodules:Nno_targets:Nrun)
>+IGNORE=	USES=go has invalid arguments: ${go_ARGS:N[1-9].[0-9][0-9]:Ndevel:Nmodules:Nno_targets:Nrun}
> .  endif
> 
>+# Parse Go version
>+GO_VERSION=	${go_ARGS:Nmodules:Nno_targets:Nrun:C/^$/${GO_DEFAULT}/}
>+.  if empty(GO_VALID_VERSIONS:M${GO_VERSION})
>+IGNORE?= USES=go has invalid version number
>+.  endif
>+.  if ${GO_VERSION} == devel
>+GO_SUFFIX=	-devel
>+.  else
>+GO_SUFFIX=	${GO_VERSION:S/.//}
>+.  endif
>+GO_PORT=	lang/go${GO_SUFFIX}
>+
> # Settable variables
> 
>-GO_PORT?=	lang/go
>-
> .  if empty(GO_PKGNAME)
> .    if !empty(GH_SUBDIR)
> GO_PKGNAME=	${GH_SUBDIR:S|^src/||}
>@@ -89,7 +99,7 @@ GO_BUILDFLAGS+=	-v -buildmode=exe -trimpath
> GO_BUILDFLAGS+=	-ldflags=-s
> .  endif
> GO_TESTFLAGS+=	-v
>-.  if ${GO_PORT} != lang/go117
>+.  if ${GO_VERSION} != 1.17
> GO_BUILDFLAGS+=	-buildvcs=false
> GO_TESTFLAGS+=	-buildvcs=false
> .  endif
>@@ -107,7 +117,7 @@ GO_GOSUMDB?=	sum.golang.org
> 
> # Read-only variables
> 
>-GO_CMD=		${LOCALBASE}/bin/go
>+GO_CMD=		${LOCALBASE}/bin/go${GO_SUFFIX}
> GO_WRKDIR_BIN=	${WRKDIR}/bin
> GO_ENV+=	CGO_ENABLED=${CGO_ENABLED} \
> 		CGO_CFLAGS="${CGO_CFLAGS}" \
>@@ -154,6 +164,7 @@ GO_ENV+=	GOPATH="${GO_GOPATH}" \
> .  endif
> 
> BUILD_DEPENDS+=	${GO_CMD}:${GO_PORT}
>+BINARY_ALIAS+=	go=go${GO_SUFFIX} gofmt=gofmt${GO_SUFFIX}
> .  if ${go_ARGS:Mrun}
> RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
> .  endif
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 5e4018a617dd..760520b84cb0 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -56,6 +56,8 @@ GCC_DEFAULT?=		10
> GL_DEFAULT?=		mesa-libs
> # Possible values: 7, 8, 9, agpl
> GHOSTSCRIPT_DEFAULT?=	agpl
>+# Possible values: 1.17, 1.18, devel
>+GO_DEFAULT?=		1.18
> # Possible values: 6, 6-nox11, 7, 7-nox11
> IMAGEMAGICK_DEFAULT?=	7
> # Possible values: 7, 8, 11, 17, 18
>diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
>index 1944a8c31e8c..2dc474a0acf9 100644
>--- a/biology/ncbi-entrez-direct/Makefile
>+++ b/biology/ncbi-entrez-direct/Makefile
>@@ -75,7 +75,7 @@ pre-configure:
> do-build:
> 	@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/cmd/vendor
> 	@${CP} -R ${WRKSRC}/eutils ${WRKSRC}/cmd/vendor
>-	@cd ${WRKSRC}/cmd && ${FILESDIR}/build-cmd
>+	@cd ${WRKSRC}/cmd && ${SETENV} ${MAKE_ENV} ${FILESDIR}/build-cmd
> 
> do-install:
> 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin
>diff --git a/devel/gocheese/Makefile b/devel/gocheese/Makefile
>index 1209e0ae46c7..c963a0daac23 100644
>--- a/devel/gocheese/Makefile
>+++ b/devel/gocheese/Makefile
>@@ -18,7 +18,7 @@ PLIST_FILES=	${DOCSDIR}/README \
> 		bin/pyshop2packages.sh
> 
> do-build:
>-	@cd ${WRKSRC} ; ${ENV} GOPATH=${WRKSRC} GO111MODULE=off go build -ldflags="-s -w" -o gocheese go.cypherpunks.ru/gocheese/v2
>+	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} GO111MODULE=off ${GO_CMD} build -ldflags="-s -w" -o gocheese go.cypherpunks.ru/gocheese/v2
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>diff --git a/devel/please/Makefile b/devel/please/Makefile
>index 9fdcf2b09b49..5de3a81bb996 100644
>--- a/devel/please/Makefile
>+++ b/devel/please/Makefile
>@@ -11,8 +11,7 @@ COMMENT=	High-performance extensible build system for reproducible builds
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go \
>-		bash:shells/bash \
>+BUILD_DEPENDS=	bash:shells/bash \
> 		ca_root_nss>0:security/ca_root_nss \
> 		git:devel/git \
> 		protoc:devel/protobuf
>diff --git a/lang/Makefile b/lang/Makefile
>index 5b6f13b15ffe..7563ad7a7cd6 100644
>--- a/lang/Makefile
>+++ b/lang/Makefile
>@@ -115,6 +115,7 @@
>     SUBDIR += go
>     SUBDIR += go-devel
>     SUBDIR += go117
>+    SUBDIR += go118
>     SUBDIR += gomacro
>     SUBDIR += gprolog
>     SUBDIR += gravity
>diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
>index f310c8e597cc..581889162096 100644
>--- a/lang/go-devel/Makefile
>+++ b/lang/go-devel/Makefile
>@@ -1,30 +1,128 @@
> # Created by: Devon H. O'Dell <devon.odell@gmail.com>
> 
>-PORTVERSION=	g20220319
>-# Always set PORTREVISION and PORTEPOCH explicitly as otherwise they are inherited from lang/go
>-PORTREVISION=	0
>-PORTEPOCH=	0
>-MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
>+PORTNAME?=	go-devel
>+DISTVERSION?=	g20220319
>+PORTREVISION?=	0
>+CATEGORIES=	lang
>+MASTER_SITES?=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
> 		LOCAL/dmgk:bootstrap
>-PKGNAMESUFFIX=	-devel
>-DISTFILES=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
>+DISTFILES?=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
> 
>-# Avoid conflicting patch files
>-PATCHFILES=
>+MAINTAINER=	ygy@FreeBSD.org
>+COMMENT?=	Go programming language (development version)
> 
>-COMMENT=	Go programming language (development version)
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+.ifdef QEMU_EMULATING
>+IGNORE=		fails to build with qemu-user-static
>+.endif
>+
>+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
>+
>+RUN_DEPENDS=	${RUN_DEPENDS_${ARCH}}
>+# ld.bfd from devel/binutils is needed for working cgo on aarch64
>+RUN_DEPENDS_aarch64=	binutils>0:devel/binutils
>+
>+TEST_DEPENDS=	${TEST_DEPENDS_${ARCH}}
>+# ld.bfd from devel/binutils is needed for working cgo on aarch64
>+TEST_DEPENDS_aarch64=	binutils>0:devel/binutils
>+
>+USES=		cpe shebangfix
>+
>+CPE_VENDOR=	golang
>+
>+.ifndef MASTERDIR
> USE_GITHUB=	yes
> GH_ACCOUNT=	golang
>+GH_PROJECT=	go
> GH_TAGNAME=	4aa1efed4853ea067d665a952eee77c52faac774
>+.endif
> 
>-CONFLICTS_INSTALL=	go
>+SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
>+		src/net/http/cgi/testdata/test.cgi
>+SHEBANG_GLOB=	*.bash *.pl *.sh
> 
>-MASTERDIR=	${.CURDIR}/../go
>-PATCHDIR=	${.CURDIR}/files
>-DISTINFO_FILE=	${.CURDIR}/distinfo
>+# Upstream archive contains files with UTF-8 names
>+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
>+
>+.ifndef GH_TAGNAME
>+.endif
>+
>+OPTIONS_DEFINE_i386=	SOFTFLOAT
>+SOFTFLOAT_DESC=	Use soft float on non-SSE2 processors (Pentium 4 and older)
>+SOFTFLOAT_VARS=	GO386=softfloat
>+
>+BOOTSTRAP_TAG=	go1.17.9
>+GO_SUFFIX=	${PORTNAME:S/go//}
>+
>+GOARCH_aarch64=	arm64
>+GOARCH_amd64=	amd64
>+GOARCH_armv6=	arm
>+GOARCH_armv7=	arm
>+GOARCH_i386=	386
>+GOARM_armv6=	6
>+GOARM_armv7=	7
> 
> post-extract:
> 	@[ -f ${WRKSRC}/VERSION ] || ${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION
> 
>-.include "${MASTERDIR}/Makefile"
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|type -ap |type |' ${WRKSRC}/src/make.bash
>+	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
>+
>+pre-build:
>+	# Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64
>+	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
>+		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
>+
>+do-build:
>+	cd ${WRKSRC}/src ; ${SETENV} \
>+		XDG_CACHE_HOME=${WRKDIR} \
>+		GOROOT_BOOTSTRAP=${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap \
>+		GOROOT=${WRKSRC} \
>+		GOROOT_FINAL=${PREFIX}/go${GO_SUFFIX} \
>+		GOBIN= \
>+		GOOS=${OPSYS:tl} \
>+		GOARCH=${GOARCH_${ARCH}} \
>+		GO386=${GO386} \
>+		GOARM=${GOARM_${ARCH}} \
>+		CC=${CC} \
>+		${SH} make.bash -v
>+
>+do-install:
>+	@cd ${WRKSRC} ; \
>+		${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \
>+		pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/go${GO_SUFFIX}
>+	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go${GO_SUFFIX}
>+.for f in go gofmt
>+	${LN} -sf ../go${GO_SUFFIX}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}${GO_SUFFIX}
>+	@${ECHO_CMD} bin/${f}${GO_SUFFIX} >> ${TMPPLIST}
>+.endfor
>+	@cd ${STAGEDIR}${PREFIX} && ${FIND} go${GO_SUFFIX} -type f >> ${TMPPLIST}
>+
>+do-test:
>+	cd ${WRKSRC}/src && ${SETENV} \
>+		GOROOT=${WRKSRC} \
>+		PATH=${WRKSRC}/bin:${PATH} \
>+		GOOS=${OPSYS:tl} \
>+		GOARCH=${GOARCH_${ARCH}} \
>+		GO386=${GO386} \
>+		GOARM=${GOARM_${ARCH}} \
>+		CC=${CC} \
>+		${SH} run.bash -no-rebuild
>+
>+.if !defined(_GO_MAKESUM_GUARD)
>+makesum:
>+	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
>+.for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
>+	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
>+	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
>+	${RM} ${DISTINFO_FILE}.${arch}
>+.endfor
>+	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
>+	${RM} ${DISTINFO_FILE}.tmp
>+.endif
>+
>+.include <bsd.port.mk>
>diff --git a/lang/go-devel/distinfo b/lang/go-devel/distinfo
>index 718f42854872..08b824abe9a8 100644
>--- a/lang/go-devel/distinfo
>+++ b/lang/go-devel/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1651499500
>+TIMESTAMP = 1653843435
> SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
> SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776
> SHA256 (golang-go-g20220319-4aa1efed4853ea067d665a952eee77c52faac774_GH0.tar.gz) = bd684cf4c64f62131754b0f44ad0ee57c0e2109eee41cd560b0d48346a859b60
>diff --git a/lang/go-devel/pkg-descr b/lang/go-devel/pkg-descr
>new file mode 100644
>index 000000000000..fbb088ea81a7
>--- /dev/null
>+++ b/lang/go-devel/pkg-descr
>@@ -0,0 +1,4 @@
>+Go is an open source programming environment that makes it easy to build
>+simple, reliable, and efficient software.
>+
>+WWW: https://golang.org
>diff --git a/lang/go/Makefile b/lang/go/Makefile
>index a507e20f9a2a..047bd2560c36 100644
>--- a/lang/go/Makefile
>+++ b/lang/go/Makefile
>@@ -1,125 +1,30 @@
>-# Created by: Devon H. O'Dell <devon.odell@gmail.com>
>-
> PORTNAME=	go
>-PORTVERSION?=	1.18.2
>-PORTREVISION?=	0
>-PORTEPOCH?=	1
>+DISTVERSION=	${GO_DEFAULT}
>+PORTEPOCH=	2
> CATEGORIES=	lang
>-MASTER_SITES?=	https://golang.org/dl/ \
>-		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
>-		LOCAL/dmgk:bootstrap
>-DISTFILES?=	go${PORTVERSION}.src.tar.gz \
>-		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
>+MASTER_SITES=	# not applicable
>+DISTFILES=	# not applicable
> 
>-MAINTAINER=	ygy@FreeBSD.org
>-COMMENT?=	Go programming language
>+MAINTAINER=	dmgk@FreeBSD.org
>+COMMENT=	Meta-port for the default version of the Go programming language
> 
>-LICENSE=	BSD3CLAUSE
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>+RUN_DEPENDS=	go${GO_SUFFIX}:lang/go${GO_SUFFIX}
> 
>-.ifdef QEMU_EMULATING
>-IGNORE=		fails to build with qemu-user-static
>-.endif
>-
>-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
>-
>-RUN_DEPENDS=	${RUN_DEPENDS_${ARCH}}
>-# ld.bfd from devel/binutils is needed for working cgo on aarch64
>-RUN_DEPENDS_aarch64=	binutils>0:devel/binutils
>-
>-TEST_DEPENDS=	${TEST_DEPENDS_${ARCH}}
>-TEST_DEPENDS_aarch64=	binutils>0:devel/binutils
>-
>-USES=		cpe shebangfix
>+NO_ARCH=	yes
>+NO_BUILD=	yes
> 
>-CPE_VENDOR=	golang
>+PLIST_FILES=	bin/go bin/gofmt
> 
>-SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
>-		src/net/http/cgi/testdata/test.cgi
>-SHEBANG_GLOB=	*.bash *.pl *.sh
>-
>-CONFLICTS_INSTALL?=	go-devel
>-
>-# Upstream archive contains files with UTF-8 names
>-EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
>-
>-.ifndef MASTERDIR
>-WRKSRC=		${WRKDIR}/go
>+.include <bsd.port.pre.mk>
>+.if ${GO_DEFAULT} == devel
>+GO_SUFFIX=	-devel
>+.else
>+GO_SUFFIX=	${GO_DEFAULT:S/.//}
> .endif
> 
>-OPTIONS_DEFINE_i386=	SOFTFLOAT
>-
>-SOFTFLOAT_DESC=	Use soft float on non-SSE2 processors (Pentium 4 and older)
>-
>-SOFTFLOAT_VARS=	GO386=softfloat
>-
>-BINARIES=	go gofmt
>-BOOTSTRAP_TAG=	go1.17.9
>-
>-GOARCH_aarch64=	arm64
>-GOARCH_amd64=	amd64
>-GOARCH_armv6=	arm
>-GOARCH_armv7=	arm
>-GOARCH_i386=	386
>-
>-GOARM_armv6=	6
>-GOARM_armv7=	7
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
>-
>-pre-build:
>-	# Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64
>-	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
>-		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
>-
>-do-build:
>-	cd ${WRKSRC}/src ; ${SETENV} \
>-		XDG_CACHE_HOME=${WRKDIR} \
>-		GOROOT_BOOTSTRAP=${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap \
>-		GOROOT=${WRKSRC} \
>-		GOROOT_FINAL=${PREFIX}/go \
>-		GOBIN= \
>-		GOOS=${OPSYS:tl} \
>-		GOARCH=${GOARCH_${ARCH}} \
>-		GO386=${GO386} \
>-		GOARM=${GOARM_${ARCH}} \
>-		CC=${CC} \
>-		${SH} make.bash -v
>-
> do-install:
>-	@cd ${WRKSRC} ; \
>-		${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \
>-		pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/go
>-	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go
>-.for file in ${BINARIES}
>-	@${LN} -sf ../go/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
>-	@${ECHO_CMD} bin/${file} >> ${TMPPLIST}
>+.for f in go gofmt
>+	@${LN} -sf ${f}${GO_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${f}
> .endfor
>-	@cd ${STAGEDIR}${PREFIX} && ${FIND} go -type f >> ${TMPPLIST}
> 
>-do-test:
>-	cd ${WRKSRC}/src && ${SETENV} \
>-		GOROOT=${WRKSRC} \
>-		PATH=${WRKSRC}/bin:${PATH} \
>-		GOOS=${OPSYS:tl} \
>-		GOARCH=${GOARCH_${ARCH}} \
>-		GO386=${GO386} \
>-		GOARM=${GOARM_${ARCH}} \
>-		CC=${CC} \
>-		${SH} run.bash -no-rebuild
>-
>-.if !defined(_GO_MAKESUM_GUARD)
>-makesum:
>-	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
>-.for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
>-	${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
>-	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
>-	${RM} ${DISTINFO_FILE}.${arch}
>-.endfor
>-	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
>-	${RM} ${DISTINFO_FILE}.tmp
>-.endif
>-
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git a/lang/go/pkg-descr b/lang/go/pkg-descr
>index fbb088ea81a7..6105788b9ed8 100644
>--- a/lang/go/pkg-descr
>+++ b/lang/go/pkg-descr
>@@ -1,4 +1,9 @@
> Go is an open source programming environment that makes it easy to build
> simple, reliable, and efficient software.
> 
>+This is a meta port for the default version of Go, it provides symbolic links
>+called go and gofmt.
>+
>+Do not depend on this port.
>+
> WWW: https://golang.org
>diff --git a/lang/go117/Makefile b/lang/go117/Makefile
>index 33548aad50d9..c0c3ddbc3e7a 100644
>--- a/lang/go117/Makefile
>+++ b/lang/go117/Makefile
>@@ -1,28 +1,23 @@
>-PORTVERSION=	1.17.10
>-# Always set PORTREVISION and PORTEPOCH explicitly as otherwise they are inherited from lang/go
>+# Created by: Devon H. O'Dell <devon.odell@gmail.com>
>+
>+PORTNAME=	go117
>+DISTVERSION=	1.17.10
>+# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
> PORTREVISION=	0
>-PORTEPOCH=	0
>-MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
>+MASTER_SITES=	https://golang.org/dl/ \
>+		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
> 		LOCAL/dmgk:bootstrap
>-PKGNAMESUFFIX=	117
>-DISTFILES=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
>+DISTFILES=	go${DISTVERSION}.src.tar.gz \
>+		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
> 
> # Avoid conflicting patch files
> PATCHFILES=
> 
>-COMMENT=	Go programming language (development version)
>+COMMENT=	Go programming language
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	golang
>-GH_TAGNAME=	7dd10d4ce20e64d96a10cb67794851a58d96a2aa
>-
>-CONFLICTS_INSTALL=	go
>-
>-MASTERDIR=	${.CURDIR}/../go
>+MASTERDIR=	${.CURDIR}/../go-devel
> PATCHDIR=	${.CURDIR}/files
>+WRKSRC=		${WRKDIR}/go
> DISTINFO_FILE=	${.CURDIR}/distinfo
> 
>-post-extract:
>-	@[ -f ${WRKSRC}/VERSION ] || ${ECHO_CMD} "${PORTVERSION} +${GH_TAGNAME}" > ${WRKSRC}/VERSION
>-
> .include "${MASTERDIR}/Makefile"
>diff --git a/lang/go117/distinfo b/lang/go117/distinfo
>index 4a70920d679d..87296aeb8c0d 100644
>--- a/lang/go117/distinfo
>+++ b/lang/go117/distinfo
>@@ -1,8 +1,8 @@
>-TIMESTAMP = 1652618409
>+TIMESTAMP = 1653843983
>+SHA256 (go1.17.10.src.tar.gz) = 299e55af30f15691b015d8dcf8ecae72412412569e5b2ece20361753a456f2f9
>+SIZE (go1.17.10.src.tar.gz) = 22196380
> SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
> SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776
>-SHA256 (golang-go-1.17.10-7dd10d4ce20e64d96a10cb67794851a58d96a2aa_GH0.tar.gz) = 903cb4363af9a1c9a6c9d08ea0525983634862a5cb1f893b0b6156e3b99f847c
>-SIZE (golang-go-1.17.10-7dd10d4ce20e64d96a10cb67794851a58d96a2aa_GH0.tar.gz) = 22176903
> SHA256 (go-freebsd-amd64-go1.17.9.tar.xz) = fd439ad091ed57d0ad728c05fc60465aad2e46e98da96e2d5b60b0c470f2efec
> SIZE (go-freebsd-amd64-go1.17.9.tar.xz) = 41951936
> SHA256 (go-freebsd-arm6-go1.17.9.tar.xz) = ba24590b8cec761207eafc5a39c71b5b5041320c6fb0c95d35c123f6054f8d1c
>diff --git a/lang/go118/Makefile b/lang/go118/Makefile
>new file mode 100644
>index 000000000000..3ab3625ca476
>--- /dev/null
>+++ b/lang/go118/Makefile
>@@ -0,0 +1,23 @@
>+# Created by: Devon H. O'Dell <devon.odell@gmail.com>
>+
>+PORTNAME=	go118
>+DISTVERSION=	1.18.2
>+# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
>+PORTREVISION=	0
>+MASTER_SITES=	https://golang.org/dl/ \
>+		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
>+		LOCAL/dmgk:bootstrap
>+DISTFILES=	go${DISTVERSION}.src.tar.gz \
>+		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
>+
>+# Avoid conflicting patch files
>+PATCHFILES=
>+
>+COMMENT=	Go programming language
>+
>+MASTERDIR=	${.CURDIR}/../go-devel
>+PATCHDIR=	${.CURDIR}/files
>+WRKSRC=		${WRKDIR}/go
>+DISTINFO_FILE=	${.CURDIR}/distinfo
>+
>+.include "${MASTERDIR}/Makefile"
>diff --git a/lang/go/distinfo b/lang/go118/distinfo
>similarity index 97%
>rename from lang/go/distinfo
>rename to lang/go118/distinfo
>index ae1efb41ca12..d6c48fb08a52 100644
>--- a/lang/go/distinfo
>+++ b/lang/go118/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1652618333
>+TIMESTAMP = 1653843300
> SHA256 (go1.18.2.src.tar.gz) = 2c44d03ea2c34092137ab919ba602f2c261a038d08eb468528a3f3a28e5667e2
> SIZE (go1.18.2.src.tar.gz) = 22837686
> SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
>diff --git a/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go118/files/patch-src_cmd_go_internal_modload_vendor.go
>similarity index 100%
>rename from lang/go/files/patch-src_cmd_go_internal_modload_vendor.go
>rename to lang/go118/files/patch-src_cmd_go_internal_modload_vendor.go
>diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile
>index fb0ff7e70bb0..350b66896baf 100644
>--- a/net-im/gotosocial/Makefile
>+++ b/net-im/gotosocial/Makefile
>@@ -38,7 +38,7 @@ post-patch:
> .endif
> 
> do-build:
>-	@(cd ${WRKSRC} && ${SETENV} \
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
> 		VERSION=${DISTVERSION} COMMIT=${GH_TAGNAME} scripts/build.sh )
> 
> do-install:
>diff --git a/net-mgmt/chronograf/Makefile b/net-mgmt/chronograf/Makefile
>index b01aac080346..cf0fd227df1b 100644
>--- a/net-mgmt/chronograf/Makefile
>+++ b/net-mgmt/chronograf/Makefile
>@@ -91,6 +91,6 @@ pre-build:
> 		npm_config_tarball=${DISTDIR}/${DIST_SUBDIR}/node-v${NODEJS_VERSION}-headers.tar.gz \
> 		yarn --frozen-lockfile --offline --no-progress --no-emoji
> 	cd ${WRKSRC}/ui && ${SETENV} ${YARN_ENV} yarn run build
>-	cd ${WRKSRC} && ${GMAKE} .bindata
>+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} .bindata
> 
> .include <bsd.port.post.mk>
>diff --git a/net/ooni-probe-cli/Makefile b/net/ooni-probe-cli/Makefile
>index fc7f6c8039da..5ac4f77c802d 100644
>--- a/net/ooni-probe-cli/Makefile
>+++ b/net/ooni-probe-cli/Makefile
>@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
> 
>-USES=		go:modules
>+USES=		go:1.17,modules
> USE_GITHUB=	yes
> USE_GITLAB=	nodefault
> 
>diff --git a/sysutils/chezmoi/Makefile b/sysutils/chezmoi/Makefile
>index b103c288ab6a..8035720b36a5 100644
>--- a/sysutils/chezmoi/Makefile
>+++ b/sysutils/chezmoi/Makefile
>@@ -147,7 +147,7 @@ SOURCE_DATE_EPOCH_CMD=	date -ur $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e '
> 
> do-build-DOCS-on:
> 	@${CP} ${_DISTDIR}/mermaid@8.8.0/dist/mermaid.min.js ${WRKSRC}/assets/chezmoi.io
>-	(cd ${WRKSRC}/assets/chezmoi.io && mkdocs build)
>+	(cd ${WRKSRC}/assets/chezmoi.io && ${SETENV} ${MAKE_ENV} mkdocs build)
> 
> post-extract:
> 	@${MKDIR} ${WRKSRC}/vendor/github.com/chris-ramon
>diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile
>index c020d3595414..56c32fb5cb93 100644
>--- a/sysutils/datadog-agent/Makefile
>+++ b/sysutils/datadog-agent/Makefile
>@@ -359,20 +359,20 @@ pre-build:
> 		${MAKE_CMD} -C .)
> 
> # Generate go source from templates
>-	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
>-	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
> 
> post-build:
> # Generate config files
>-	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
> 		${WRKSRC}/pkg/config/config_template.yaml \
> 		${WRKSRC}/cmd/agent/dist/datadog.yaml
> 
>-	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
> 		${WRKSRC}/pkg/config/config_template.yaml \
> 		${WRKSRC}/cmd/agent/dist/system-probe.yaml
> 
>-	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
> 		${WRKSRC}/pkg/config/config_template.yaml \
> 		${WRKSRC}/cmd/agent/dist/dogstatsd.yaml
> 
>diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile
>index 6d5b4af462cf..eca70b4028f2 100644
>--- a/sysutils/ipfs-go/Makefile
>+++ b/sysutils/ipfs-go/Makefile
>@@ -15,12 +15,11 @@ LICENSE_COMB=	dual
> LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
> LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
> 
>-USES=		cpe go:modules
>+USES=		cpe go:1.17,modules
> 
> CPE_VENDOR=	protocol
> 
> GO_TARGET=	./cmd/ipfs:ipfs-go
>-GO_PORT=	lang/go117 # quic-go does not build on Go 1.18 yet
> 
> NO_WRKSUBDIR=	yes
> 
>diff --git a/sysutils/ipget/Makefile b/sysutils/ipget/Makefile
>index d1c9b40e846f..df9feb68ada2 100644
>--- a/sysutils/ipget/Makefile
>+++ b/sysutils/ipget/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Retrieve files over IPFS and save them locally
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		go:modules
>+USES=		go:1.17,modules
> USE_GITHUB=	yes
> GH_ACCOUNT=	ipfs
> 
>diff --git a/sysutils/minikube/Makefile b/sysutils/minikube/Makefile
>index aabaf4516f61..0a6ff706bff2 100644
>--- a/sysutils/minikube/Makefile
>+++ b/sysutils/minikube/Makefile
>@@ -243,6 +243,6 @@ pre-build:
> 		-o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... && \
> 		${LOCALBASE}/bin/go-bindata -nomemcopy \
> 		-o pkg/minikube/translate/translations.go -pkg translate translations/... && \
>-		${LOCALBASE}/bin/gofmt -s -w pkg/minikube/translate/translations.go
>+		${LOCALBASE}/bin/gofmt${GO_SUFFIX} -s -w pkg/minikube/translate/translations.go
> 
> .include <bsd.port.mk>
>diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile
>index 5f1cee823f3c..880667cbb59d 100644
>--- a/www/adguardhome/Makefile
>+++ b/www/adguardhome/Makefile
>@@ -10,10 +10,9 @@ COMMENT=	Network-wide ads & trackers blocking DNS server
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-USES=		cpe go:modules
>+USES=		cpe go:1.17,modules
> 
> GO_MODULE=	github.com/AdguardTeam/AdGuardHome
>-GO_PORT=	lang/go117 # quic-go does not build on Go 1.18 yet
> 
> # to rebuild the deps archives:
> #   1. set DEV_UPDATE_MODE=yes
>diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
>index c5fec86a3c57..691e7db68d37 100644
>--- a/www/grafana8/Makefile
>+++ b/www/grafana8/Makefile
>@@ -80,7 +80,7 @@ pre-build:
> 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build \
> 		-o wire ./vendor/github.com/google/wire/cmd/wire/main.go; \
> 	${ECHO_MSG} "===>  Generating wire_gen.go"; \
>-	${SETENV} XDG_CACHE_HOME=${WRKDIR}/.cache ${GO_ENV} ./wire gen -tags "oss" ./pkg/server ./pkg/cmd/grafana-cli/runner )
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} ./wire gen -tags "oss" ./pkg/server ./pkg/cmd/grafana-cli/runner )
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}

Actions: View | Diff

Attachments on bug 264336: 234317 | 234379