Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Jun 2019 11:38:45 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r504941 - in head/lang: . go go-devel
Message-ID:  <201906231138.x5NBcjuC014906@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sun Jun 23 11:38:44 2019
New Revision: 504941
URL: https://svnweb.freebsd.org/changeset/ports/504941

Log:
  New port: lang/go-devel
  
  A development snapshot of lang/go.  This port is intended to be
  used by port maintainers for testing with future Go versions.
  
  PR:		238374
  Submitted by:	dg@syrec.org

Added:
  head/lang/go-devel/
     - copied from r504939, head/lang/go/
Deleted:
  head/lang/go-devel/pkg-plist
Modified:
  head/lang/Makefile
  head/lang/go-devel/Makefile
  head/lang/go-devel/distinfo
  head/lang/go-devel/pkg-descr
  head/lang/go/Makefile
  head/lang/go/pkg-descr

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Sun Jun 23 11:28:10 2019	(r504940)
+++ head/lang/Makefile	Sun Jun 23 11:38:44 2019	(r504941)
@@ -128,6 +128,7 @@
     SUBDIR += gnu-cobol
     SUBDIR += gnustep-base
     SUBDIR += go
+    SUBDIR += go-devel
     SUBDIR += go14
     SUBDIR += gomacro
     SUBDIR += gprolog

Modified: head/lang/go-devel/Makefile
==============================================================================
--- head/lang/go/Makefile	Sun Jun 23 10:26:43 2019	(r504939)
+++ head/lang/go-devel/Makefile	Sun Jun 23 11:38:44 2019	(r504941)
@@ -2,38 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	go
-PORTVERSION=	1.12.6
-PORTEPOCH=	1
+PORTVERSION=	g20190604
 CATEGORIES=	lang
-MASTER_SITES=	https://golang.org/dl/
-DISTNAME=	go${PORTVERSION}.src
+PKGNAMESUFFIX=	-devel
 
-PATCH_SITES=	https://github.com/golang/go/commit/
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221297#c23
-PATCHFILES=	3b6216ed0601c81fe42c2a4738d419afccb62163.patch:-p1 \
-		0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch:-p1 \
-		a6e892d26d6ee59799f55bc50521605ebf75ea67.patch:-p1
+MAINTAINER=	dg@syrec.org
+COMMENT=	Go programming language (development version)
 
-MAINTAINER=	jlaffaye@FreeBSD.org
-COMMENT=	Go programming language
-
 LICENSE=	BSD3CLAUSE
 
+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
+
 BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USES=		shebangfix
-SHEBANG_LANG=	sh perl
+USE_GITHUB=	yes
+GH_ACCOUNT=	golang
+GH_TAGNAME=	ac8dbe7747
+
 SHEBANG_FILES=	misc/benchcmp \
 		misc/nacl/go_nacl_*_exec \
 		misc/wasm/go_js_wasm_exec \
 		src/net/http/cgi/testdata/test.cgi
 SHEBANG_GLOB=	*.bash *.pl *.sh
-
+SHEBANG_LANG=	sh
 sh_OLD_CMD=	/bin/bash "/usr/bin/env bash"
 sh_CMD=		${SH}
 
-WRKSRC=		${WRKDIR}/go
-ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
+CONFLICTS_INSTALL=	go
 
 OPTIONS_DEFINE_i386=	GO387
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
@@ -46,53 +42,49 @@ GOARCH=386
 GOARCH=amd64
 .elif ${ARCH} == armv6 || ${ARCH} == armv7
 GOARCH=arm
-GOARM=${ARCH:C/armv//}
 .else
 IGNORE=		unknown arch ${ARCH}
 .endif
 
-.ifdef QEMU_EMULATING
-IGNORE=		fails to build with qemu-user-static
-.endif
-
 .if ${PORT_OPTIONS:MGO387}
 GO386=387
 .endif
 
-PLIST_SUB+=	opsys_ARCH=${OPSYS:tl}_${GOARCH}
+BINARIES=	go gofmt
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
 	@${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash
+	@${ECHO_CMD} "devel-${GH_TAGNAME}" > ${WRKSRC}/VERSION
 
 do-build:
 	cd ${WRKSRC}/src && \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
 		GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
-		GO386=${GO386} GOARM=${GOARM} CGO_ENABLED=1 \
+		GO386=${GO386} \
 		${SH} make.bash -v
 	${RM} -r ${WRKSRC}/pkg/obj \
 	    ${WRKSRC}/pkg/bootstrap \
 	    ${WRKSRC}/pkg/${OPSYS:tl}_${GOARCH}/cmd
 
 do-install:
-	@${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}
-.for f in go gofmt
+	@${MKDIR} ${STAGEDIR}${PREFIX}/go
+	@${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go
+.for f in ${BINARIES}
 	@${LN} -sf ../go/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
-do-test:
-	cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash -no-rebuild -banner ""
-
-pkg-plist: stage
-	${RM} ${WRKDIR}/pkg-plist
-.for command in go gofmt
-	${ECHO_CMD} bin/${command} >> ${WRKDIR}/pkg-plist
+post-install:
+.for f in ${BINARIES}
+	@${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
-	cd ${WRKDIR} && ${FIND} go -type f | \
-		${SED} -e "s/\/${OPSYS:tl}_${GOARCH}\//\/%%opsys_ARCH%%\//g" | \
-		${SORT} >> ${WRKDIR}/pkg-plist
-	${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist
+	@cd ${STAGEDIR}${PREFIX} && \
+		${FIND} go -type f >> ${TMPPLIST}
+
+do-test:
+	cd ${WRKSRC}/src && \
+		GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} \
+		${SH} run.bash -no-rebuild -banner ""
 
 .include <bsd.port.post.mk>

Modified: head/lang/go-devel/distinfo
==============================================================================
--- head/lang/go/distinfo	Sun Jun 23 10:26:43 2019	(r504939)
+++ head/lang/go-devel/distinfo	Sun Jun 23 11:38:44 2019	(r504941)
@@ -1,9 +1,3 @@
-TIMESTAMP = 1560329584
-SHA256 (go1.12.6.src.tar.gz) = c96c5ccc7455638ae1a8b7498a030fe653731c8391c5f8e79590bce72f92b4ca
-SIZE (go1.12.6.src.tar.gz) = 21975398
-SHA256 (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 87ccfc01b285ba5c4913f91e8b475b0a0ae713cc569746461c14bf37300dae5b
-SIZE (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 2293
-SHA256 (0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch) = e4459691f5536497945534a7b9575f3c47a619bf569c32dda2dd92fe23c67792
-SIZE (0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch) = 939
-SHA256 (a6e892d26d6ee59799f55bc50521605ebf75ea67.patch) = 5588690dffa1915c30fb8f35b0e76e3d1454f1658748b0b9e6f5e17dd0b8b5fd
-SIZE (a6e892d26d6ee59799f55bc50521605ebf75ea67.patch) = 1117
+TIMESTAMP = 1559846326
+SHA256 (golang-go-g20190604-ac8dbe7747_GH0.tar.gz) = 09815f8dd4663bfebadbad943ba61a4b3d4a2bc069ded646b70224d7d16a752a
+SIZE (golang-go-g20190604-ac8dbe7747_GH0.tar.gz) = 21497169

Modified: head/lang/go-devel/pkg-descr
==============================================================================
--- head/lang/go/pkg-descr	Sun Jun 23 10:26:43 2019	(r504939)
+++ head/lang/go-devel/pkg-descr	Sun Jun 23 11:38:44 2019	(r504941)
@@ -1,4 +1,6 @@
 Go is an open source programming environment that makes it easy to build
 simple, reliable, and efficient software.
 
-WWW: http://golang.org
+This ports tracks Go development (master) branch.
+
+WWW: https://golang.org

Modified: head/lang/go/Makefile
==============================================================================
--- head/lang/go/Makefile	Sun Jun 23 11:28:10 2019	(r504940)
+++ head/lang/go/Makefile	Sun Jun 23 11:38:44 2019	(r504941)
@@ -35,6 +35,8 @@ sh_CMD=		${SH}
 WRKSRC=		${WRKDIR}/go
 ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
 
+CONFLICTS_INSTALL=	go-devel
+
 OPTIONS_DEFINE_i386=	GO387
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
 

Modified: head/lang/go/pkg-descr
==============================================================================
--- head/lang/go/pkg-descr	Sun Jun 23 11:28:10 2019	(r504940)
+++ head/lang/go/pkg-descr	Sun Jun 23 11:38:44 2019	(r504941)
@@ -1,4 +1,4 @@
 Go is an open source programming environment that makes it easy to build
 simple, reliable, and efficient software.
 
-WWW: http://golang.org
+WWW: https://golang.org



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