pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/grafana Use correct versioned Go dependency.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/52796e61336f
branches:  trunk
changeset: 313021:52796e61336f
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Sep 22 20:52:17 2018 +0000

description:
Use correct versioned Go dependency.

diffstat:

 www/grafana/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 5a96ae583ce4 -r 52796e61336f www/grafana/Makefile
--- a/www/grafana/Makefile      Sat Sep 22 20:44:34 2018 +0000
+++ b/www/grafana/Makefile      Sat Sep 22 20:52:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/06/12 17:50:28 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2018/09/22 20:52:17 bsiegert Exp $
 
 GITHUB_PROJECT=        grafana
 DISTNAME=      grafana-4.6.2
@@ -27,7 +27,9 @@
 EXTRACT_ONLY+=                 ${FE_DISTNAME}
 EXTRACT_DIR.${FE_DISTNAME}=    ${WRKDIR}/frontend_assets
 
-BUILD_DEPENDS+=                        go-[0-9]*:../../lang/go
+.include "../../lang/go/version.mk"
+
+BUILD_DEPENDS+=                        ${GO_PACKAGE_DEP}
 
 CHECK_PORTABILITY_SKIP=                packaging/rpm/control/postinst
 
@@ -80,7 +82,7 @@
 do-build:
 .for b in grafana-server grafana-cli
        cd ${WRKSRC} && ${SETENV} ${PKGSRC_MAKE_ENV}            \
-         ${PREFIX}/bin/go build -ldflags "-w -X main.version=${PKGVERSION_NOREV} -X main.commit=${GITHUB_TAG} -X main.buildstamp=pkgsrc"       \
+         ${GO} build -ldflags "-w -X main.version=${PKGVERSION_NOREV} -X main.commit=${GITHUB_TAG} -X main.buildstamp=pkgsrc"  \
          -o ./bin/${b} ./pkg/cmd/${b}
 .endfor
 



Home | Main Index | Thread Index | Old Index