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.

7 files changed, 31 insertions, 31 deletions

diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 1fac3a89a12..d93369cae77 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:37 jlam Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=		-S
 
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/nls
 
-SUPPORT_FILES=		${PREFIX}/lib/elm.mimetypes-dist		\
+CONF_FILES=		${PREFIX}/lib/elm.mimetypes-dist		\
 			${PREFIX}/lib/elm.mimetypes
 
 pre-configure:
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 03ef2ce9ea3..f5b994e6ba3 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/02 23:28:11 salo Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/19 18:12:37 jlam Exp $
 
 DISTNAME=	imp-3.2.8
 PKGREVISION=	1
@@ -27,25 +27,25 @@ USE_PKGINSTALL=		yes
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
-CONF_FILES+=	${IMPDIR}/config/conf.php.dist			\
+CONF_FILES+=	${IMPDIR}/config/conf.php.dist				\
 		${IMPDIR}/config/conf.php
 CONF_FILES+=	${IMPDIR}/config/servers.php.dist			\
 		${IMPDIR}/config/servers.php
-SUPPORT_FILES+=	${IMPDIR}/config/filter.txt.dist			\
+CONF_FILES+=	${IMPDIR}/config/filter.txt.dist			\
 		${IMPDIR}/config/filter.txt
-SUPPORT_FILES+=	${IMPDIR}/config/header.txt.dist			\
+CONF_FILES+=	${IMPDIR}/config/header.txt.dist			\
 		${IMPDIR}/config/header.txt
-SUPPORT_FILES+=	${IMPDIR}/config/html.php.dist				\
+CONF_FILES+=	${IMPDIR}/config/html.php.dist				\
 		${IMPDIR}/config/html.php
-SUPPORT_FILES+=	${IMPDIR}/config/menu.php.dist		\
+CONF_FILES+=	${IMPDIR}/config/menu.php.dist				\
 		${IMPDIR}/config/menu.php
-SUPPORT_FILES+=	${IMPDIR}/config/mime_drivers.php.dist				\
+CONF_FILES+=	${IMPDIR}/config/mime_drivers.php.dist			\
 		${IMPDIR}/config/mime_drivers.php
-SUPPORT_FILES+=	${IMPDIR}/config/motd.php.dist			\
+CONF_FILES+=	${IMPDIR}/config/motd.php.dist				\
 		${IMPDIR}/config/motd.php
-SUPPORT_FILES+=	${IMPDIR}/config/prefs.php.dist			\
+CONF_FILES+=	${IMPDIR}/config/prefs.php.dist				\
 		${IMPDIR}/config/prefs.php
-SUPPORT_FILES+=	${IMPDIR}/config/trailer.txt.dist			\
+CONF_FILES+=	${IMPDIR}/config/trailer.txt.dist			\
 		${IMPDIR}/config/trailer.txt
 
 do-build:
diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 17ba6a887bd..695c287e17d 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/02 23:10:28 salo Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -34,28 +34,28 @@ PKG_SYSCONFSUBDIR?=	httpd
 CONF_FILES=		${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
 CONF_FILES+=		${IMPDIR}/config/servers.php.dist \
 			${IMPDIR}/config/servers.php
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/conf.xml.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/conf.xml.dist \
 			${IMPDIR}/config/conf.xml \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/filter.txt.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/filter.txt.dist \
 			${IMPDIR}/config/filter.txt \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/header.txt.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/header.txt.dist \
 			${IMPDIR}/config/header.txt \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/menu.php.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/menu.php.dist \
 			${IMPDIR}/config/menu.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/mime_drivers.php.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/mime_drivers.php.dist \
 			${IMPDIR}/config/mime_drivers.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/motd.php.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/motd.php.dist \
 			${IMPDIR}/config/motd.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/prefs.php.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/prefs.php.dist \
 			${IMPDIR}/config/prefs.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${IMPDIR}/config/trailer.txt.dist \
+CONF_FILES_PERMS+=	${IMPDIR}/config/trailer.txt.dist \
 			${IMPDIR}/config/trailer.txt \
 			${APACHE_USER} ${ROOT_GROUP} 0440
 
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 5e379ab282f..d9adbea8787 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/19 03:55:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/19 18:12:37 jlam Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -23,7 +23,7 @@ EGDIR=			${PREFIX}/share/examples/mess822
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 USE_PKGINSTALL=		yes
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
-SUPPORT_FILES+=		${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
+CONF_FILES+=		${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
 DJB_BUILD_TARGETS=	install instcheck
 
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 1c88e1cb175..6bb3edff80b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/08/02 12:57:02 tonio Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		mutt-1.5.9i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -52,7 +52,7 @@ INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 FILES_SUBST+=		DOCDIR=${DOCDIR}
 
 .if exists(${WRKSRC}/mutt_dotlock)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6055e57dbce..d7e89784da9 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2005/05/29 03:44:12 minskim Exp $
+# $NetBSD: Makefile,v 1.127 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -54,7 +54,7 @@ INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 FILES_SUBST+=		DOCDIR=${DOCDIR}
 
 .if exists(${WRKSRC}/mutt_dotlock)
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 6d0f025f114..49042641ac5 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -40,13 +40,13 @@ CONF_FILES_PERMS+=	${TURBADIR}/config/sources.php.dist \
 			${APACHE_USER} ${ROOT_GROUP} 0440
 CONF_FILES+=		${TURBADIR}/config/attributes.php.dist \
 			${TURBADIR}/config/attributes.php
-SUPPORT_FILES_PERMS+=	${TURBADIR}/config/conf.xml.dist \
+CONF_FILES_PERMS+=	${TURBADIR}/config/conf.xml.dist \
 			${TURBADIR}/config/conf.xml \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${TURBADIR}/config/menu.php.dist \
+CONF_FILES_PERMS+=	${TURBADIR}/config/menu.php.dist \
 			${TURBADIR}/config/menu.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+=	${TURBADIR}/config/prefs.php.dist \
+CONF_FILES_PERMS+=	${TURBADIR}/config/prefs.php.dist \
 			${TURBADIR}/config/prefs.php \
 			${APACHE_USER} ${ROOT_GROUP} 0440