go*: move definition of GOROOT_BOOTSTRAP to go/bootstrap.mk.

NFC. But will later need to do something else when MACHINE_ARCH == aarch64.
Also drop dup include of bsd.prefs.mk. go/version.mk does this already.

5 files changed, 12 insertions, 22 deletions

diff --git a/lang/go/bootstrap.mk b/lang/go/bootstrap.mk
new file mode 100644
index 00000000000..486956b8b29
--- /dev/null
+++ b/lang/go/bootstrap.mk
@@ -0,0 +1,4 @@
+# $NetBSD: bootstrap.mk,v 1.1 2020/05/01 14:09:14 tnn Exp $
+
+BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
+GOROOT_BOOTSTRAP=	${PREFIX}/go14
diff --git a/lang/go110/Makefile b/lang/go110/Makefile
index 88b1926e2b3..f36f4ee4c79 100644
--- a/lang/go110/Makefile
+++ b/lang/go110/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/01 14:09:15 tnn Exp $
 
 PKGREVISION= 1
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=	go${GO110_VERSION}.src
 PKGNAME=	go110-${GO110_VERSION}
@@ -80,11 +81,6 @@ CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/clean.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=	${PREFIX}/go14
-
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=	pty route
 
 .if ${OPSYS} != "SunOS"
diff --git a/lang/go113/Makefile b/lang/go113/Makefile
index 8ec62503648..027426b8d80 100644
--- a/lang/go113/Makefile
+++ b/lang/go113/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/01 14:09:15 tnn Exp $
 
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=	go${GO113_VERSION}.src
 PKGNAME=	go113-${GO113_VERSION}
@@ -75,9 +76,6 @@ CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/clean.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=	${PREFIX}/go14
-
 PLIST_SUBST+=	GOVERSSUFFIX=${GOVERSSUFFIX}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/go114/Makefile b/lang/go114/Makefile
index 814e5f9bec9..fb23831e0b7 100644
--- a/lang/go114/Makefile
+++ b/lang/go114/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/01 14:09:15 tnn Exp $
 
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=	go${GO114_VERSION}.src
 PKGNAME=	go114-${GO114_VERSION}
@@ -65,13 +66,8 @@ CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/clean.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=	go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=	${PREFIX}/go14
-
 PLIST_SUBST+=	GOVERSSUFFIX=${GOVERSSUFFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=	pty route
 
 .if ${OPSYS} != "SunOS"
diff --git a/lang/go19/Makefile b/lang/go19/Makefile
index 32e19893683..16012b9549a 100644
--- a/lang/go19/Makefile
+++ b/lang/go19/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/01 14:09:15 tnn Exp $
 
 PKGREVISION= 2
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=	go${GO19_VERSION}.src
 PKGNAME=	go19-${GO19_VERSION}
@@ -80,11 +81,6 @@ CHECK_INTERPRETER_SKIP+=	go19/src/clean.rc
 CHECK_INTERPRETER_SKIP+=	go19/src/make.rc
 CHECK_INTERPRETER_SKIP+=	go19/src/run.rc
 
-BUILD_DEPENDS+=		go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=	${PREFIX}/go14
-
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=	route
 
 .if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"