[pkgsrc/trunk]: pkgsrc/www/grafana grafana: fix SYSCONFBASE usage in rc.d script

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40495823d5dd
branches:  trunk
changeset: 389070:40495823d5dd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 29 22:06:47 2022 +0000

description:
grafana: fix SYSCONFBASE usage in rc.d script

>From Edgar Fuß in private mail.

Bump PKGREVISION.

diffstat:

 www/grafana/Makefile         |   3 ++-
 www/grafana/files/grafana.sh |  12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 535fe8f269d3 -r 40495823d5dd www/grafana/Makefile
--- a/www/grafana/Makefile      Tue Nov 29 21:14:33 2022 +0000
+++ b/www/grafana/Makefile      Tue Nov 29 22:06:47 2022 +0000
@@ -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}
diff -r 535fe8f269d3 -r 40495823d5dd www/grafana/files/grafana.sh
--- a/www/grafana/files/grafana.sh      Tue Nov 29 21:14:33 2022 +0000
+++ b/www/grafana/files/grafana.sh      Tue Nov 29 22:06:47 2022 +0000
@@ -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 @@
        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)