summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2005-08-19 18:12:36 +0000
committerjlam <jlam>2005-08-19 18:12:36 +0000
commitb99928fdbc9a42469c377a8a2847c9963522e04d (patch)
tree41d5fc337098f380e5f2c0106fb2d4d88fd977eb
parent6376ed41fdc7ad082a01122a4e0c6a6c0e82ae9c (diff)
downloadpkgsrc-b99928fdbc9a42469c377a8a2847c9963522e04d.tar.gz
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.
-rw-r--r--audio/oss/Makefile6
-rw-r--r--audio/xmcd/Makefile8
-rw-r--r--chat/gale/Makefile6
-rw-r--r--chat/i2cbd/Makefile7
-rw-r--r--chat/ircd-hybrid/Makefile10
-rw-r--r--chat/jabberd/Makefile4
-rw-r--r--chat/jabberd2/Makefile4
-rw-r--r--comms/asterisk/Makefile4
-rw-r--r--converters/libiconv/Makefile4
-rw-r--r--games/nethack-lib/Makefile6
-rw-r--r--games/xbill/Makefile4
-rw-r--r--games/xpat2/Makefile4
-rw-r--r--games/xsoldier/Makefile4
-rw-r--r--lang/blackdown-jre13/Makefile6
-rw-r--r--lang/jdk/Makefile6
-rw-r--r--lang/kaffe/Makefile4
-rw-r--r--lang/sun-jre13/Makefile6
-rw-r--r--lang/sun-jre14/Makefile6
-rw-r--r--lang/sun-jre15/Makefile8
-rw-r--r--mail/elm-me/Makefile4
-rw-r--r--mail/imp/Makefile20
-rw-r--r--mail/imp4/Makefile18
-rw-r--r--mail/mess822/Makefile4
-rw-r--r--mail/mutt-devel/Makefile4
-rw-r--r--mail/mutt/Makefile4
-rw-r--r--mail/turba/Makefile8
-rw-r--r--mk/install/bsd.pkginstall.mk51
-rw-r--r--net/djbdns/Makefile4
-rw-r--r--net/flow-tools/Makefile6
-rw-r--r--net/ja-samba/Makefile8
-rw-r--r--net/samba/Makefile6
-rw-r--r--net/snort/Makefile.common12
-rw-r--r--print/cups/Makefile10
-rw-r--r--security/fprot-workstation-bin/Makefile8
-rw-r--r--security/openssh+gssapi/Makefile11
-rw-r--r--security/openssh/Makefile11
-rw-r--r--security/uvscan/Makefile8
-rw-r--r--sysutils/apcupsd/Makefile6
-rw-r--r--sysutils/tob/Makefile6
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--sysutils/xentools20/Makefile8
-rw-r--r--textproc/icu/Makefile4
-rw-r--r--textproc/xmlcatmgr/Makefile6
-rw-r--r--wm/pwm/Makefile18
-rw-r--r--www/ap-ssl/Makefile10
-rw-r--r--www/apache/Makefile6
-rw-r--r--www/apache2/Makefile8
-rw-r--r--www/horde/Makefile16
-rw-r--r--www/horde3/Makefile16
-rw-r--r--www/iasp/Makefile20
-rw-r--r--www/sarg/Makefile6
-rw-r--r--www/surfraw/Makefile4
-rw-r--r--x11/gdm/Makefile8
53 files changed, 199 insertions, 251 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 8936eda0391..bc1a8ca61e2 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/19 18:12:36 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -47,9 +47,9 @@ FILES_SUBST+= MODSTAT=${MODSTAT}
SFILES= drums.o3 drums.sb oss.conf std.o3 std.sb
FILES_SUBST+= SFILES=${SFILES:Q}
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${OSSLIBDIR}/${FILE} /etc/${FILE}
+CONF_FILES+= ${OSSLIBDIR}/${FILE} /etc/${FILE}
.endfor
-SUPPORT_FILES+= ${OSSLIBDIR}/license.asc.eval ${OSSLIBDIR}/license.asc
+CONF_FILES+= ${OSSLIBDIR}/license.asc.eval ${OSSLIBDIR}/license.asc
RCD_SCRIPTS= oss
INSTALLATION_DIRS= bin sbin
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index d693aa53e36..5a6011070a1 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/19 18:12:36 jlam Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 4
@@ -34,9 +34,9 @@ _SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4711
SPECIAL_PERMS= ${ARCHBIN}/cda ${_SETUID_ROOT}
SPECIAL_PERMS+= ${ARCHBIN}/xmcd ${_SETUID_ROOT}
-SFILES= common.cfg device.cfg wwwwarp.cfg
-.for FILE in ${SFILES}
-SUPPORT_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
+CFILES= common.cfg device.cfg wwwwarp.cfg
+.for FILE in ${CFILES}
+CONF_FILES+= ${XMCDDIR}/config/${FILE}.dist ${XMCDDIR}/config/${FILE}
.endfor
MAKE_DIRS= ${XMCDDIR} ${XMCDDIR}/cdinfo ${XMCDDIR}/config ${XMCDDIR}/discog
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
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 65056adaf81..2e4b866e84b 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= asterisk-1.0.7
@@ -79,7 +79,7 @@ CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
res_config_odbc.conf res_odbc.conf rpt.conf rtp.conf sip.conf \
skinny.conf voicemail.conf vpb.conf zapata.conf asterisk.adsi \
telcordia-1.adsi
-SUPPORT_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
+CONF_FILES+= ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
.endfor
.undef _file_
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 4541263fe26..e644e511f8a 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/28 15:15:17 adam Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:37 jlam Exp $
DISTNAME= libiconv-1.10
CATEGORIES= converters
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
TEST_TARGET= check
EGDIR= ${PREFIX}/share/examples/libiconv
-SUPPORT_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
+CONF_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
MAKE_ENV+= PAX="${PAX}"
diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile
index 3bc619f636c..83b8858bcd9 100644
--- a/games/nethack-lib/Makefile
+++ b/games/nethack-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -14,9 +14,9 @@ INSTALL_TARGET= manpages install-dat
USE_PKGINSTALL= yes
-SUPPORT_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/record \
+CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/record \
${ROOT_USER} games 664
-SUPPORT_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/logfile \
+CONF_FILES_PERMS+= /dev/null ${PREFIX}/share/${NETHACK_DIR}/logfile \
${ROOT_USER} games 664
MAKE_DIRS_PERMS+= ${PREFIX}/share/${NETHACK_DIR} \
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 04a7923a0ce..b5053b17ab1 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/14 17:23:24 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= xbill-2.0
@@ -21,7 +21,7 @@ CPPFLAGS+= -DVARBASE=\"${VARBASE}\"
PKG_GROUPS= ${GAMEGRP}
MAKE_DIRS_PERMS+= ${VARBASE}/games ${BINOWN} ${GAMEGRP} 0775
MAKE_ENV+= GAMEGRP=${GAMEGRP} GAMEMODE=${GAMEMODE}
-SUPPORT_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= ${PREFIX}/share/examples/xbill.scores ${VARBASE}/games/xbill.scores ${BINOWN} ${GAMEGRP} ${GAMEDATAMODE}
post-install:
${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index c2f3c332782..c50c94a502b 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/16 18:18:13 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/19 18:12:37 jlam Exp $
DISTNAME= xpat2-1.07
CATEGORIES= games
@@ -16,7 +16,7 @@ USE_TOOLS+= imake
MAKE_ENV+= XPMDIR=${BUILDLINK_PREFIX.xpm:Q} XMKMF=${XMKMF_CMD:Q}
-SUPPORT_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE}
+CONF_FILES_PERMS= /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE}
MAKE_DIRS= /var/games
post-install:
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index e721c0d685c..a0646b5b230 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $
#
DISTNAME= xsoldier-0.96
@@ -15,7 +15,7 @@ NO_INSTALL_MANPAGES= YES
MAKE_ENV+= BINOWN=${BINOWN}
-SUPPORT_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
+CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
/var/games/xsoldier \
games games 0664
diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile
index f79d7704d4a..9760b88e1ab 100644
--- a/lang/blackdown-jre13/Makefile
+++ b/lang/blackdown-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/15 11:53:20 veego Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $
#
BD_BASENAME= j2re
@@ -36,9 +36,9 @@ SFILES+= font.properties font.properties.ja
SFILES+= font.properties.zh jvm.cfg
SFILES+= images/cursors/cursors.properties psfont.properties.ja
SFILES+= psfontj2d.properties security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
+CONF_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
.endfor
do-configure:
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index c201373919e..c7fda342552 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/19 18:12:37 jlam Exp $
#
VERSION= 1.1.8
@@ -57,9 +57,9 @@ SFILES+= font.properties.tr font.properties.zh_EUC_CN
SFILES+= font.properties.zh_TW_Big5 font.properties.zh_TW_EUC_TW
SFILES+= psfont.properties.ja serialver.properties
SFILES+= security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
do-configure:
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index fe7a7150858..54ea1406d2f 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/01/30 23:18:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.59 2005/08/19 18:12:37 jlam Exp $
#
.include "Makefile.common"
@@ -10,7 +10,7 @@ CONFLICTS+= kaffe-nox11-[0-9]*
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \
javap jdb rmic rmiregistry serialver
-SUPPORT_FILES= ${JAVA_HOME}/jre/lib/security/java.security.default \
+CONF_FILES= ${JAVA_HOME}/jre/lib/security/java.security.default \
${JAVA_HOME}/jre/lib/security/java.security
.include "../../mk/bsd.prefs.mk"
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index 32e4657a180..d53a3159ecb 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/01/30 23:18:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/19 18:12:37 jlam Exp $
DISTNAME= j2re-1_3_1_15-linux-i586
PKGNAME= sun-jre13-1.0.15
@@ -22,9 +22,9 @@ SFILES+= font.properties font.properties.ja
SFILES+= font.properties.zh images/cursors/cursors.properties
SFILES+= jvm.cfg psfont.properties.ja
SFILES+= psfontj2d.properties security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
do-configure:
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 2e3c4458827..ea1972a58ee 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/08/14 10:15:55 dillo Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:37 jlam Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -29,9 +29,9 @@ SFILES+= font.properties.ja font.properties.zh.Turbo
SFILES+= images/cursors/cursors.properties i386/jvm.cfg
SFILES+= logging.properties psfont.properties.ja
SFILES+= psfontj2d.properties security/java.security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre14
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index d1f265d0f73..7eb26596334 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/08/14 10:15:55 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:37 jlam Exp $
# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
@@ -20,10 +20,10 @@ OWN_DIRS+= ${JAVA_HOME}/lib/applet
OWN_DIRS+= ${JAVA_HOME}/lib/images
OWN_DIRS+= ${JAVA_HOME}/lib/images/cursors
OWN_DIRS+= ${JAVA_HOME}/lib/security
-SUPPORT_FILES= # empty
+CONF_FILES= # empty
.sinclude "sfiles.mk"
.for FILE in ${SFILES}
-SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
.endfor
PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre15
@@ -54,7 +54,7 @@ do-configure:
cd ${WRKSRC}/lib; for file in ${SFILES}; do \
${MV} -f $$file $$file.default; \
done
- @${ECHO} 'SUPPORT_FILES="${SUPPORT_FILES}"' >${HEADER_EXTRA_TMPL}
+ @${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_EXTRA_TMPL}
.if !empty(PKG_OPTIONS:Msun-jre-jce)
cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
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
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk
index 5023bff8054..31539af1358 100644
--- a/mk/install/bsd.pkginstall.mk
+++ b/mk/install/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.10 2005/08/19 17:20:33 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.11 2005/08/19 18:12:38 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -261,18 +261,14 @@ ${INSTALL_PERMS_FILE}: ../../mk/install/perms
# MLINKS in the base system. At post-install time, if the true config
# file doesn't exist, then the example one is copied into place. At
# deinstall time, the true one is removed if it doesn't differ from the
-# example one. SUPPORT_FILES is used the same way, but the package
-# admin isn't prompted to customize the file at post-install time.
+# example one.
#
-# CONF_FILES_MODE and SUPPORT_FILES_MODE are the file permissions for the
-# files in CONF_FILES and SUPPORT_FILES, respectively.
+# CONF_FILES_MODE is the file permissions for the files in CONF_FILES.
#
# CONF_FILES_PERMS are lists that look like:
# example_file config_file user group mode
# and works like CONF_FILES, except the config files are owned by
-# user:group have mode permissions. SUPPORT_FILES_PERMS is used in the
-# same way, but the package admin isn't prompted to customize the file
-# at post-install time.
+# user:group have mode permissions.
#
# RCD_SCRIPTS works lists the basenames of the rc.d scripts. They are
# expected to be found in ${PREFIX}/share/examples/rc.d, and
@@ -285,9 +281,6 @@ ${INSTALL_PERMS_FILE}: ../../mk/install/perms
CONF_FILES?= # empty
CONF_FILES_MODE?= 0644
CONF_FILES_PERMS?= # empty
-SUPPORT_FILES?= # empty
-SUPPORT_FILES_MODE?= 0644
-SUPPORT_FILES_PERMS?= # empty
RCD_SCRIPTS?= # empty
RCD_SCRIPTS_MODE?= 0755
RCD_SCRIPTS_EXAMPLEDIR= share/examples/rc.d
@@ -307,20 +300,10 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
*) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
esac; }
${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
- case "${SUPPORT_FILES:M*:Q}" in \
- "") ;; \
- *) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
- esac; }
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
case "${CONF_FILES_PERMS:M*:Q}" in \
"") ;; \
*) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
esac; }
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
- case "${SUPPORT_FILES_PERMS:M*:Q}" in \
- "") ;; \
- *) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
- esac; }
${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${.TARGET}.tmp || { \
${ECHO} "# start of install-files"; \
${ECHO} "#"; \
@@ -348,19 +331,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
} >> ${.TARGET}.tmp
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
${TEST} ! -f ${.TARGET}.tmp || { \
- eval set -- __dummy ${SUPPORT_FILES}; \
- while ${TEST} $$# -gt 0; do \
- if ${TEST} "$$1" = "__dummy"; then shift; continue; fi; \
- egfile="$$1"; file="$$2"; \
- shift; shift; \
- egfile=`strip_prefix "$$egfile"`; \
- file=`strip_prefix "$$file"`; \
- ${ECHO} "# FILE: $$file c $$egfile ${SUPPORT_FILES_MODE}"; \
- done; \
- } >> ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- ${TEST} ! -f ${.TARGET}.tmp || { \
- eval set -- __dummy ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS}; \
+ eval set -- __dummy ${CONF_FILES_PERMS}; \
while ${TEST} $$# -gt 0; do \
if ${TEST} "$$1" = "__dummy"; then shift; continue; fi; \
egfile="$$1"; file="$$2"; \
@@ -470,16 +441,6 @@ ${INSTALL_DIRS_FILE}: ../../mk/install/dirs
*) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
esac; }
${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
- case "${SUPPORT_FILES:M*:Q}" in \
- "") ;; \
- *) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
- esac; }
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
- case "${SUPPORT_FILES_PERMS:M*:Q}" in \
- "") ;; \
- *) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
- esac; }
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -f ${.TARGET}.tmp || { \
case "${RCD_SCRIPTS:M*:Q}" in \
"") ;; \
*) ${TOUCH} ${TOUCH_FLAGS} ${.TARGET}.tmp ;; \
@@ -518,7 +479,7 @@ ${INSTALL_DIRS_FILE}: ../../mk/install/dirs
${ECHO} ""; \
} >> ${.TARGET}.tmp
${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${.TARGET}.tmp || { \
- case "${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*Q}${SUPPORT_FILES:M*:Q}${SUPPORT_FILES_PERMS:M*:Q}" in \
+ case "${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*Q}" in \
"") ;; \
*) ${ECHO} "# DIR: ${PKG_SYSCONFDIR:S/${PREFIX}\///} m" ;; \
esac; \
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
diff --git a/print/cups/Makefile b/print/cups/Makefile
index cf11b2140b3..30052c1037d 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/08/10 23:37:08 salo Exp $
+# $NetBSD: Makefile,v 1.96 2005/08/19 18:12:38 jlam Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -92,10 +92,10 @@ PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user
SPECIAL_PERMS= ${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755
CONF_FILES= ${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf
CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
-SUPPORT_FILES= ${EGDIR}/classes.conf ${CUPS_CONFDIR}/classes.conf
-SUPPORT_FILES+= ${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
-SUPPORT_FILES+= ${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
-SUPPORT_FILES+= ${EGDIR}/printers.conf ${CUPS_CONFDIR}/printers.conf
+CONF_FILES+= ${EGDIR}/classes.conf ${CUPS_CONFDIR}/classes.conf
+CONF_FILES+= ${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
+CONF_FILES+= ${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
+CONF_FILES+= ${EGDIR}/printers.conf ${CUPS_CONFDIR}/printers.conf
RCD_SCRIPTS= cupsd
OWN_DIRS= ${CUPS_CONFDIR}
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
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
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index b1b587d61bc..12a114e6674 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/24 16:44:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/19 18:12:39 jlam Exp $
#
DISTNAME= icu-3.2
@@ -28,7 +28,7 @@ PKG_SYSCONFSUBDIR= icu
CONVRTRS_EG= ${CONVRTRS_EG_DIR}/convrtrs.txt
CONVRTRS_EG_DIR= ${PREFIX}/share/examples/icu
-SUPPORT_FILES+= ${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt
+CONF_FILES+= ${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt
.include "../../mk/pthread.buildlink3.mk"
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 19110efa692..cce6baceb59 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:39 jlam Exp $
#
DISTNAME= xmlcatmgr-2.2
@@ -20,9 +20,9 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
EGDIR= ${PREFIX}/share/examples/xmlcatmgr
CONF_FILES= ${EGDIR}/catalog.etc.sgml ${PKG_SYSCONFDIR}/sgml/catalog
CONF_FILES+= ${EGDIR}/catalog.etc.xml ${PKG_SYSCONFDIR}/xml/catalog
+CONF_FILES+= ${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
+CONF_FILES+= ${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
MAKE_DIRS= ${PREFIX}/share/sgml ${PREFIX}/share/xml
-SUPPORT_FILES= ${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
-SUPPORT_FILES+= ${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ { next; }
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index ba03b97f9c0..7ecb2bbfb03 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/19 18:12:39 jlam Exp $
#
DISTNAME= pwm-20030617
@@ -24,14 +24,14 @@ PKG_SYSCONFSUBDIR= pwm
EGDIR= ${PREFIX}/share/examples/pwm
CONF_FILES= ${EGDIR}/pwm.conf.default ${PKG_SYSCONFDIR}/pwm.conf
-SUPPS= buttons-default.conf
-SUPPS+= keys-default.conf
-SUPPS+= menus-default.conf
-SUPPS+= look-beoslike.conf
-SUPPS+= look-brownsteel.conf
-SUPPORT_FILES= # empty
-.for FILE in ${SUPPS}
-SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONFS= buttons-default.conf
+CONFS+= keys-default.conf
+CONFS+= menus-default.conf
+CONFS+= look-beoslike.conf
+CONFS+= look-brownsteel.conf
+CONF_FILES= # empty
+.for FILE in ${CONFS}
+CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
.endfor
.include "../../mk/x11.buildlink3.mk"
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 51205a4de74..8dbce000227 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2005/07/14 04:04:58 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2005/08/19 18:12:39 jlam Exp $
DISTNAME= mod_ssl-2.8.23-1.3.33
PKGNAME= ap-ssl-2.8.23
@@ -38,13 +38,13 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.prm
OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/ssl.key \
${ROOT_USER} ${ROOT_GROUP} 0700
-SUPPORT_FILES= # empty
-SUPPS= ssl.crl/Makefile.crl ssl.crl/README.CRL \
+CONF_FILES= # empty
+CONFS= ssl.crl/Makefile.crl ssl.crl/README.CRL \
ssl.crt/Makefile.crt ssl.crt/README.CRT \
ssl.csr/README.CSR ssl.csr/README.CSR \
ssl.key/README.KEY ssl.prm/README.PRM
-.for FILE in ${SUPPS}
-SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+.for FILE in ${CONFS}
+CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
.endfor
.include "../../security/openssl/buildlink3.mk"
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 8f2d58b70d6..6371c19ee40 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2005/05/31 20:00:43 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2005/08/19 18:12:39 jlam Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -137,8 +137,8 @@ BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
EGDIR= ${PREFIX}/share/examples/httpd
CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
-SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
-SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
+CONF_FILES+= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
+CONF_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
RCD_SCRIPTS= apache
MAKE_DIRS= ${PREFIX}/share/httpd
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a80a75d27de..135ea16fc2f 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2005/08/08 18:30:26 tron Exp $
+# $NetBSD: Makefile,v 1.78 2005/08/19 18:12:39 jlam Exp $
.include "Makefile.common"
@@ -74,9 +74,9 @@ EGDIR= ${PREFIX}/share/examples/httpd
SBINDIR= ${PREFIX}/sbin
CONF_FILES= ${EGDIR}/httpd-std.conf ${PKG_SYSCONFDIR}/httpd.conf
CONF_FILES+= ${EGDIR}/ssl-std.conf ${PKG_SYSCONFDIR}/ssl.conf
-SUPPORT_FILES= ${SBINDIR}/envvars-std ${SBINDIR}/envvars
-SUPPORT_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
-SUPPORT_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+CONF_FILES+= ${SBINDIR}/envvars-std ${SBINDIR}/envvars
+CONF_FILES+= ${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
+CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
RCD_SCRIPTS= apache
MAKE_DIRS= ${PREFIX}/share/httpd
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 282d624882c..472aa03a030 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/02 23:26:41 salo Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/19 18:12:39 jlam Exp $
DISTNAME= horde-2.2.8
PKGREVISION= 1
@@ -28,13 +28,13 @@ PKG_SYSCONFSUBDIR?= httpd
USE_PKGINSTALL= YES
CONF_FILES= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
CONF_FILES+= ${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php
-SUPPORT_FILES+= ${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
-SUPPORT_FILES+= ${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php
-SUPPORT_FILES+= ${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php
-SUPPORT_FILES+= ${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php
-SUPPORT_FILES+= ${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php
-SUPPORT_FILES+= ${HORDEDIR}/config/prefs.php.dist ${HORDEDIR}/config/prefs.php
-SUPPORT_FILES+= ${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php
+CONF_FILES+= ${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php
+CONF_FILES+= ${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php
+CONF_FILES+= ${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php
+CONF_FILES+= ${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php
+CONF_FILES+= ${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php
+CONF_FILES+= ${HORDEDIR}/config/prefs.php.dist ${HORDEDIR}/config/prefs.php
+CONF_FILES+= ${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php
post-patch:
cd ${WRKSRC}/scripts; \
diff --git a/www/horde3/Makefile b/www/horde3/Makefile
index d9a75c82da0..8713741b731 100644
--- a/www/horde3/Makefile
+++ b/www/horde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/02 23:07:30 salo Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/19 18:12:39 jlam Exp $
DISTNAME= horde-3.0.4
PKGREVISION= 1
@@ -38,25 +38,25 @@ CONF_FILES+= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
CONF_FILES_PERMS+= ${HORDEDIR}/config/conf.php.dist \
${HORDEDIR}/config/conf.php \
${APACHE_USER} ${ROOT_GROUP} 0640
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/conf.xml.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/conf.xml.dist \
${HORDEDIR}/config/conf.xml \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/mime_drivers.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/mime_drivers.php.dist \
${HORDEDIR}/config/mime_drivers.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/motd.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/motd.php.dist \
${HORDEDIR}/config/motd.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/nls.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/nls.php.dist \
${HORDEDIR}/config/nls.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/prefs.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/prefs.php.dist \
${HORDEDIR}/config/prefs.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/registry.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/registry.php.dist \
${HORDEDIR}/config/registry.php \
${APACHE_USER} ${ROOT_GROUP} 0440
-SUPPORT_FILES_PERMS+= ${HORDEDIR}/config/hooks.php.dist \
+CONF_FILES_PERMS+= ${HORDEDIR}/config/hooks.php.dist \
${HORDEDIR}/config/hooks.php \
${APACHE_USER} ${ROOT_GROUP} 0440
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index d322a74c5b8..e4d6ed138aa 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/19 18:12:39 jlam Exp $
.include "../iasp/Makefile.common"
@@ -31,16 +31,16 @@ USE_PKGINSTALL= yes
OWN_DIRS= ${IASP_DESTDIR}
OWN_DIRS_PERMS= ${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750
CONFDIR= ${IASP_DESTDIR}/properties
-SFILES= cdonts.properties dbserver.properties
-SFILES+= ejb.properties loadbalance.properties
-SFILES+= msmq.properties rules.properties
-SFILES+= security.properties server.properties
-SFILES+= servlets.properties
-SUPPORT_FILES= # empty
-.for FILE in ${SFILES}
-SUPPORT_FILES+= ${CONFDIR}/${FILE}.default ${CONFDIR}/${FILE}
+CFILES= cdonts.properties dbserver.properties
+CFILES+= ejb.properties loadbalance.properties
+CFILES+= msmq.properties rules.properties
+CFILES+= security.properties server.properties
+CFILES+= servlets.properties
+CONF_FILES= # empty
+.for FILE in ${CFILES}
+CONF_FILES+= ${CONFDIR}/${FILE}.default ${CONFDIR}/${FILE}
.endfor
-SUPPORT_FILES+= /dev/null ${IASP_DESTDIR}/properties/license
+CONF_FILES+= /dev/null ${IASP_DESTDIR}/properties/license
RCD_SCRIPTS= iasp iasp_admin
post-extract:
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 99c11e421e4..216cde20463 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/19 18:12:39 jlam Exp $
DISTNAME= sarg-1.4.1
CATEGORIES= www
@@ -43,8 +43,8 @@ MAKE_ENV+= PKG_FLAGS="-DSQUID_ACCESSLOG='\"${SQUID_ACCESSLOG}\"' \
-DSARG_REPORTSDIR='\"${SARG_REPORTSDIR}\"'" \
EGDIR="${EGDIR}"
-CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf
-SUPPORT_FILES= ${EGDIR}/exclude_codes ${PKG_SYSCONFDIR}/exclude_codes \
+CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \
+ ${EGDIR}/exclude_codes ${PKG_SYSCONFDIR}/exclude_codes \
${EGLNG}/Bulgarian_windows1251 \
${CFLNG}/Bulgarian_windows1251 \
${EGLNG}/Catalan ${CFLNG}/Catalan \
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 955f35e1a02..0c704da458a 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:39 jlam Exp $
#
DISTNAME= surfraw-1.0.7
@@ -25,7 +25,7 @@ DOCDIR= ${PREFIX}/share/doc/surfraw
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
-SUPPORT_FILES= ${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
+CONF_FILES+= ${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4fe794c9b09..b72c6e9db89 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2005/08/10 20:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2005/08/19 18:12:39 jlam Exp $
#
DISTNAME= gdm-2.8.0.0
@@ -55,11 +55,11 @@ CONF_FILES= ${EGDIR}/dm/Sessions/default.desktop \
CONF_FILES+= ${EGDIR}/gdm/${f} \
${PKG_SYSCONFDIR}/gdm/${f}
.endfor
-SUPPORT_FILES_MODE= 0755
.for f in Init/Default PostSession/Default PreSession/Default \
XKeepsCrashing Xsession
-SUPPORT_FILES+= ${EGDIR}/gdm/${f} \
- ${PKG_SYSCONFDIR}/gdm/${f}
+CONF_FILES_PERMS+= ${EGDIR}/gdm/${f} \
+ ${PKG_SYSCONFDIR}/gdm/${f} \
+ ${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
RCD_SCRIPTS= gdm