Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS

as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files.  Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.

5 files changed, 15 insertions, 16 deletions

diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 7237465ed72..0d8e15ed308 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:36 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -28,8 +28,8 @@ EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 PKG_GROUPS=		gale
 PKG_USERS=		gale:gale
 
-SUPPORT_FILES=		${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
-SUPPORT_FILES+=		${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
+CONF_FILES=		${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
+CONF_FILES+=		${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
 OWN_DIRS=		${PKG_SYSCONFDIR}
 OWN_DIRS+=		${PKG_SYSCONFDIR}/auth
 OWN_DIRS+=		${PKG_SYSCONFDIR}/auth/private
diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile
index 45f36e0a31c..7943c960e1d 100644
--- a/chat/i2cbd/Makefile
+++ b/chat/i2cbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/23 09:03:12 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/19 18:12:36 jlam Exp $
 #
 
 DISTNAME=	i2cbd-2.0_BETA1
@@ -21,14 +21,13 @@ PLIST_SUBST+=		ICBD_OWNER=${ICBD_OWNER}
 PKG_SYSCONFSUBDIR=	icbd
 EGDIR=			${PREFIX}/share/examples/i2cbd
 EGFILES=		motd icbd_help icbd.deny news.1
-CONF_FILES_PERMS=
+CONF_FILES_PERMS=	# empty
 .for f in ${EGFILES}
 CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
 			${ICBD_OWNER} ${ROOT_GROUP} 644
 .endfor
 .undef f
-
-SUPPORT_FILES_PERMS=	/dev/null /var/log/icbd.log \
+CONF_FILES_PERMS+=	/dev/null /var/log/icbd.log \
 			${ICBD_OWNER} ${ROOT_GROUP} 644
 
 post-extract:
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index c4f335ff798..f37e62dc001 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/12 04:15:50 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:36 jlam Exp $
 #
 
 DISTNAME=	ircd-hybrid-6.2
@@ -110,14 +110,14 @@ RCD_SCRIPTS=		ircd-hybrid
 PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\\ User::${NOLOGIN}
 PKG_GROUPS=		${IRCD_HYBRID_IRC_GROUP}
 
-SUPPORT_FILES=		${PREFIX}/share/examples/ircd-hybrid/opers.txt \
+CONF_FILES=		${PREFIX}/share/examples/ircd-hybrid/opers.txt \
 			${IRCD_HYBRID_DPATH}/opers.txt
-SUPPORT_FILES_PERMS=	/dev/null ${IRCD_HYBRID_FNAME_OPERLOG} \
+CONF_FILES_PERMS=	/dev/null ${IRCD_HYBRID_FNAME_OPERLOG} \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
-SUPPORT_FILES_PERMS+=	/dev/null ${IRCD_HYBRID_FNAME_USERLOG} \
+CONF_FILES_PERMS+=	/dev/null ${IRCD_HYBRID_FNAME_USERLOG} \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
 .if ${IRCD_HYBRID_USE_LOGFILE} == "YES"
-SUPPORT_FILES_PERMS+=	/dev/null ${IRCD_HYBRID_LPATH} \
+CONF_FILES_PERMS+=	/dev/null ${IRCD_HYBRID_LPATH} \
 			${IRCD_HYBRID_IRC_USER} ${IRCD_HYBRID_IRC_GROUP} 600
 .endif
 
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 160242265d5..6750f0e2267 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/19 18:12:37 jlam Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -52,7 +52,7 @@ OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 750
 .undef f
 
 CONF_FILES=		${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml
-SUPPORT_FILES=		${EGDIR}/platform-settings \
+CONF_FILES+=		${EGDIR}/platform-settings \
 			${PKG_SYSCONFDIR}/platform-settings
 
 INSTALLATION_DIRS=	sbin
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 210f19170e3..4b5ee0c3f3e 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/03 22:21:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/19 18:12:37 jlam Exp $
 #
 
 DISTNAME=		jabberd-2.0s9
@@ -51,7 +51,7 @@ PKG_USERS=              ${JABBERD_USER}:${JABBERD_GROUP}
 
 BINDIR=			${PREFIX}/bin
 EGDIR=			${PREFIX}/share/examples/jabberd
-SUPPORT_FILES=          ${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
+CONF_FILES=		${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
 
 FILES=			c2s.xml resolver.xml router.xml			\
 			router-users.xml s2s.xml sm.xml