From 6d1c6b0f339d44a3ddc4d7c84d04cef4285cfc32 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/apache2/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'www/apache2/Makefile') 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 -- cgit v1.2.3