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, 14 insertions, 24 deletions

diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 61ecc5a6447..6316a1fe3ea 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/16 19:10:40 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/19 18:12:38 jlam Exp $
 #
 
 DISTNAME=		#defined
@@ -34,9 +34,9 @@ FPDIR=			${PREFIX}/libexec/fprot-workstation-bin
 FILES_SUBST+=		FPDIR=${FPDIR:Q}
 FILES_SUBST+=		DATDIR=${DATDIR:Q}
 
-SUPPORT_FILES=          ${DATDIR}/MACRO.DEF ${FPDIR}/MACRO.DEF
-SUPPORT_FILES+=         ${DATDIR}/SIGN.DEF ${FPDIR}/SIGN.DEF
-SUPPORT_FILES+=         ${DATDIR}/SIGN2.DEF ${FPDIR}/SIGN2.DEF
+CONF_FILES=		${DATDIR}/MACRO.DEF ${FPDIR}/MACRO.DEF
+CONF_FILES+=		${DATDIR}/SIGN.DEF ${FPDIR}/SIGN.DEF
+CONF_FILES+=		${DATDIR}/SIGN2.DEF ${FPDIR}/SIGN2.DEF
 OWN_DIRS=               ${FPDIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index d948d1c9661..e6d67708bb6 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/19 18:12:38 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -114,8 +114,7 @@ ASKPASS_PROGRAM=	${X11PREFIX}/bin/ssh-askpass
 CONFIGURE_ENV+=		ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
 MAKE_ENV+=		ASKPASS_PROGRAM=${ASKPASS_PROGRAM}
 
-CONFS=			ssh_config sshd_config
-SUPPS=			moduli
+CONFS=			ssh_config sshd_config moduli
 
 .if exists(/dev/urandom)
 MESSAGE_SRC+=		${.CURDIR}/MESSAGE.urandom
@@ -130,10 +129,6 @@ CONF_FILES=		# empty
 .for FILE in ${CONFS}
 CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .endfor
-SUPPORT_FILES=		# empty
-.for FILE in ${SUPPS}
-SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
-.endfor
 OWN_DIRS=		${OPENSSH_CHROOT}
 RCD_SCRIPTS=		sshd
 
@@ -150,7 +145,7 @@ pre-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
+	cd ${WRKSRC}; for file in ${CONFS}; do				\
 		${INSTALL_DATA} $${file}.out ${EGDIR}/$${file};		\
 	done
 #.if !empty(PKT_OPTIONS:Mpam)
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index ed724627608..ca81dbcd71d 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2005/07/28 17:54:57 reed Exp $
+# $NetBSD: Makefile,v 1.155 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		openssh-3.9p1
 PKGNAME=		openssh-3.9.1
@@ -116,8 +116,7 @@ CONFIGURE_ARGS+=	--with-xauth=${X11BASE}/bin/xauth
 CONFIGURE_ARGS+=	--with-xauth=${X11PREFIX}/bin/xauth
 .endif
 
-CONFS=			ssh_config sshd_config
-SUPPS=			moduli
+CONFS=			ssh_config sshd_config moduli
 
 .if exists(/dev/urandom)
 .  if ${OPSYS} == "NetBSD"
@@ -134,10 +133,6 @@ CONF_FILES=		# empty
 .for FILE in ${CONFS}
 CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 .endfor
-SUPPORT_FILES=		# empty
-.for FILE in ${SUPPS}
-SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
-.endfor
 OWN_DIRS=		${OPENSSH_CHROOT}
 RCD_SCRIPTS=		sshd
 
@@ -152,7 +147,7 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
+	cd ${WRKSRC}; for file in ${CONFS}; do				\
 		${INSTALL_DATA} $${file}.out ${EGDIR}/$${file};		\
 	done
 .if !empty(PKG_OPTIONS:MPAM) && ${OPSYS} == "Linux"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index cd0d420cc69..3823e8d087b 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/19 14:23:48 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/19 18:12:38 jlam Exp $
 
 DISTNAME=		vlnx424e
 PKGNAME=		uvscan-4.24.1
@@ -36,9 +36,9 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 FILES_SUBST+=		UVSCANDIR=${UVSCANDIR:Q}
 FILES_SUBST+=		DATFILES=${DATFILES:Q}
 
-SUPPORT_FILES=		${DATDIR}/clean.dat ${UVSCANDIR}/clean.dat
-SUPPORT_FILES+=		${DATDIR}/names.dat ${UVSCANDIR}/names.dat
-SUPPORT_FILES+=		${DATDIR}/scan.dat ${UVSCANDIR}/scan.dat
+CONF_FILES=		${DATDIR}/clean.dat ${UVSCANDIR}/clean.dat
+CONF_FILES+=		${DATDIR}/names.dat ${UVSCANDIR}/names.dat
+CONF_FILES+=		${DATDIR}/scan.dat ${UVSCANDIR}/scan.dat
 OWN_DIRS=		${UVSCANDIR}
 
 INSTALLATION_DIRS=	bin man/man1 sbin