From dc24e643e3924f736a923e36b95984788189fe0e Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert>
Date: Sun, 15 Dec 2013 21:50:34 +0000
Subject: Update go to 1.2.

Follow the example of OpenBSD ports and do not run the tests while building.
They are flaky under the Makefile harness for some reason.
---
 lang/go/Makefile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'lang/go/Makefile')

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 93a5705c0df..785818b39ff 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/09/24 20:53:48 bsiegert Exp $
+# $NetBSD: Makefile,v 1.3 2013/12/15 21:50:34 bsiegert Exp $
 
-DISTNAME=	go1.1.2.src
-PKGNAME=	go-1.1.2
+DISTNAME=	go1.2.src
+PKGNAME=	go-1.2
 CATEGORIES=	lang
 MASTER_SITES=	https://go.googlecode.com/files/
 FETCH_USING?=	curl
@@ -17,6 +17,8 @@ USE_TOOLS+=	bash:run perl:run pax
 # uses ulimit -T
 BUILD_DEPENDS+=	bash>=4.2nb3:../../shells/bash
 
+.include "../../mk/bsd.prefs.mk"
+
 # TODO: other arm platforms?
 ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-evbarm
 .if ${MACHINE_ARCH} == "i386"
@@ -26,7 +28,7 @@ GOARCH=		amd64
 .elif ${MACHINE_ARCH} == "evbarm"
 GOARCH=		arm
 .endif
-PLIST_SUBST+=	GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q}
+PLIST_SUBST+=	GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
 
 # cgo compiles under TMPDIR
 TMPDIR?=	/tmp
@@ -39,9 +41,11 @@ GOROOT_FINAL=	${PREFIX}/go
 INSTALLATION_DIRS= bin
 
 REPLACE_BASH+=	doc/articles/wiki/test.bash
+REPLACE_BASH+=	doc/codewalk/run
 REPLACE_BASH+=	doc/progs/run
 REPLACE_BASH+=	doc/progs/update.bash
 REPLACE_BASH+=	misc/arm/a
+REPLACE_BASH+=	misc/cgo/testso/test.bash
 REPLACE_BASH+=	misc/dist/darwin/scripts/postinstall
 REPLACE_BASH+=	misc/dist/darwin/scripts/preinstall
 REPLACE_BASH+=	misc/vim/ftplugin/go/test.sh
@@ -49,14 +53,12 @@ REPLACE_BASH+=	misc/xcode/4/go4xcode.sh
 REPLACE_BASH+=	src/all.bash
 REPLACE_BASH+=	src/clean.bash
 REPLACE_BASH+=	src/cmd/go/test.bash
-REPLACE_BASH+=	src/cmd/godoc/setup-godoc-app.bash
 REPLACE_BASH+=	src/make.bash
 REPLACE_BASH+=	src/pkg/syscall/mkall.sh
 REPLACE_BASH+=	src/pkg/syscall/mkerrors.sh
 REPLACE_BASH+=	src/pkg/syscall/mkerrors_windows.sh
 REPLACE_BASH+=	src/race.bash
 REPLACE_BASH+=	src/run.bash
-REPLACE_BASH+=	src/run.bash.orig
 REPLACE_BASH+=	src/sudo.bash
 REPLACE_BASH+=	test/bench/shootout/timing.sh
 REPLACE_BASH+=	test/run
@@ -69,6 +71,7 @@ REPLACE_PERL+=	src/pkg/syscall/mksyscall.pl
 REPLACE_PERL+=	src/pkg/syscall/mksyscall_windows.pl
 REPLACE_PERL+=	src/pkg/syscall/mksysctl_openbsd.pl
 REPLACE_PERL+=	src/pkg/syscall/mksysnum_darwin.pl
+REPLACE_PERL+=	src/pkg/syscall/mksysnum_dragonfly.pl
 REPLACE_PERL+=	src/pkg/syscall/mksysnum_freebsd.pl
 REPLACE_PERL+=	src/pkg/syscall/mksysnum_linux.pl
 REPLACE_PERL+=	src/pkg/syscall/mksysnum_netbsd.pl
@@ -82,12 +85,12 @@ CHECK_INTERPRETER_SKIP+=	go/src/make.rc
 CHECK_INTERPRETER_SKIP+=	go/src/run.rc
 
 do-build:
-	cd ${WRKSRC}/src && env GOROOT_FINAL=${GOROOT_FINAL:Q} ${BASH} ./all.bash
+	cd ${WRKSRC}/src && env GOROOT_FINAL=${GOROOT_FINAL:Q} ${BASH} ./make.bash
 
 do-install:
 	cd ${WRKSRC} && rm -f .hgignore .hgtags
 	cd ${WRKDIR} && pax -rw go ${DESTDIR}${PREFIX}
-.for cmd in go godoc gofmt
+.for cmd in go gofmt
 	cd ${DESTDIR}${PREFIX}/bin && ln -sf ../go/bin/${cmd} ${cmd}
 .endfor
 
-- 
cgit v1.2.3