diff options
| author | wiz <wiz@pkgsrc.org> | 2022-11-29 22:06:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-11-29 22:06:47 +0000 |
| commit | f787f3a1970cffa254b00553057ad90a3a26eccd (patch) | |
| tree | 7511ffad600a6acccb7580e1d7f0615dbefd0298 | |
| parent | c1a296db1e80d6b886693aa0916bba07eca248c5 (diff) | |
| download | pkgsrc-f787f3a1970cffa254b00553057ad90a3a26eccd.tar.gz | |
grafana: fix SYSCONFBASE usage in rc.d script
From Edgar Fuß in private mail.
Bump PKGREVISION.
| -rw-r--r-- | www/grafana/Makefile | 3 | ||||
| -rw-r--r-- | www/grafana/files/grafana.sh | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/www/grafana/Makefile b/www/grafana/Makefile index 6842ae65865..e916d7957ae 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -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 --git a/www/grafana/files/grafana.sh b/www/grafana/files/grafana.sh index 27e43ac0a8e..a7a6e8ba192 100644 --- a/www/grafana/files/grafana.sh +++ b/www/grafana/files/grafana.sh @@ -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) |