CVS commit: pkgsrc/www/grafana

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 29 22:06:47 UTC 2022

Modified Files:
        pkgsrc/www/grafana: Makefile
        pkgsrc/www/grafana/files: grafana.sh

Log Message:
grafana: fix SYSCONFBASE usage in rc.d script

>From Edgar Fuß in private mail.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/www/grafana/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/grafana/files/grafana.sh

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.86 pkgsrc/www/grafana/Makefile:1.87
--- pkgsrc/www/grafana/Makefile:1.86    Sun Nov 20 15:48:07 2022
+++ pkgsrc/www/grafana/Makefile Tue Nov 29 22:06:47 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2022/11/20 15:48:07 triaxx Exp $
+# $NetBSD: Makefile,v 1.87 2022/11/29 22:06:47 wiz Exp $
 
 DISTNAME=      grafana-9.2.5
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/www/grafana/files/grafana.sh
diff -u pkgsrc/www/grafana/files/grafana.sh:1.5 pkgsrc/www/grafana/files/grafana.sh:1.6
--- pkgsrc/www/grafana/files/grafana.sh:1.5     Sat May 21 07:41:46 2022
+++ pkgsrc/www/grafana/files/grafana.sh Tue Nov 29 22:06:47 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: grafana.sh,v 1.5 2022/05/21 07:41:46 triaxx Exp $
+# $NetBSD: grafana.sh,v 1.6 2022/11/29 22:06:47 wiz Exp $
 #
 # PROVIDE: grafana
 # REQUIRE: DAEMON
@@ -12,8 +12,8 @@
 #
 # grafana=YES
 
-if [ -f @SYSCONFBASE@/etc/rc.subr ]; then
-       $_rc_subr_loaded . @SYSCONFBASE@/etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+       $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 fi
 
 name="grafana"
@@ -34,12 +34,12 @@ grafana_precmd() {
        fi
 }
 
-if [ -f @SYSCONFBASE@/etc/rc.subr -a -d @SYSCONFBASE@/etc/rc.d -a -f @SYSCONFBASE@/etc/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
        run_rc_command "$1"
 else
-       if [ -f @SYSCONFBASE@/etc/rc.conf ]; then
-               . @SYSCONFBASE@/etc/rc.conf
+       if [ -f @SYSCONFBASE@/rc.conf ]; then
+               . @SYSCONFBASE@/rc.conf
        fi
        case "$1" in
        start)