sync glusterfs to head of pkgsrc (git).

[Alexander Schreiber <als%thangorodrim.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Alexander Schreiber <als%thangorodrim.de@localhost>
Pushed By:	als
Date:		Tue Mar 28 21:29:05 2023 +0000
Changeset:	4596bb55c7c518ed5cf907873d81f9bd228b9632

Modified Files:
	glusterfs/Makefile
	glusterfs/PLIST
	glusterfs/distinfo
	glusterfs/patches/patch-events-src-Makefile.am
	glusterfs/patches/patch-events-tools-Makefile.am
	glusterfs/patches/patch-extras-Makefile.am
	glusterfs/patches/patch-extras-ganesha-config-Makefile.am
	glusterfs/patches/patch-geo-replication_Makefile.am

Log Message:
sync glusterfs to head of pkgsrc (git).

Signed-off-by: Alexander Schreiber <als%thangorodrim.de@localhost>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4596bb55c7c518ed5cf907873d81f9bd228b9632

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

diffstat:
 glusterfs/Makefile                                        | 7 +++----
 glusterfs/PLIST                                           | 2 +-
 glusterfs/distinfo                                        | 2 +-
 glusterfs/patches/patch-events-src-Makefile.am            | 2 +-
 glusterfs/patches/patch-events-tools-Makefile.am          | 2 +-
 glusterfs/patches/patch-extras-Makefile.am                | 2 +-
 glusterfs/patches/patch-extras-ganesha-config-Makefile.am | 2 +-
 glusterfs/patches/patch-geo-replication_Makefile.am       | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diffs:
diff --git a/glusterfs/Makefile b/glusterfs/Makefile
index f611d3fd3b..11b55ab3d8 100644
--- a/glusterfs/Makefile
+++ b/glusterfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2023/03/16 03:28:24 gutteridge Exp $
+# $NetBSD: Makefile,v 1.116 2023/03/28 01:10:53 gutteridge Exp $
 
 DISTNAME=	glusterfs-10.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -79,7 +79,6 @@ REPLACE_BASH+=		geo-replication/src/set_geo_rep_pem_keys.sh
 # Explicit substitution of bash
 CHECK_PORTABILITY_SKIP+=	extras/peer_add_secret_pub.in
 
-
 SUBST_CLASSES+=		mtab
 SUBST_STAGE.mtab=	post-build
 SUBST_FILES.mtab+=	xlators/mount/fuse/utils/mount.glusterfs.in
@@ -94,7 +93,7 @@ SUBST_SED.etc=		-e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	pre-configure
 SUBST_FILES.bash=	build-aux/pkg-version
-SUBST_SED.bash=		-e "s,/bin/bash,/usr/pkg/bin/bash,g"
+SUBST_SED.bash=		-e "s,/bin/bash,${BASH},g"
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=	${EGDIR}/eventsconfig.json ${PKG_SYSCONFDIR}/glusterfs/eventsconfig.json
diff --git a/glusterfs/PLIST b/glusterfs/PLIST
index d5336df6b1..4944702228 100644
--- a/glusterfs/PLIST
+++ b/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2023/03/12 17:57:44 js Exp $
+@comment $NetBSD: PLIST,v 1.42 2023/03/28 01:10:53 gutteridge Exp $
 ${PYSITELIB}/gluster/__init__.py
 ${PYSITELIB}/gluster/__init__.pyc
 ${PYSITELIB}/gluster/__init__.pyo
diff --git a/glusterfs/distinfo b/glusterfs/distinfo
index 17b8aac222..39899d4377 100644
--- a/glusterfs/distinfo
+++ b/glusterfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2023/03/16 03:28:24 gutteridge Exp $
+$NetBSD: distinfo,v 1.76 2023/03/28 01:10:53 gutteridge Exp $
 
 BLAKE2s (glusterfs-10.3.tar.gz) = c2f9b5670d1df7a787e445207caa421a949f1fb98cafb587441925efe8d9e25a
 SHA512 (glusterfs-10.3.tar.gz) = af7c8a15db48196a5f7022e4da87ae8d8d43a12c8968b242f40fb43ea562d1d214e75b3a67800f8594c97847e15c01367b6d464964252551d6f8d3e93fb0f832
diff --git a/glusterfs/patches/patch-events-src-Makefile.am b/glusterfs/patches/patch-events-src-Makefile.am
index a6ea8f906b..66fa3a680c 100644
--- a/glusterfs/patches/patch-events-src-Makefile.am
+++ b/glusterfs/patches/patch-events-src-Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-events-src-Makefile.am,v 1.1 2023/03/28 01:10:53 gutteridge Exp $
 
 Move config file examples into datadir/config.
 
diff --git a/glusterfs/patches/patch-events-tools-Makefile.am b/glusterfs/patches/patch-events-tools-Makefile.am
index e16ec001ed..bb4e828182 100644
--- a/glusterfs/patches/patch-events-tools-Makefile.am
+++ b/glusterfs/patches/patch-events-tools-Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-events-tools-Makefile.am,v 1.1 2023/03/28 01:10:53 gutteridge Exp $
 
 Move config file examples into datadir/config.
 
diff --git a/glusterfs/patches/patch-extras-Makefile.am b/glusterfs/patches/patch-extras-Makefile.am
index 2ab4fb01c5..97b1e1b712 100644
--- a/glusterfs/patches/patch-extras-Makefile.am
+++ b/glusterfs/patches/patch-extras-Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-extras-Makefile.am,v 1.1 2023/03/28 01:10:53 gutteridge Exp $
 
 Move config file examples into datadir/config.
 
diff --git a/glusterfs/patches/patch-extras-ganesha-config-Makefile.am b/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
index 483f128a7c..545e5d14fb 100644
--- a/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
+++ b/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-extras-ganesha-config-Makefile.am,v 1.1 2023/03/28 01:10:53 gutteridge Exp $
 
 Move config file examples into datadir/config.
 
diff --git a/glusterfs/patches/patch-geo-replication_Makefile.am b/glusterfs/patches/patch-geo-replication_Makefile.am
index d589255820..814d564335 100644
--- a/glusterfs/patches/patch-geo-replication_Makefile.am
+++ b/glusterfs/patches/patch-geo-replication_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-geo-replication_Makefile.am,v 1.1 2023/03/28 01:10:53 gutteridge Exp $
 
 Move config file examples into datadir/config.