CVS commit: [pkgsrc-2024Q2] pkgsrc/filesystems

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Aug  7 18:47:39 UTC 2024

Modified Files:
        pkgsrc/filesystems/glusterfs [pkgsrc-2024Q2]: Makefile
        pkgsrc/filesystems/glusterfs/files [pkgsrc-2024Q2]: glusterd.sh
        pkgsrc/filesystems/glusterfs8 [pkgsrc-2024Q2]: Makefile
        pkgsrc/filesystems/glusterfs8/files [pkgsrc-2024Q2]: glusterd.sh

Log Message:
Pullup ticket #6885 - requested by riastradh
filesystems/glusterfs: build fix -- Use @VARBASE@, @PREFIX@, &c., instead of
/var, /usr/pkg, &c., in the rc script

Revisions pulled up:
- filesystems/glusterfs/Makefile                                1.123
- filesystems/glusterfs/files/glusterd.sh                       1.13
- filesystems/glusterfs8/Makefile                               1.7
- filesystems/glusterfs8/files/glusterd.sh                      1.2

---
   Module Name:    pkgsrc
   Committed By:   riastradh
   Date:           Fri Jul  5 02:21:34 UTC 2024

   Modified Files:
           pkgsrc/filesystems/glusterfs: Makefile
           pkgsrc/filesystems/glusterfs/files: glusterd.sh
           pkgsrc/filesystems/glusterfs8: Makefile
           pkgsrc/filesystems/glusterfs8/files: glusterd.sh

   Log Message:
   filesystems/glusterfs: Fix paths in rc script.

   PR pkg/58400


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.122.2.1 pkgsrc/filesystems/glusterfs/Makefile
cvs rdiff -u -r1.12 -r1.12.78.1 \
    pkgsrc/filesystems/glusterfs/files/glusterd.sh
cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/filesystems/glusterfs8/Makefile
cvs rdiff -u -r1.1 -r1.1.12.1 pkgsrc/filesystems/glusterfs8/files/glusterd.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/glusterfs/Makefile
diff -u pkgsrc/filesystems/glusterfs/Makefile:1.122 pkgsrc/filesystems/glusterfs/Makefile:1.122.2.1
--- pkgsrc/filesystems/glusterfs/Makefile:1.122 Wed May 29 16:32:29 2024
+++ pkgsrc/filesystems/glusterfs/Makefile       Wed Aug  7 18:47:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2024/05/29 16:32:29 adam Exp $
+# $NetBSD: Makefile,v 1.122.2.1 2024/08/07 18:47:39 bsiegert Exp $
 
 DISTNAME=      glusterfs-10.4
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    filesystems
 MASTER_SITES=  https://bits.gluster.org/pub/gluster/glusterfs/src/
 

Index: pkgsrc/filesystems/glusterfs/files/glusterd.sh
diff -u pkgsrc/filesystems/glusterfs/files/glusterd.sh:1.12 pkgsrc/filesystems/glusterfs/files/glusterd.sh:1.12.78.1
--- pkgsrc/filesystems/glusterfs/files/glusterd.sh:1.12 Tue Nov 18 14:38:15 2014
+++ pkgsrc/filesystems/glusterfs/files/glusterd.sh      Wed Aug  7 18:47:39 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: glusterd.sh,v 1.12 2014/11/18 14:38:15 manu Exp $
+# $NetBSD: glusterd.sh,v 1.12.78.1 2024/08/07 18:47:39 bsiegert Exp $
 #
 
 # PROVIDE: glusterd
@@ -12,9 +12,9 @@ glusterd_precmd()
 {
        fatal=0
 
-       for d in /var/lib/glusterd /usr/pkg/etc/glusterd ; do
-               if test -d /var/lib/glusterd ; then
-                       echo "Please migrate $d to /var/db/glusterd" >&2
+       for d in @VARBASE@/lib/glusterd @PKG_SYSCONFDIR@/glusterd ; do
+               if test -d "$d" ; then
+                       echo "Please migrate $d to @VARBASE@/db/glusterd" >&2
                        fatal=1
                fi
        done
@@ -26,11 +26,11 @@ glusterd_precmd()
 
 name="glusterd"
 rcvar=$name
-command="/usr/pkg/sbin/${name}"
+command="@PREFIX@/sbin/${name}"
 #start_precmd="glusterd_precmd"
 pidfile="/var/run/${name}.pid"
 command_args="-p ${pidfile}"
-required_files="/usr/pkg/etc/glusterfs/${name}.vol"
+required_files="@PKG_SYSCONFDIR@/glusterfs/${name}.vol"
 
 load_rc_config $name
 run_rc_command "$1"

Index: pkgsrc/filesystems/glusterfs8/Makefile
diff -u pkgsrc/filesystems/glusterfs8/Makefile:1.6 pkgsrc/filesystems/glusterfs8/Makefile:1.6.2.1
--- pkgsrc/filesystems/glusterfs8/Makefile:1.6  Wed May 29 16:32:29 2024
+++ pkgsrc/filesystems/glusterfs8/Makefile      Wed Aug  7 18:47:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2024/05/29 16:32:29 adam Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2024/08/07 18:47:39 bsiegert Exp $
 
 DISTNAME=      glusterfs-8.2
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    filesystems
 MASTER_SITES=  http://bits.gluster.org/pub/gluster/glusterfs/src/
 

Index: pkgsrc/filesystems/glusterfs8/files/glusterd.sh
diff -u pkgsrc/filesystems/glusterfs8/files/glusterd.sh:1.1 pkgsrc/filesystems/glusterfs8/files/glusterd.sh:1.1.12.1
--- pkgsrc/filesystems/glusterfs8/files/glusterd.sh:1.1 Sun Mar 12 11:55:59 2023
+++ pkgsrc/filesystems/glusterfs8/files/glusterd.sh     Wed Aug  7 18:47:39 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: glusterd.sh,v 1.1 2023/03/12 11:55:59 js Exp $
+# $NetBSD: glusterd.sh,v 1.1.12.1 2024/08/07 18:47:39 bsiegert Exp $
 #
 
 # PROVIDE: glusterd
@@ -12,9 +12,9 @@ glusterd_precmd()
 {
        fatal=0
 
-       for d in /var/lib/glusterd /usr/pkg/etc/glusterd ; do
-               if test -d /var/lib/glusterd ; then
-                       echo "Please migrate $d to /var/db/glusterd" >&2
+       for d in @VARBASE@/lib/glusterd @PKG_SYSCONFDIR@/glusterd ; do
+               if test -d "$d" ; then
+                       echo "Please migrate $d to @VARBASE@/db/glusterd" >&2
                        fatal=1
                fi
        done
@@ -26,11 +26,11 @@ glusterd_precmd()
 
 name="glusterd"
 rcvar=$name
-command="/usr/pkg/sbin/${name}"
+command="@PREFIX@/sbin/${name}"
 #start_precmd="glusterd_precmd"
 pidfile="/var/run/${name}.pid"
 command_args="-p ${pidfile}"
-required_files="/usr/pkg/etc/glusterfs/${name}.vol"
+required_files="@PKG_SYSCONFDIR@/glusterfs/${name}.vol"
 
 load_rc_config $name
 run_rc_command "$1"