[pkgsrc/trunk]: pkgsrc *: Include go-vars.mk where appropriate.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ab7d0725b70
branches:  trunk
changeset: 405812:7ab7d0725b70
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Dec 09 10:11:35 2019 +0000

description:
*: Include go-vars.mk where appropriate.

diffstat:

 net/go-net/Makefile     |  3 ++-
 sysutils/beats/Makefile |  6 ++----
 www/gitea/Makefile      |  7 ++-----
 www/grafana/Makefile    |  5 +++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diffs (96 lines):

diff -r 25fd51c67055 -r 7ab7d0725b70 net/go-net/Makefile
--- a/net/go-net/Makefile       Mon Dec 09 09:59:31 2019 +0000
+++ b/net/go-net/Makefile       Mon Dec 09 10:11:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/10/18 14:58:54 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2019/12/09 10:11:35 jperkin Exp $
 
 DISTNAME=              go-net-20170308
 PKGREVISION=           14
@@ -17,6 +17,7 @@
 
 CHECK_RELRO_SKIP+=     bin/h2i
 
+.include "../../lang/go/go-vars.mk"
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=   h2i route
diff -r 25fd51c67055 -r 7ab7d0725b70 sysutils/beats/Makefile
--- a/sysutils/beats/Makefile   Mon Dec 09 09:59:31 2019 +0000
+++ b/sysutils/beats/Makefile   Mon Dec 09 10:11:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/10/18 14:58:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.46 2019/12/09 10:11:35 jperkin Exp $
 
 DISTNAME=              beats-6.6.2
 PKGREVISION=           6
@@ -18,9 +18,7 @@
 GO_DIST_BASE=          ${PKGBASE}-${GITHUB_TAG:S/v//}
 GO_SRCPATH=            github.com/elastic/beats
 
-TOOLS_CREATE+=         go
-TOOLS_PATH.go=         ${GO}
-
+.include "../../lang/go/go-vars.mk"
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=           audit
diff -r 25fd51c67055 -r 7ab7d0725b70 www/gitea/Makefile
--- a/www/gitea/Makefile        Mon Dec 09 09:59:31 2019 +0000
+++ b/www/gitea/Makefile        Mon Dec 09 10:11:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/12/07 19:23:37 nia Exp $
+# $NetBSD: Makefile,v 1.18 2019/12/09 10:11:35 jperkin Exp $
 
 DISTNAME=      gitea-1.10.1
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=go-gitea/}
@@ -13,6 +13,7 @@
 GO_DIST_BASE=          ${DISTNAME}
 GO_SRCPATH=            code.gitea.io/gitea
 
+.include "../../lang/go/go-vars.mk"
 .include "options.mk"
 
 .if !empty(GO_TAGS)
@@ -33,8 +34,6 @@
 OWN_DIRS_PERMS+=       ${VARBASE}/db/gitea ${GITEA_USER} ${GITEA_GROUP} 0755
 OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/conf ${GITEA_USER} ${GITEA_GROUP} 0755
 
-.include "../../mk/bsd.prefs.mk"
-
 GITEA_USER?=   git
 GITEA_GROUP?=  git
 
@@ -68,8 +67,6 @@
 CONF_FILES_PERMS+=     ${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini \
                        ${GITEA_USER} ${GITEA_GROUP} 0600
 
-.include "../../mk/bsd.prefs.mk"
-
 FILES_SUBST+=  GITEA_USER=${GITEA_USER}
 FILES_SUBST+=  GITEA_GROUP=${GITEA_GROUP}
 FILES_SUBST+=  GITEA_USER_HOME=${VARBASE}/db/gitea
diff -r 25fd51c67055 -r 7ab7d0725b70 www/grafana/Makefile
--- a/www/grafana/Makefile      Mon Dec 09 09:59:31 2019 +0000
+++ b/www/grafana/Makefile      Mon Dec 09 10:11:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/12/05 15:36:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2019/12/09 10:11:35 jperkin Exp $
 
 DISTNAME=      grafana-6.3.4
 PKGREVISION=   2
@@ -51,7 +51,7 @@
 FILES_SUBST+=          GRAFANA_GROUP=${GRAFANA_GROUP:Q}
 FILES_SUBST+=          DATADIR=${DATADIR:Q}
 
-.include "../../lang/go/go-package.mk"
+.include "../../lang/go/go-vars.mk"
 .include "../../mk/bsd.prefs.mk"
 
 GRAFANA_USER?=         grafana
@@ -82,4 +82,5 @@
        cd ${WRKSRC} && ${PAX} -rw conf \
                ${DESTDIR}${PREFIX}/share/grafana/
 
+.include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"