From: Klemens Nanni <kn@openbsd.org>
Subject: grafana: avoid deprecation warning from rc script
To: ports <ports@openbsd.org>
Cc: Lucas Raab <tuftedocelot@fastmail.fm>
Date: Fri, 23 Jan 2026 16:36:28 +0000

# rcctl -d start grafana
doing _rc_parse_conf
grafana_flags empty, using default >-homepath /usr/local/share/grafana -config /etc/grafana/config.ini<
doing rc_check
grafana
doing rc_start
doing _rc_wait_for_start
doing rc_check
Deprecation warning: The standalone 'grafana-server' program is deprecated and will be removed in the future. Please update all uses of 'grafana-server' to 'grafana server'
doing rc_check
Alarm clock 
doing _rc_write_runfile
(ok)

("Deprecation warning" prints red on the console...)

No idea how old this is, so I'm not touching installation of the deprecated
*-{cli,server} programs.

As bonus the default pexp gets used now.

Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/grafana/Makefile,v
diff -u -p -r1.56 Makefile
--- Makefile	19 Dec 2025 02:30:03 -0000	1.56
+++ Makefile	23 Jan 2026 16:30:19 -0000
@@ -4,6 +4,7 @@ NOT_FOR_ARCHS =	i386
 COMMENT =	monitoring and metric analytics dashboards
 
 V =		12.3.1
+REVISION =	0
 DISTNAME =	grafana+vendor-$V
 WRKDIST =	${WRKDIR}/grafana-$V
 EXTRACT_SUFX =	.tar.zst
Index: pkg/grafana.rc
===================================================================
RCS file: /cvs/ports/sysutils/grafana/pkg/grafana.rc,v
diff -u -p -r1.4 grafana.rc
--- pkg/grafana.rc	30 May 2023 21:53:03 -0000	1.4
+++ pkg/grafana.rc	23 Jan 2026 16:29:36 -0000
@@ -1,12 +1,11 @@
 #!/bin/ksh
 
-daemon="${TRUEPREFIX}/bin/grafana-server"
+daemon="${TRUEPREFIX}/bin/grafana server"
 daemon_user="_grafana"
 daemon_flags="-homepath ${TRUEPREFIX}/share/grafana -config ${SYSCONFDIR}/grafana/config.ini"
 
 . /etc/rc.d/rc.subr
 
-pexp="grafana server ${daemon_flags}"
 rc_bg=YES
 rc_reload=NO