CVS commit: pkgsrc/filesystems/glusterfs

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Aug 31 23:55:39 UTC 2020

Modified Files:
        pkgsrc/filesystems/glusterfs: Makefile

Log Message:
filesystems/glusterfs: Adjust SUBST to current reality

Drop two SUBST blocks that no longer do anything.
Change a SUBST pattern to adjust to the file in newer releases.

Builds on netbsd-8.  OK manu@.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/filesystems/glusterfs/Makefile

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.100 pkgsrc/filesystems/glusterfs/Makefile:1.101
--- pkgsrc/filesystems/glusterfs/Makefile:1.100 Mon Jul 27 16:06:08 2020
+++ pkgsrc/filesystems/glusterfs/Makefile       Mon Aug 31 23:55:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2020/07/27 16:06:08 manu Exp $
+# $NetBSD: Makefile,v 1.101 2020/08/31 23:55:38 gdt Exp $
 
 DISTNAME=      glusterfs-8.0
 PKGREVISION=   1
@@ -81,20 +81,14 @@ SUBST_STAGE.mtab=   post-build
 SUBST_FILES.mtab=      doc/mount.glusterfs.8
 SUBST_FILES.mtab=      libglusterfs/src/compat.h
 SUBST_FILES.mtab=      xlators/mount/fuse/utils/mount.glusterfs.in
-SUBST_SED.mtab=                -e "s,/etc/mtab,/proc/mounts,g"
+SUBST_SED.mtab=                -e "s,mtab,/proc/mounts,g"
 
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       pre-build
 SUBST_FILES.etc+=      libglusterfs/src/logging.c
-SUBST_FILES.etc+=      extras/ocf/volume
 SUBST_FILES.etc+=      doc/glusterfsd.8
 SUBST_SED.etc=         -e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
 
-SUBST_CLASSES+=                vol
-SUBST_STAGE.vol=       post-build
-SUBST_FILES.vol=       extras/Makefile
-SUBST_SED.vol=         -e "/vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
-
 #EGDIR=                        ${PREFIX}/etc/glusterfs
 #CONF_FILES+=          ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
 OWN_DIRS+=             ${VARBASE}/log/glusterfs