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, 17 insertions, 19 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 52b0600435a..85026ab4b2b 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/08/19 04:44:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.49 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=		7
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/djbdns
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 USE_PKGINSTALL=		yes
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
-SUPPORT_FILES+=		${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
+CONF_FILES+=		${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
 PLIST_SRC=		${PKGDIR}/PLIST
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index be16d237457..18ebcf217a6 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 12:54:02 seb Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=	flow-tools-0.68
 PKGREVISION=	1
@@ -19,11 +19,9 @@ EGDIR=		${PREFIX}/share/examples/flow-tools
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/sym
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/cfg
 
-# These files are config files that are unlikely to be modified in most cases
-# so we install them via SUPPORT_FILES.
 _SYM_FILES=	ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
 .for _f_ in ${_SYM_FILES}
-SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
+CONF_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
 .endfor
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index ee88122acc8..edf5c14d361 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/08 16:47:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_VERSION}-ja-${JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -113,11 +113,11 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 USE_PKGINSTALL=		YES
 CONF_FILES=		${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
-SUPPORT_FILES_PERMS+=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
+CONF_FILES_PERMS+=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
 			${ROOT_USER} ${ROOT_GROUP} 0555
-SUPPORT_FILES_PERMS+=	${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
+CONF_FILES_PERMS+=	${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
 			${ROOT_USER} ${ROOT_GROUP} 0555
-#SUPPORT_FILES_PERMS=	${SMBPASSWD_FILE}
+#CONF_FILES_PERMS=	${SMBPASSWD_FILE}
 MAKE_DIRS=		${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
 OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 47a767f4a17..b7087196eb6 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2005/06/06 07:02:23 taca Exp $
+# $NetBSD: Makefile,v 1.146 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		samba-3.0.14a
 PKGREVISION=		1
@@ -93,9 +93,9 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
 USE_PKGINSTALL=		yes
 CONF_FILES=		${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
-SUPPORT_FILES_PERMS=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser	\
+CONF_FILES_PERMS=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser	\
 			${ROOT_USER} ${ROOT_GROUP} 0755
-SUPPORT_FILES_PERMS+=	${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser	\
+CONF_FILES_PERMS+=	${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser	\
 			${ROOT_USER} ${ROOT_GROUP} 0755
 MAKE_DIRS=		${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 7d2a69b18fe..c75f44bcd3e 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2005/08/13 19:56:47 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/08/19 18:12:38 jlam Exp $
 #
 
 DISTNAME=		snort-2.4.0
@@ -36,15 +36,15 @@ CONF_FILES+=		${EGDIR}/classification.config \
 			${PKG_SYSCONFDIR}/classification.config
 CONF_FILES+=		${EGDIR}/reference.config \
 			${PKG_SYSCONFDIR}/reference.config
-SUPPORT_FILES+=		${EGDIR}/gen-msg.map \
+CONF_FILES+=		${EGDIR}/gen-msg.map \
 			${PKG_SYSCONFDIR}/gen-msg.map
-SUPPORT_FILES+=		${EGDIR}/generators \
+CONF_FILES+=		${EGDIR}/generators \
 			${PKG_SYSCONFDIR}/generators
-SUPPORT_FILES+=		${EGDIR}/sid \
+CONF_FILES+=		${EGDIR}/sid \
 			${PKG_SYSCONFDIR}/sid
-SUPPORT_FILES+=		${EGDIR}/sid-msg.map \
+CONF_FILES+=		${EGDIR}/sid-msg.map \
 			${PKG_SYSCONFDIR}/sid-msg.map
-SUPPORT_FILES+=		${EGDIR}/unicode.map \
+CONF_FILES+=		${EGDIR}/unicode.map \
 			${PKG_SYSCONFDIR}/unicode.map
 
 EGDIR=			${PREFIX}/share/examples/snort