From c191dc788b25d2c1365f262d8e83cc9692b21f2e Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Nov 2001 18:59:45 +0000
Subject: 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.
---
 www/ap-ssl/Makefile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'www/ap-ssl/Makefile')

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
-- 
cgit v1.2.3