CVS commit: pkgsrc/www/grafana

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jan  7 19:17:28 UTC 2018

Modified Files:
        pkgsrc/www/grafana: Makefile

Log Message:
grafana/Makefile: revert rev 1.6-1.7

Actual problem was that EXTRACT_SUFX must be set earlier for intended
Makefile variable expansion.
It used to be set but got lost in the 4.6.2 update commit.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/grafana/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.7 pkgsrc/www/grafana/Makefile:1.8
--- pkgsrc/www/grafana/Makefile:1.7     Sun Jan  7 19:05:02 2018
+++ pkgsrc/www/grafana/Makefile Sun Jan  7 19:17:28 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2018/01/07 19:05:02 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2018/01/07 19:17:28 tnn Exp $
 
 GITHUB_PROJECT=        grafana
 DISTNAME=      grafana-4.6.2
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
+EXTRACT_SUFX=  .tar.gz # don't delete this, needed for variable expansion
 
 MAINTAINER=    tnn%NetBSD.org@localhost
 HOMEPAGE=      https://grafana.com/
@@ -14,16 +15,16 @@ LICENSE=    apache-2.0
 GR_DISTNAME=                   ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=                     ${GR_DISTNAME}
 EXTRACT_ONLY=                  ${GR_DISTNAME}
-EXTRACT_DIR.grafana-4.6.2.tar.gz=      ${WRKDIR}/src/github.com/grafana
+EXTRACT_DIR.${GR_DISTNAME}=    ${WRKDIR}/src/github.com/grafana
 WRKSRC=                                ${WRKDIR}/src/github.com/grafana/grafana
 
 # We don't have suitable infrastructure in pkgsrc for generating frontend
 # assets, so we'll extract prebuilt frontend assets.
 FE_DISTNAME=                   ${DISTNAME}.linux-x64${EXTRACT_SUFX}
-SITES.grafana-4.6.2.linux-x64.tar.gz=          https://s3-us-west-2.amazonaws.com/grafana-releases/release/
+SITES.${FE_DISTNAME}=          https://s3-us-west-2.amazonaws.com/grafana-releases/release/
 DISTFILES+=                    ${FE_DISTNAME}
 EXTRACT_ONLY+=                 ${FE_DISTNAME}
-EXTRACT_DIR.grafana-4.6.2.linux-x64.tar.gz=    ${WRKDIR}/frontend_assets
+EXTRACT_DIR.${FE_DISTNAME}=    ${WRKDIR}/frontend_assets
 
 BUILD_DEPENDS+=                        go-[0-9]*:../../lang/go