CVS commit: pkgsrc/www/grafana

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Mar  9 18:02:00 UTC 2023

Modified Files:
        pkgsrc/www/grafana: Makefile distinfo
Added Files:
        pkgsrc/www/grafana/patches:
            patch-pkg_cmd_grafana-server_commands_cli.go

Log Message:
grafana: Re-add patch removed during last commit

pkgsrc changes:
---------------
  * Adapt patch that set values for -homepath/-config/-pidfile using pkgsrc
    layout.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/www/grafana/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/grafana/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/grafana/patches/patch-pkg_cmd_grafana-server_commands_cli.go

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.95 pkgsrc/www/grafana/Makefile:1.96
--- pkgsrc/www/grafana/Makefile:1.95    Wed Mar  8 13:38:51 2023
+++ pkgsrc/www/grafana/Makefile Thu Mar  9 18:02:00 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2023/03/08 13:38:51 bsiegert Exp $
+# $NetBSD: Makefile,v 1.96 2023/03/09 18:02:00 triaxx Exp $
 
 DISTNAME=      grafana-9.4.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -35,7 +35,7 @@ LOGDIR=               ${VARBASE}/log/grafana
 SUBST_CLASSES+=                fix-cfg
 SUBST_STAGE.fix-cfg=   pre-configure
 SUBST_MESSAGE.fix-cfg= Adding pkgsrc paths in sample config
-SUBST_FILES.fix-cfg=   conf/sample.ini
+SUBST_FILES.fix-cfg=   conf/sample.ini pkg/cmd/grafana-server/commands/cli.go
 SUBST_SED.fix-cfg=     -e 's,^;\(data = \).*,\1${DATADIR},g'
 SUBST_SED.fix-cfg+=    -e 's,^;\(logs = \).*,\1${LOGDIR},g'
 SUBST_SED.fix-cfg+=    -e 's,^;\(plugins = \).*,\1${PLUGINDIR},g'

Index: pkgsrc/www/grafana/distinfo
diff -u pkgsrc/www/grafana/distinfo:1.38 pkgsrc/www/grafana/distinfo:1.39
--- pkgsrc/www/grafana/distinfo:1.38    Sun Mar  5 21:22:45 2023
+++ pkgsrc/www/grafana/distinfo Thu Mar  9 18:02:00 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2023/03/05 21:22:45 triaxx Exp $
+$NetBSD: distinfo,v 1.39 2023/03/09 18:02:00 triaxx Exp $
 
 BLAKE2s (bazil.org_fuse_@v_v0.0.0-20160811212531-371fbbdaa898.mod) = ff8095283662ae2d2a1968bf429516c54586b1a6c4dc744657162e6781aa8ece
 SHA512 (bazil.org_fuse_@v_v0.0.0-20160811212531-371fbbdaa898.mod) = 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
@@ -10878,3 +10878,4 @@ Size (xorm.io_core_@v_v0.7.3.zip) = 3122
 SHA1 (patch-go.mod) = 8742e9db79e440d8d1dcc1bf8b8a23874511b496
 SHA1 (patch-go.sum) = 97ecf1a2319a9311fb9517e3908f9b6980703fd8
 SHA1 (patch-pkg_build_cmd.go) = a9002d34fef4ee7e1bb2953b0a3d825a0c64fa1d
+SHA1 (patch-pkg_cmd_grafana-server_commands_cli.go) = 0dce3a76ad509aade343c6f5bae9b3590198f2c3

Added files:

Index: pkgsrc/www/grafana/patches/patch-pkg_cmd_grafana-server_commands_cli.go
diff -u /dev/null pkgsrc/www/grafana/patches/patch-pkg_cmd_grafana-server_commands_cli.go:1.3
--- /dev/null   Thu Mar  9 18:02:00 2023
+++ pkgsrc/www/grafana/patches/patch-pkg_cmd_grafana-server_commands_cli.go     Thu Mar  9 18:02:00 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-pkg_cmd_grafana-server_commands_cli.go,v 1.3 2023/03/09 18:02:00 triaxx Exp $
+
+Use pkgsrc layout.
+from: patch-pkg_cmd_grafana-server_main.go,v 1.1 2020/08/27 13:05:20 jperkin Exp
+
+--- pkg/cmd/grafana-server/commands/cli.go.orig        2023-03-02 20:28:42.000000000 +0000
++++ pkg/cmd/grafana-server/commands/cli.go
+@@ -43,14 +43,17 @@ func ServerCommand(version, commit, buil
+               Flags: []cli.Flag{
+                       &cli.StringFlag{
+                               Name:  "config",
++                              Value: "@PKG_SYSCONFDIR@/grafana.conf",
+                               Usage: "Path to config file",
+                       },
+                       &cli.StringFlag{
+                               Name:  "homepath",
++                              Value: "@PREFIX@/share/grafana",
+                               Usage: "Path to Grafana install/home path, defaults to working directory",
+                       },
+                       &cli.StringFlag{
+                               Name:  "pidfile",
++                              Value: "@DATADIR@/grafana.pid",
+                               Usage: "Path to Grafana pid file",
+                       },
+                       &cli.StringFlag{