Update to 1.5

svn path=/head/; revision=394911

lang/go/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	go
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://golang.org/dl/
@@ -13,10 +13,11 @@ COMMENT=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 
+BUILD_DEPENDS=	go14>=1.4:${PORTSDIR}/lang/go14
+
 USES=		shebangfix
 SHEBANG_LANG=	sh
 SHEBANG_FILES=	${WRKSRC}/src/*.bash \
-		${WRKSRC}/doc/progs/run \
 		${WRKSRC}/doc/articles/wiki/*.bash \
 		${WRKSRC}/test/bench/shootout/timing.sh
 
@@ -24,24 +25,21 @@ sh_OLD_CMD=	${SETENV} bash
 sh_CMD=		${SH}
 
 WRKSRC=		${WRKDIR}/go
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64 armv6
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 GOARCH=386
-GOOBJ=8
-PLIST_SUB+=	I386_ONLY=""
-PLIST_SUB+=	AMD64_ONLY="@comment "
-.else
+.elif ${ARCH} == "amd64"
 GOARCH=amd64
-GOOBJ=6
-PLIST_SUB+=	I386_ONLY="@comment "
-PLIST_SUB+=	AMD64_ONLY=""
+.elif ${ARCH} == "armv6"
+GOARCH=arm
+.else
+.error "unknown arch ${ARCH}"
 .endif
 
-PLIST_SUB+=	ARCH=${GOARCH} \
-		GOOBJ=${GOOBJ}
+PLIST_SUB+=	ARCH=${GOARCH}
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
@@ -50,6 +48,7 @@ do-build:
 	cd ${WRKSRC}/src && \
 		CC=${CC} \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
+		GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		${SH} make.bash
 

lang/go/distinfo

@@ -1,2 +1,2 @@
-SHA256 (go1.4.2.src.tar.gz) = 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
-SIZE (go1.4.2.src.tar.gz) = 10921896
+SHA256 (go1.5.src.tar.gz) = be81abec996d5126c05f2d36facc8e58a94d9183a56f026fc9441401d80062db
+SIZE (go1.5.src.tar.gz) = 12045689

lang/go/files/patch-doc__progs__run

@@ -1,11 +0,0 @@
---- ./doc/progs/run.orig	2013-06-09 23:20:14.695515753 +1000
-+++ ./doc/progs/run	2013-06-09 23:20:14.695515753 +1000
-@@ -87,7 +87,7 @@
- # Write to temporary file to avoid mingw bash bug.
- TMPFILE="${TMPDIR:-/tmp}/gotest3.$USER"
- 
--function testit {
-+testit () {
- 	./$1 >"$TMPFILE" 2>&1 || true
- 	x=$(echo $(cat "$TMPFILE")) # extra echo canonicalizes
- 	if ! echo "$x" | grep "$2" > /dev/null