PKG_SYSCONFDIR is where the configuration files for a package may be found.

This value may be customized in various ways:

PKG_SYSCONFBASE is the main config directory under which all package
	configuration files are to be found.

PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
	configuration files for a particular package may be found.

PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
	particular package.

Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
default location of ${PREFIX}/etc.

This obsoletes the use of CONFDIR, which was active for only 6 days, so no
need to have a workaround to still accept old CONFDIR settings.

24 files changed, 141 insertions, 136 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index cf9e9e4930e..1c26e3c2a63 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/11/21 17:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2001/11/25 18:59:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		RPLAY_TARGET=generic	# XXX generic, or oss, or sun?
 
 INFO_FILES=	RPLAY.info RPTP.info librplay.info rplay.info
@@ -25,7 +25,7 @@ RCD_SCRIPTS=	rplayd
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
 	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
-		${SED}	-e "s|/usr/local/etc|${CONFDIR}|g"		\
+		${SED}	-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"	\
 			-e "s|/usr/local|${PREFIX}|g"			\
 			$${manpage} > $${manpage}.pdone;		\
 		${MV} -f $${manpage}.pdone $${manpage};			\
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index e0e81b608f5..7069a6cba01 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/19 21:05:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/25 18:59:45 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -15,25 +15,28 @@ USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
 
 GNU_CONFIGURE= 		YES
-CONFIGURE_ARGS=		--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		PROG_GLIB_CONFIG="${GLIB_CONFIG}"
 
 CPPFLAGS+=		-I${BUILDLINK_DIR}/include/rsaref
 CPPFLAGS+=		-I${BUILDLINK_DIR}/include/w3c-libwww
 
+PKG_SYSCONFSUBDIR?=	gale
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
 PKG_USER=		gale
 PKG_GROUP=		gale
 
-SUPPORT_FILES=		${EGDIR}/COPYING ${CONFDIR}/gale/COPYING
-SUPPORT_FILES+=		${EGDIR}/ROOT ${CONFDIR}/gale/auth/trusted/ROOT
-OWN_DIRS=		${CONFDIR}/gale
-OWN_DIRS+=		${CONFDIR}/gale/auth
-OWN_DIRS+=		${CONFDIR}/gale/auth/private
-OWN_DIRS+=		${CONFDIR}/gale/auth/trusted
-OWN_DIRS_PERMS=		${CONFDIR}/gale/auth/cache ${SHAREOWN} ${SHAREGRP} 0777
-OWN_DIRS_PERMS+=	${CONFDIR}/gale/auth/local ${SHAREOWN} ${SHAREGRP} 1777
+SUPPORT_FILES=		${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
+SUPPORT_FILES+=		${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
+OWN_DIRS=		${PKG_SYSCONFDIR}
+OWN_DIRS+=		${PKG_SYSCONFDIR}/auth
+OWN_DIRS+=		${PKG_SYSCONFDIR}/auth/private
+OWN_DIRS+=		${PKG_SYSCONFDIR}/auth/trusted
+OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/auth/cache			\
+			${SHAREOWN} ${SHAREGRP} 0777
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/auth/local			\
+			${SHAREOWN} ${SHAREGRP} 1777
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 4bde02d67a2..9f9418bf4bf 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/19 16:23:09 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:46 jlam Exp $
 
 PKGNAME=		unixodbc-${ODBC_VERS}
 ODBC_PKG_VERS=		# empty
@@ -16,9 +16,9 @@ FILES_SUBST+=		UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR}
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-CONF_FILES=		${EGDIR}/odbcinst.ini ${CONFDIR}/odbcinst.ini
-CONF_FILES+=		/dev/null ${CONFDIR}/odbc.ini
-OWN_DIRS=		${CONFDIR}/ODBCDataSources
+CONF_FILES=		${EGDIR}/odbcinst.ini ${PKG_SYSCONFDIR}/odbcinst.ini
+CONF_FILES+=		/dev/null ${PKG_SYSCONFDIR}/odbc.ini
+OWN_DIRS=		${PKG_SYSCONFDIR}/ODBCDataSources
 
 post-patch: fix-driver-installation
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index aef42158f03..c9fc8d2d267 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/11/24 20:49:42 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/25 18:59:46 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 SVR4_PKGNAME=		cimap
@@ -57,9 +57,9 @@ LIBS+=			`${SASL_CONFIG} --libs`
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=			${PREFIX}/share/examples/cyrus-imapd
-CONF_FILES=		${EGDIR}/imapd.conf ${CONFDIR}/imapd.conf
-CONF_FILES+=		${EGDIR}/normal.conf ${CONFDIR}/cyrus.conf
-FILES_SUBST+=		IMAPDCONF=${CONFDIR}/imapd.conf
+CONF_FILES=		${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
+CONF_FILES+=		${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
+FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
@@ -71,7 +71,7 @@ PERL5_PACKLIST= \
 
 # Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
 # manpage conflicts with other packages.  Also change references to
-# "/etc/{cyrus,imapd}.conf" into "${CONFDIR}/{cyrus,imapd}.conf".
+# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
 #
 post-patch:
 	cd ${WRKSRC}/man;						\
@@ -86,8 +86,8 @@ post-patch:
 	for file in $${files}; do					\
 		${SED}	-e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
 			-e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
-			-e "s|/etc/\(cyrus\.conf\)|${CONFDIR}/\1|g"	\
-			-e "s|/etc/\(imapd\.conf\)|${CONFDIR}/\1|g"	\
+			-e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+			-e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
 			$${file} > $${file}.fixed;			\
 		${MV} -f $${file}.fixed $${file};			\
 	done
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index da6608f1102..24870ee6905 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/19 16:23:10 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:46 jlam Exp $
 
 DISTNAME=	imp-2.2.7
 CATEGORIES=	mail www
@@ -17,14 +17,13 @@ HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
 
 MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-MESSAGE_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
 
-CONF_FILES=	${EGDIR}/imp.conf ${APACHE_SYSCONFDIR}/imp.conf
+CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
 CONF_FILES+=	${IMPDIR}/config/defaults.php3.dist			\
 		${IMPDIR}/config/defaults.php3
 CONF_FILES+=	${IMPDIR}/config/ldap.php3.dist				\
@@ -51,7 +50,6 @@ SUPPORT_FILES+=	${IMPDIR}/config/prefs.php3.dist			\
 		${IMPDIR}/config/prefs.php3
 SUPPORT_FILES+=	${IMPDIR}/config/trailer.txt.dist			\
 		${IMPDIR}/config/trailer.txt
-MAKE_DIRS=	${APACHE_SYSCONFDIR}
 
 post-extract:
 	cd ${WRKSRC};							\
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index e94d0225a53..eb5f264baeb 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/11/19 16:23:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/25 18:59:46 jlam Exp $
 
 DISTNAME=	squirrelmail-1.0.6
 CATEGORIES=	mail www
@@ -19,10 +19,8 @@ NO_BUILD=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-MESSAGE_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
-FILES_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
+MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 EGDIR=			${PREFIX}/share/examples/squirrelmail
 SMDIR=			${PREFIX}/share/squirrelmail
@@ -32,8 +30,7 @@ FILES_SUBST+=		SMDIR=${SMDIR}
 
 CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
 CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
-CONF_FILES+=	${EGDIR}/squirrelmail.conf ${APACHE_SYSCONFDIR}/squirrelmail.conf
-MAKE_DIRS=		${APACHE_SYSCONFDIR}
+CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
 OWN_DIRS=		${DATADIR}
 OWN_DIRS+=		${SMDIR} ${SMDIR}/config
 OWN_DIRS_PERMS=		${DATADIR}/attachments root nobody 730
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 2b3cbd27a8b..a8a3e877439 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.5 2001/11/23 14:37:24 abs Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.6 2001/11/25 18:59:50 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -50,7 +50,7 @@ INSTALL_SRC?=		${INSTALL_TEMPLATES}
 FILES_SUBST+=		PREFIX=${PREFIX}
 FILES_SUBST+=		LOCALBASE=${LOCALBASE}
 FILES_SUBST+=		X11BASE=${X11BASE}
-FILES_SUBST+=		CONFDIR=${CONFDIR}
+FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 # PKG_USER and PKG_GROUP are the user and group that need to be created
 #	before this package is installed.
@@ -134,8 +134,8 @@ FILES_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 #       created and should attempt to be destroyed by the INSTALL/DEINSTALL
 #	scripts.  MAKE_DIRS is used the same way, but the package admin
 #	isn't prompted to remove the directory at post-deinstall time if it
-#	isn't empty.  For convenience, ${CONFDIR} and ${RCD_SCRIPTS_DIR} are
-#	automatically added to MAKE_DIRS.
+#	isn't empty.  For convenience, ${PKG_SYSCONFDIR} and
+#	${RCD_SCRIPTS_DIR} are automatically added to MAKE_DIRS.
 #
 # OWN_DIRS_PERMS contains a list of "directory owner group mode" sublists
 #	representing directories for this package that should be
@@ -145,7 +145,7 @@ FILES_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 #
 MAKE_DIRS?=		# empty
 MAKE_DIRS_PERMS?=	# empty
-_MAKE_DIRS=		${CONFDIR} ${RCD_SCRIPTS_DIR} ${MAKE_DIRS}
+_MAKE_DIRS=		${PKG_SYSCONFDIR} ${RCD_SCRIPTS_DIR} ${MAKE_DIRS}
 OWN_DIRS?=		# empty
 OWN_DIRS_PERMS?=	# empty
 FILES_SUBST+=		MAKE_DIRS=${_MAKE_DIRS:Q}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6018feb36f0..b879606474c 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.859 2001/11/21 18:32:01 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.860 2001/11/25 18:59:50 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -51,10 +51,27 @@ SCRIPTDIR?=		${.CURDIR}/scripts
 FILESDIR?=		${.CURDIR}/files
 PKGDIR?=		${.CURDIR}
 
-.if defined(CONFDIR.${PKGBASE})
-CONFDIR=		${CONFDIR.${PKGBASE}}
+# PKG_SYSCONFDIR is where the configuration files for a package may be found.
+# This value may be customized in various ways:
+#
+# PKG_SYSCONFBASE is the main config directory under which all package
+#	configuration files are to be found.
+#
+# PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
+#	configuration files for a particular package may be found.
+#
+# PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
+#	particular package.
+#
+# Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
+# default location of ${PREFIX}/etc.
+#
+.if defined(PKG_SYSCONFDIR.${PKGBASE})
+PKG_SYSCONFDIR=		${PKG_SYSCONFDIR.${PKGBASE}}
 .else
-CONFDIR?=		${PREFIX}/etc
+PKG_SYSCONFSUBDIR?=	# empty
+PKG_SYSCONFBASE?=	${PREFIX}/etc
+PKG_SYSCONFDIR?=	${PKG_SYSCONFBASE}/${PKG_SYSCONFSUBDIR}
 .endif
 
 .if defined(USE_JAVA)
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c0462c8ca1a..2e83a8047d8 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2001/11/21 17:16:05 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2001/11/25 18:59:46 jlam Exp $
 
 DISTNAME=		samba-2.2.2
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -23,9 +23,11 @@ USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_SYSCONFSUBDIR?=	samba
+
 SAMBA_LOGDIR?=		/var/log
 SAMBA_LOCKDIR?=		/var/run/samba
-SAMBA_ETCDIR?=		${CONFDIR}/samba
+SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
 SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
 SAMBA_DATADIR=		${PREFIX}/share
 
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index c87034d041e..c7fcb73bce3 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/21 17:17:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/25 18:59:47 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -17,9 +17,11 @@ USE_BUILDLINK_ONLY=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_SYSCONFSUBDIR?=	samba
+
 SAMBA_LOGDIR?=		/var/log
 SAMBA_LOCKDIR?=		/var/run/samba
-SAMBA_ETCDIR?=		${CONFDIR}/samba
+SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}
 SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
 SAMBA_DATADIR=		${PREFIX}/share
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ee00f4a92f5..7894d407893 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/11/21 15:44:23 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/11/25 18:59:47 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -25,7 +25,7 @@ USE_BUILDLINK_ONLY=	# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
@@ -65,20 +65,21 @@ PKG_USER=		${CUPS_USER}
 PKG_USER_DESCR=		Common UNIX Printing System user
 PKG_GROUP=		${CUPS_GROUP}
 
-CONF_FILES=		${EGDIR}/client.conf ${CONFDIR}/cups/client.conf
-CONF_FILES+=		${EGDIR}/cupsd.conf ${CONFDIR}/cups/cupsd.conf
-SUPPORT_FILES=		${EGDIR}/classes.conf ${CONFDIR}/cups/classes.conf
-SUPPORT_FILES+=		${EGDIR}/mime.convs ${CONFDIR}/cups/mime.convs
-SUPPORT_FILES+=		${EGDIR}/mime.types ${CONFDIR}/cups/mime.types
-SUPPORT_FILES+=		${EGDIR}/printers.conf ${CONFDIR}/cups/printers.conf
-RCD_SCRIPTS=		cupsd
+CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/cups/client.conf
+CONF_FILES+=	${EGDIR}/cupsd.conf ${PKG_SYSCONFDIR}/cups/cupsd.conf
+SUPPORT_FILES=	${EGDIR}/classes.conf ${PKG_SYSCONFDIR}/cups/classes.conf
+SUPPORT_FILES+=	${EGDIR}/mime.convs ${PKG_SYSCONFDIR}/cups/mime.convs
+SUPPORT_FILES+=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/cups/mime.types
+SUPPORT_FILES+=	${EGDIR}/printers.conf ${PKG_SYSCONFDIR}/cups/printers.conf
+RCD_SCRIPTS=	cupsd
 
-OWN_DIRS+=		${CONFDIR}/cups
-OWN_DIRS+=		${CONFDIR}/cups/interfaces
-OWN_DIRS+=		${CONFDIR}/cups/ppd
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/interfaces
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/ppd
 OWN_DIRS+=		/var/log/cups
 OWN_DIRS+=		/var/spool/cups
-OWN_DIRS_PERMS=		${CONFDIR}/cups/certs ${CUPS_USER} ${CUPS_GROUP} 0711
+OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/cups/certs			\
+			${CUPS_USER} ${CUPS_GROUP} 0711
 OWN_DIRS_PERMS+=	/var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
 
 pre-install:
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index aa88f9094e3..4ce2be0e963 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/11/21 22:22:10 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/25 18:59:47 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -38,7 +38,7 @@ PLIST_SRC=		${PKGDIR}/PLIST.common
 
 CONFIGURE_ARGS+=	--with-pwcheck=${PWCHECKDIR}
 CONFIGURE_ARGS+=	--with-dblib=ndbm
-CONFIGURE_ARGS+=	--with-dbpath=${CONFDIR}/sasldb
+CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl
 CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_DIR}
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 12ef1627b38..f2669bc5119 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/21 15:44:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/25 18:59:47 jlam Exp $
 
 DISTNAME=		pks-0.9.4
 CATEGORIES=		security www
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var/pks
 CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
 
 EGDIR=		${PREFIX}/share/examples
-CONF_FILES=	${EGDIR}/pksd.conf ${CONFDIR}/pksd.conf
+CONF_FILES=	${EGDIR}/pksd.conf ${PKG_SYSCONFDIR}/pksd.conf
 RCD_SCRIPTS=	pksd
 OWN_DIRS=	/var/pks /var/pks/db /var/pks/incoming
 
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index ab035440e6f..c22128e783b 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/11/19 17:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/11/25 18:59:47 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.3p7
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-skey
@@ -40,7 +40,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST.${LOWER_OPSYS}
 
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES_PERMS=	${EGDIR}/sudoers ${CONFDIR}/sudoers 0 0 0440
+CONF_FILES_PERMS=	${EGDIR}/sudoers ${PKG_SYSCONFDIR}/sudoers 0 0 0440
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 0f3c0c01d67..c45109d98be 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/21 15:50:55 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:48 jlam Exp $
 #
 
 DISTNAME=		nut-0.45.2
@@ -20,7 +20,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 			--with-statepath=${NUT_STATEDIR}		\
 			--with-modelpath=${LOCALBASE}/sbin/ups-drivers
 
-NUT_CONFDIR=		${CONFDIR}/nut
+PKG_SYSCONFSUBDIR?=	nut
+NUT_CONFDIR=		${PKG_SYSCONFDIR}
 NUT_DOCDIR=		${PREFIX}/share/doc/nut
 NUT_EGDIR=		${PREFIX}/share/examples/nut
 NUT_STATEDIR=		/var/db/nut
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 7282528618b..213b749d40a 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/11/19 16:23:12 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2001/11/25 18:59:48 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.5-1.3.22
 PKGNAME=		ap-ssl-2.8.5
@@ -24,29 +24,27 @@ CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
 MAKE_ENV+=		SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-FILES_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
 
 EGDIR=		${PREFIX}/share/examples/mod_ssl
 CONF_FILES=	${EGDIR}/apache_start.conf				\
-		${APACHE_SYSCONFDIR}/apache_start.conf
+		${PKG_SYSCONFDIR}/apache_start.conf
 SUPPORT_FILES=	${EGDIR}/ssl.crl/Makefile.crl				\
-		${APACHE_SYSCONFDIR}/ssl.crl/Makefile.crl
+		${PKG_SYSCONFDIR}/ssl.crl/Makefile.crl
 SUPPORT_FILES+=	${EGDIR}/ssl.crl/README.CRL				\
-		${APACHE_SYSCONFDIR}/ssl.crl/README.CRL
+		${PKG_SYSCONFDIR}/ssl.crl/README.CRL
 SUPPORT_FILES+=	${EGDIR}/ssl.crt/Makefile.crt				\
-		${APACHE_SYSCONFDIR}/ssl.crt/Makefile.crt
+		${PKG_SYSCONFDIR}/ssl.crt/Makefile.crt
 SUPPORT_FILES+=	${EGDIR}/ssl.crt/README.CRT				\
-		${APACHE_SYSCONFDIR}/ssl.crt/README.CRT
+		${PKG_SYSCONFDIR}/ssl.crt/README.CRT
 SUPPORT_FILES+=	${EGDIR}/ssl.crt/ca-bundle.crt				\
-		${APACHE_SYSCONFDIR}/ssl.crt/ca-bundle.crt
+		${PKG_SYSCONFDIR}/ssl.crt/ca-bundle.crt
 SUPPORT_FILES+=	${EGDIR}/ssl.csr/README.CSR				\
-		${APACHE_SYSCONFDIR}/ssl.csr/README.CSR
+		${PKG_SYSCONFDIR}/ssl.csr/README.CSR
 SUPPORT_FILES+=	${EGDIR}/ssl.key/README.KEY				\
-		${APACHE_SYSCONFDIR}/ssl.key/README.KEY
+		${PKG_SYSCONFDIR}/ssl.key/README.KEY
 SUPPORT_FILES+=	${EGDIR}/ssl.prm/README.PRM				\
-		${APACHE_SYSCONFDIR}/ssl.prm/README.PRM
+		${PKG_SYSCONFDIR}/ssl.prm/README.PRM
 
 post-extract:
 	cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 003131181f0..002a8e0c5cf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2001/11/21 15:44:23 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2001/11/25 18:59:48 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).
@@ -39,9 +39,7 @@ CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-FILES_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
 
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
 APACHE_USER?=		www
@@ -101,17 +99,16 @@ BUILD_DEFS+=		APACHE_SUEXEC
 
 EGDIR=		${PREFIX}/share/examples/httpd
 
-CONF_FILES=	${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf
-SUPPORT_FILES=	${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic
-SUPPORT_FILES+=	${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types
+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
 RCD_SCRIPTS=	apache
 
-MAKE_DIRS=		${APACHE_SYSCONFDIR}
-OWN_DIRS=		${APACHE_SYSCONFDIR}/ssl.crl
-OWN_DIRS+=		${APACHE_SYSCONFDIR}/ssl.crt
-OWN_DIRS+=		${APACHE_SYSCONFDIR}/ssl.csr
-OWN_DIRS+=		${APACHE_SYSCONFDIR}/ssl.key
-OWN_DIRS+=		${APACHE_SYSCONFDIR}/ssl.prm
+OWN_DIRS=		${PKG_SYSCONFDIR}/ssl.crl
+OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.crt
+OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.csr
+OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.key
+OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.prm
 OWN_DIRS+=		/var/log/httpd
 OWN_DIRS+=		/var/spool/httpd
 OWN_DIRS_PERMS+=	/var/spool/httpd/proxy nobody nobody 0755
@@ -156,9 +153,9 @@ post-install:
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
 	for file in httpd.conf magic mime.types; do			\
-		${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default	\
+		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default	\
 			${PREFIX}/share/examples/httpd;			\
-		${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default;		\
+		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 09e9f96b88c..15a271b86d6 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2001/11/23 10:52:21 martti Exp $
+# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -46,9 +46,7 @@ BUILD_DEFS+=		USE_INET6
 IGNORE=			"IPv6 only build"
 .endif
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-FILES_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
 
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
 APACHE_USER?=		www
@@ -106,12 +104,11 @@ BUILD_DEFS+=		APACHE_SUEXEC
 
 EGDIR=		${PREFIX}/share/examples/httpd
 
-CONF_FILES=	${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf
-SUPPORT_FILES=	${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic
-SUPPORT_FILES+=	${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types
+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
 RCD_SCRIPTS=	apache
 
-MAKE_DIRS=		${APACHE_SYSCONFDIR}
 OWN_DIRS=		/var/log/httpd
 OWN_DIRS+=		/var/spool/httpd
 OWN_DIRS_PERMS+=	/var/spool/httpd/proxy nobody nobody 0755
@@ -151,9 +148,9 @@ post-install:
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
 	for file in httpd.conf magic mime.types; do			\
-		${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default	\
+		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default	\
 			${PREFIX}/share/examples/httpd;			\
-		${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default;		\
+		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index d96e6601e43..b77c551d4e5 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/19 16:23:14 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:49 jlam Exp $
 
 DISTNAME=	apc_gui-1.0.3
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -14,18 +14,14 @@ DEPENDS+=	php-gd>=4.0.1:../../graphics/php4-gd
 
 NO_BUILD=	YES
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-MESSAGE_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
-
+PKG_SYSCONFSUBDIR?=	httpd
 APC_GUI_DIR=		${PREFIX}/share/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 PLIST_SUBST+=		PKGBASE=${PKGBASE}
 MESSAGE_SUBST+=		APC_GUI_DIR=${APC_GUI_DIR}
 
-CONF_FILES=	${EGDIR}/apc_gui.conf ${APACHE_SYSCONFDIR}/apc_gui.conf
+CONF_FILES=	${EGDIR}/apc_gui.conf ${PKG_SYSCONFDIR}/apc_gui.conf
 CONF_FILES+=	/dev/null ${APC_GUI_DIR}/apc_config_local.php
-MAKE_DIRS=	${APACHE_SYSCONFDIR}
 OWN_DIRS=	${APC_GUI_DIR}
 
 pre-install:
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index c6ef9311fa5..bf16030fc76 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:14 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/25 18:59:49 jlam Exp $
 #
 
 DISTNAME=		cvsweb-1.112
@@ -22,16 +22,15 @@ INSTALL_FILE=		${WRKDIR}/INSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
+PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-CONF_FILES=	${EGDIR}/cvsweb.conf.default ${APACHE_SYSCONFDIR}/cvsweb.conf
-MAKE_DIRS=	${APACHE_SYSCONFDIR}
+CONF_FILES=	${EGDIR}/cvsweb.conf.default ${PKG_SYSCONFDIR}/cvsweb.conf
 
 do-build:
 	${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak
 	${SED}	-e 's,/usr/bin/perl,${PERL5},'				\
-		-e 's,/usr/local/web/apache/conf/,${APACHE_SYSCONFDIR}/,' \
+		-e 's,/usr/local/web/apache/conf/,${PKG_SYSCONFDIR}/,'	\
 	    ${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi
 
 do-install:
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 0c8f05c2b2f..97425efc322 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:49 jlam Exp $
 
 DISTNAME=	horde-1.2.7
 CATEGORIES=	www
@@ -21,11 +21,9 @@ MESSAGE_SUBST+=	PHPLIBDIR=${PHPLIBDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
-BUILD_DEFS+=		APACHE_SYSCONFDIR
-MESSAGE_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?=	httpd
 
-CONF_FILES=	${EGDIR}/horde.conf ${APACHE_SYSCONFDIR}/horde.conf
+CONF_FILES=	${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
 CONF_FILES+=	${PHPLIBDIR}/local.inc.dist ${PHPLIBDIR}/local.inc
 CONF_FILES+=	${PHPLIBDIR}/prepend.php3.dist ${PHPLIBDIR}/prepend.php3
 CONF_FILES+=	${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
@@ -35,7 +33,6 @@ SUPPORT_FILES+=	${HORDEDIR}/config/html.php3.dist ${HORDEDIR}/config/html.php3
 SUPPORT_FILES+=	${HORDEDIR}/config/lang.php3.dist ${HORDEDIR}/config/lang.php3
 SUPPORT_FILES+=	${HORDEDIR}/config/menu.txt.dist ${HORDEDIR}/config/menu.txt
 SUPPORT_FILES+=	${HORDEDIR}/config/mime.php3.dist ${HORDEDIR}/config/mime.php3
-MAKE_DIRS=	${APACHE_SYSCONFDIR}
 
 post-extract:
 	cd ${WRKSRC}/phplib;						\
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 51144daedaa..a24153470ed 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/25 18:59:49 jlam Exp $
 
 .include "Makefile.php"
 
@@ -29,7 +29,7 @@ LINK_LIBGCC_LDFLAGS=	-Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive
 MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 .endif
 
-CONF_FILES=	${EGDIR}/php.ini-dist ${CONFDIR}/php.ini
+CONF_FILES=	${EGDIR}/php.ini-dist ${PKG_SYSCONFDIR}/php.ini
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index b5bfd1889bb..40d1b058889 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:16 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.5
@@ -14,7 +14,7 @@ CONFLICTS+=	surfaw-[0-9]*
 USE_BUILDLINK_ONLY=	YES
 AUTOMAKE_OVERRIDE=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 # Override sysconfdir so that the installation puts the example config file
 # in ${EGDIR}.
@@ -25,8 +25,8 @@ MAKE_ENV+=		AM_MAKEFLAGS="${MAKE_FLAGS}"
 DOCDIR=		${PREFIX}/share/doc/surfraw
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-CONF_FILES=	${EGDIR}/surfraw.conf ${CONFDIR}/surfraw.conf
-SUPPORT_FILES=	${EGDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list
+CONF_FILES=	${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
+SUPPORT_FILES=	${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
 
 PLIST_SUBST+=	PKGBASE=${PKGBASE}
 
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index cde36b933e9..5691f63c6a5 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/21 15:44:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 jlam Exp $
 
 DISTNAME=	thttpd-2.21b
 CATEGORIES=	www
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	# defined
 BUILD_DEFS+=	USE_INET6
 
 EGDIR=		${PREFIX}/share/examples
-CONF_FILES=	${EGDIR}/thttpd.conf ${CONFDIR}/thttpd.conf
+CONF_FILES=	${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
 RCD_SCRIPTS=	thttpd
 
 pre-configure: