Received: by mail.netbsd.org (Postfix, from userid 605) id 80FD484D79; Mon, 9 Dec 2019 10:11:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 089C084CD3 for ; Mon, 9 Dec 2019 10:11:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 4cMciPxNwJgN for ; Mon, 9 Dec 2019 10:11:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7051E84C6C for ; Mon, 9 Dec 2019 10:11:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 69F7CFA97; Mon, 9 Dec 2019 10:11:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1575886295256850" MIME-Version: 1.0 Date: Mon, 9 Dec 2019 10:11:35 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20191209101136.69F7CFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1575886295256850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Dec 9 10:11:35 UTC 2019 Modified Files: pkgsrc/net/go-net: Makefile pkgsrc/sysutils/beats: Makefile pkgsrc/www/gitea: Makefile pkgsrc/www/grafana: Makefile Log Message: *: Include go-vars.mk where appropriate. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/go-net/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/beats/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/gitea/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/grafana/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1575886295256850 Content-Disposition: inline Content-Length: 3414 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/go-net/Makefile diff -u pkgsrc/net/go-net/Makefile:1.31 pkgsrc/net/go-net/Makefile:1.32 --- pkgsrc/net/go-net/Makefile:1.31 Fri Oct 18 14:58:54 2019 +++ pkgsrc/net/go-net/Makefile Mon Dec 9 10:11:35 2019 @@ -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 @@ GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHU CHECK_RELRO_SKIP+= bin/h2i +.include "../../lang/go/go-vars.mk" .include "../../mk/bsd.prefs.mk" PLIST_VARS+= h2i route Index: pkgsrc/sysutils/beats/Makefile diff -u pkgsrc/sysutils/beats/Makefile:1.45 pkgsrc/sysutils/beats/Makefile:1.46 --- pkgsrc/sysutils/beats/Makefile:1.45 Fri Oct 18 14:58:56 2019 +++ pkgsrc/sysutils/beats/Makefile Mon Dec 9 10:11:35 2019 @@ -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 @@ USE_TOOLS+= gmake 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 Index: pkgsrc/www/gitea/Makefile diff -u pkgsrc/www/gitea/Makefile:1.17 pkgsrc/www/gitea/Makefile:1.18 --- pkgsrc/www/gitea/Makefile:1.17 Sat Dec 7 19:23:37 2019 +++ pkgsrc/www/gitea/Makefile Mon Dec 9 10:11:35 2019 @@ -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 @@ LICENSE= mit 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}/log/gitea ${ 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 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf 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 Index: pkgsrc/www/grafana/Makefile diff -u pkgsrc/www/grafana/Makefile:1.20 pkgsrc/www/grafana/Makefile:1.21 --- pkgsrc/www/grafana/Makefile:1.20 Thu Dec 5 15:36:25 2019 +++ pkgsrc/www/grafana/Makefile Mon Dec 9 10:11:35 2019 @@ -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_USER=${GRAFANA_US 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 @@ do-install: cd ${WRKSRC} && ${PAX} -rw conf \ ${DESTDIR}${PREFIX}/share/grafana/ +.include "../../lang/go/go-package.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1575886295256850--