From f7c7d9a1c522bb0d59723ba9f53f843c26e43d75 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 19 Aug 2005 18:12:36 +0000 Subject: 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. --- www/ap-ssl/Makefile | 10 +++++----- www/apache/Makefile | 6 +++--- www/apache2/Makefile | 8 ++++---- www/horde/Makefile | 16 ++++++++-------- www/horde3/Makefile | 16 ++++++++-------- www/iasp/Makefile | 20 ++++++++++---------- www/sarg/Makefile | 6 +++--- www/surfraw/Makefile | 4 ++-- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'www') 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} -- cgit v1.2.3