Update to put config files into proper location.

[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:25:41 2023 +0000
Changeset:	f4f94cf5ad756f09c952f13b1dae641993530b25

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:
Update to put config files into proper location.

Put the config files (ready for copying to etc/) to where the pkgsrc
guide they should be put.

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=f4f94cf5ad756f09c952f13b1dae641993530b25

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

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

diffs:
diff --git a/glusterfs/Makefile b/glusterfs/Makefile
index e972ec9277..f611d3fd3b 100644
--- a/glusterfs/Makefile
+++ b/glusterfs/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--without-tcmalloc
 # libtirpc not in pkgsrc (yet)
 CONFIGURE_ARGS+=	--without-libtirpc
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGBASE}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/examples/${PKGBASE}
 
 # Upstream glusterfs effectively dropped support for 32bit platforms
 # somewhere between 8.2 (works on e.g. NetBSD/i386) and 10.3 as various
@@ -96,7 +96,7 @@ SUBST_STAGE.bash=	pre-configure
 SUBST_FILES.bash=	build-aux/pkg-version
 SUBST_SED.bash=		-e "s,/bin/bash,/usr/pkg/bin/bash,g"
 
-EGDIR=		${PREFIX}/share/${PKGBASE}/config
+EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=	${EGDIR}/eventsconfig.json ${PKG_SYSCONFDIR}/glusterfs/eventsconfig.json
 CONF_FILES+=	${EGDIR}/ganesha/ganesha-ha.conf.sample ${PKG_SYSCONFDIR}/glusterfs/ganesha/ganesha-ha.conf.sample
 CONF_FILES+=	${EGDIR}/gluster-rsyslog-5.8.conf ${PKG_SYSCONFDIR}/glusterfs/gluster-rsyslog-5.8.conf
@@ -113,8 +113,8 @@ CONF_FILES+=	${EGDIR}/group-samba ${PKG_SYSCONFDIR}/glusterfs/group-samba
 CONF_FILES+=	${EGDIR}/group-virt.example ${PKG_SYSCONFDIR}/glusterfs/group-virt.example
 CONF_FILES+=	${EGDIR}/logger.conf.example ${PKG_SYSCONFDIR}/glusterfs/logger.conf.example
 CONF_FILES+=	${EGDIR}/thin-arbiter.vol ${PKG_SYSCONFDIR}/glusterfs/thin-arbiter.vol
-OWN_DIRS+=		${PKG_SYSCONFDIR}/glusterfs
-OWN_DIRS+=		${PKG_SYSCONFDIR}/glusterfs/ganesha
+OWN_DIRS+=	${PKG_SYSCONFDIR}/glusterfs
+OWN_DIRS+=	${PKG_SYSCONFDIR}/glusterfs/ganesha
 
 OWN_DIRS+=		${VARBASE}/log/glusterfs
 BUILD_DEFS+=		VARBASE
@@ -151,11 +151,6 @@ CONFIGURE_ARGS+=	--enable-debug
 
 .include "../../mk/bsd.prefs.mk"
 
-# only needed on Linux since glibc dropped RPC support
-.if ${OPSYS} != "Linux"
-CONFIGURE_ARGS+=	--without-libtirpc
-.endif
-
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/argp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/glusterfs/PLIST b/glusterfs/PLIST
index 591635ff04..d5336df6b1 100644
--- a/glusterfs/PLIST
+++ b/glusterfs/PLIST
@@ -336,24 +336,24 @@ share/doc/glusterfs/benchmarking/local-script.sh
 share/doc/glusterfs/benchmarking/rdd.c
 share/doc/glusterfs/glusterfs-mode.el
 share/doc/glusterfs/glusterfs.vim
+share/examples/glusterfs/eventsconfig.json
+share/examples/glusterfs/ganesha/ganesha-ha.conf.sample
+share/examples/glusterfs/gluster-rsyslog-5.8.conf
+share/examples/glusterfs/gluster-rsyslog-7.2.conf
+share/examples/glusterfs/glusterd.vol
+share/examples/glusterfs/glusterfs-georep-logrotate
+share/examples/glusterfs/glusterfs-logrotate
+share/examples/glusterfs/group-db-workload
+share/examples/glusterfs/group-distributed-virt
+share/examples/glusterfs/group-gluster-block
+share/examples/glusterfs/group-metadata-cache
+share/examples/glusterfs/group-nl-cache
+share/examples/glusterfs/group-samba
+share/examples/glusterfs/group-virt.example
+share/examples/glusterfs/gsyncd.conf
+share/examples/glusterfs/logger.conf.example
+share/examples/glusterfs/thin-arbiter.vol
 share/examples/rc.d/glusterd
-share/glusterfs/config/eventsconfig.json
-share/glusterfs/config/ganesha/ganesha-ha.conf.sample
-share/glusterfs/config/gluster-rsyslog-5.8.conf
-share/glusterfs/config/gluster-rsyslog-7.2.conf
-share/glusterfs/config/glusterd.vol
-share/glusterfs/config/glusterfs-georep-logrotate
-share/glusterfs/config/glusterfs-logrotate
-share/glusterfs/config/group-db-workload
-share/glusterfs/config/group-distributed-virt
-share/glusterfs/config/group-gluster-block
-share/glusterfs/config/group-metadata-cache
-share/glusterfs/config/group-nl-cache
-share/glusterfs/config/group-samba
-share/glusterfs/config/group-virt.example
-share/glusterfs/config/gsyncd.conf
-share/glusterfs/config/logger.conf.example
-share/glusterfs/config/thin-arbiter.vol
 share/glusterfs/scripts/eventsdash.py
 share/glusterfs/scripts/post-upgrade-script-for-quota.sh
 share/glusterfs/scripts/pre-upgrade-script-for-quota.sh
diff --git a/glusterfs/distinfo b/glusterfs/distinfo
index bc34ffbac2..17b8aac222 100644
--- a/glusterfs/distinfo
+++ b/glusterfs/distinfo
@@ -4,9 +4,9 @@ BLAKE2s (glusterfs-10.3.tar.gz) = c2f9b5670d1df7a787e445207caa421a949f1fb98cafb5
 SHA512 (glusterfs-10.3.tar.gz) = af7c8a15db48196a5f7022e4da87ae8d8d43a12c8968b242f40fb43ea562d1d214e75b3a67800f8594c97847e15c01367b6d464964252551d6f8d3e93fb0f832
 Size (glusterfs-10.3.tar.gz) = 8283537 bytes
 SHA1 (patch-configure.ac) = e4c2f65d6579aab9b62e28ba60b75ba542116811
-SHA1 (patch-events-src-Makefile.am) = 2eccb54787d1c91ec2fa8254ff4d841ec59872ff
-SHA1 (patch-events-tools-Makefile.am) = d020ed0d657f473bcc93d2a048693c90903fc3ea
-SHA1 (patch-extras-Makefile.am) = ac8f2452894c05f5961d2c4d9f047ecad62274af
-SHA1 (patch-extras-ganesha-config-Makefile.am) = 66edb599e9b644e934f29b6bdb9bf1076b46c6ff
-SHA1 (patch-geo-replication_Makefile.am) = 7ae32924d53a5d7d3f02dff6373fd5f26acfc763
+SHA1 (patch-events-src-Makefile.am) = 5a112994c9990962a19eecd3933dabb18d5db2b0
+SHA1 (patch-events-tools-Makefile.am) = b224ed16200befdb68e51eebd762257a0911e591
+SHA1 (patch-extras-Makefile.am) = e5dead8310eed0fa0c6b12aa7a0da52bbeb4d41b
+SHA1 (patch-extras-ganesha-config-Makefile.am) = 547f144948a394aa981a0b799cb7435681f8a5d5
+SHA1 (patch-geo-replication_Makefile.am) = 71c2b4fa9d14d8489db8eaff11f7801792f53122
 SHA1 (patch-libglusterfs-src-glusterfs-dict.h) = ebfdfe6ffbdda3532d15fe108d4214b1e9596304
diff --git a/glusterfs/patches/patch-events-src-Makefile.am b/glusterfs/patches/patch-events-src-Makefile.am
index d5b835e5e2..a6ea8f906b 100644
--- a/glusterfs/patches/patch-events-src-Makefile.am
+++ b/glusterfs/patches/patch-events-src-Makefile.am
@@ -9,7 +9,7 @@ Move config file examples into datadir/config.
  if BUILD_EVENTS
  eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR)
 -eventsconfdir = $(sysconfdir)/glusterfs
-+eventsconfdir = $(datadir)/config
++eventsconfdir = $(datadir)
  eventsconf_DATA = eventsconfig.json
  
  events_PYTHON += handlers.py
diff --git a/glusterfs/patches/patch-events-tools-Makefile.am b/glusterfs/patches/patch-events-tools-Makefile.am
index c52570a1ad..e16ec001ed 100644
--- a/glusterfs/patches/patch-events-tools-Makefile.am
+++ b/glusterfs/patches/patch-events-tools-Makefile.am
@@ -9,6 +9,6 @@ Move config file examples into datadir/config.
  
  if BUILD_EVENTS
 -scriptsdir = $(datadir)/glusterfs/scripts
-+scriptsdir = $(datadir)/scripts
++scriptsdir = $(datadir)/../../glusterfs/scripts
  scripts_SCRIPTS = eventsdash.py
  endif
diff --git a/glusterfs/patches/patch-extras-Makefile.am b/glusterfs/patches/patch-extras-Makefile.am
index 6510e914be..2ab4fb01c5 100644
--- a/glusterfs/patches/patch-extras-Makefile.am
+++ b/glusterfs/patches/patch-extras-Makefile.am
@@ -9,7 +9,7 @@ Move config file examples into datadir/config.
  		  ganesha
  
 -confdir = $(sysconfdir)/glusterfs
-+confdir = $(datadir)/config
++confdir = $(datadir)
  if WITH_SERVER
  conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \
  	    logger.conf.example glusterfs-georep-logrotate group-virt.example \
@@ -18,14 +18,14 @@ Move config file examples into datadir/config.
  endif
  
 -voldir = $(sysconfdir)/glusterfs
-+voldir = $(datadir)/config
++voldir = $(datadir)
  vol_DATA = thin-arbiter/thin-arbiter.vol
  if WITH_SERVER
  vol_DATA += glusterd.vol
  endif
  
 -scriptsdir = $(datadir)/glusterfs/scripts
-+scriptsdir = $(datadir)/scripts
++scriptsdir = $(datadir)/../../glusterfs/scripts
  scripts_SCRIPTS = thin-arbiter/setup-thin-arbiter.sh
  if WITH_SERVER
  scripts_SCRIPTS += post-upgrade-script-for-quota.sh \
diff --git a/glusterfs/patches/patch-extras-ganesha-config-Makefile.am b/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
index 410b1655b4..483f128a7c 100644
--- a/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
+++ b/glusterfs/patches/patch-extras-ganesha-config-Makefile.am
@@ -8,5 +8,5 @@ Move config file examples into datadir/config.
  EXTRA_DIST= ganesha-ha.conf.sample
  
 -confdir = $(sysconfdir)/ganesha
-+confdir = $(datadir)/config/ganesha
++confdir = $(datadir)/ganesha
  conf_DATA = ganesha-ha.conf.sample
diff --git a/glusterfs/patches/patch-geo-replication_Makefile.am b/glusterfs/patches/patch-geo-replication_Makefile.am
index 8edc875dce..d589255820 100644
--- a/glusterfs/patches/patch-geo-replication_Makefile.am
+++ b/glusterfs/patches/patch-geo-replication_Makefile.am
@@ -9,5 +9,5 @@ Move config file examples into datadir/config.
  EXTRA_DIST = gsyncd.conf.in
  
 -gsyncdconfdir = $(sysconfdir)/glusterfs/
-+gsyncdconfdir = $(datadir)/config/
++gsyncdconfdir = $(datadir)
  gsyncdconf_DATA = gsyncd.conf