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.

3 files changed, 15 insertions, 20 deletions

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