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.

4 files changed, 12 insertions, 12 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index e238fb1e095..80bc17f5878 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/06/24 19:09:41 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		apcupsd-3.8.6
 PKGREVISION=		4
@@ -39,13 +39,13 @@ CONFIGURE_ENV+=		SCRIPTSHELL="${TOOLS_SH}"
 
 EGDIR=          ${PREFIX}/share/examples/apcupsd
 
-CONF_FILES_PERMS+=     ${EGDIR}/apcupsd.master.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${ROOT_USER} ${ROOT_GROUP} 644
+CONF_FILES_PERMS+= ${EGDIR}/apcupsd.master.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${ROOT_USER} ${ROOT_GROUP} 644
 CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/mainsback ${PKG_SYSCONFDIR}/mainsback ${ROOT_USER} ${ROOT_GROUP} 755
-SUPPORT_FILES_PERMS=  ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755
 RCD_SCRIPTS=	apcupsd
 RCD_SCRIPT_SRC.apcupsd=	${WRKSRC}/distributions/netbsd/apcupsd
 
diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile
index 9bd0fe8bc77..930effeeacf 100644
--- a/sysutils/tob/Makefile
+++ b/sysutils/tob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=	tob-0.25
 CATEGORIES=	sysutils
@@ -13,8 +13,8 @@ USE_PKGINSTALL=	yes
 
 EGDIR=		${PREFIX}/share/examples/tob
 CONF_FILES=	${EGDIR}/tob.rc ${PKG_SYSCONFDIR}/tob/tob.rc
-SUPPORT_FILES=	${EGDIR}/example.exclude ${PKG_SYSCONFDIR}/tob/volumes/example.exclude
-SUPPORT_FILES+=	${EGDIR}/example.startdir ${PKG_SYSCONFDIR}/tob/volumes/example.startdir
+CONF_FILES+=	${EGDIR}/example.exclude ${PKG_SYSCONFDIR}/tob/volumes/example.exclude
+CONF_FILES+=	${EGDIR}/example.startdir ${PKG_SYSCONFDIR}/tob/volumes/example.startdir
 
 INSTALLATION_DIRS=	man/man8 sbin
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 197b0753080..1f3812029f2 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:24 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:39 jlam Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
@@ -32,7 +32,7 @@ CONFIGURE_ENV+=	AUDIO_LIBS=${LIBOSSAUDIO}
 DOCDIR=		${PREFIX}/share/doc/xcdroast
 DOCFILES=	DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf
 HTMLDIR=	${PREFIX}/share/doc/html/xcdroast
-SUPPORT_FILES=	/dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
+CONF_FILES=	/dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
 
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 0194ee8a17d..e51ae4d77c0 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/08/19 13:06:31 bouyer Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:39 jlam Exp $
 #
 
 DISTNAME=		xen-2.0.7-src
@@ -80,13 +80,13 @@ INSTALLATION_DIRS=	share/examples/xen
 XEND_SCRIPTS=		network vif-bridge block-enbd block-file	\
 			xmexample1 xmexample2 xmexample3
 
-SUPPORT_FILES=		${EGDIR}/xend-config.sxp \
+CONF_FILES=		${EGDIR}/xend-config.sxp \
 			${PKG_SYSCONFDIR}/xend-config.sxp
 .for f in ${XEND_SCRIPTS}
-SUPPORT_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-SUPPORT_FILES_MODE=	0755
+CONF_FILES_MODE=	0755
 
 pre-build:
 	${MKDIR} ${WRKSRC}/libxc/xen/NetBSD