Forgot a CONFDIR -> PKG_SYSCONFDIR replacement.

20 files changed, 43 insertions, 45 deletions

diff --git a/audio/rplay/files/rplayd.sh b/audio/rplay/files/rplayd.sh
index 8c475ac53c3..933bce055bb 100644
--- a/audio/rplay/files/rplayd.sh
+++ b/audio/rplay/files/rplayd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: rplayd.sh,v 1.3 2001/11/21 21:38:50 jlam Exp $
+# $NetBSD: rplayd.sh,v 1.4 2001/11/26 07:30:44 jlam Exp $
 #
 # PROVIDE: rplayd
 # REQUIRE: DAEMON
@@ -13,7 +13,7 @@ fi
 name="rplayd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-required_files="@CONFDIR@/rplay.conf"
+required_files="@PKG_SYSCONFDIR@/rplay.conf"
 
 if [ -e /etc/rc.subr ]
 then
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 81d2737940c..f946f06eecc 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2001/11/19 16:23:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2001/11/26 07:31:43 jlam Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 CATEGORIES=	databases
@@ -23,7 +23,7 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--enable-gnuthreads
 CONFIGURE_ARGS+=	--with-pth=${BUILDLINK_DIR}
diff --git a/mail/imp/MESSAGE b/mail/imp/MESSAGE
index 7455a3b7e6c..89236523c0a 100644
--- a/mail/imp/MESSAGE
+++ b/mail/imp/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:00:17 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2001/11/26 07:34:05 jlam Exp $
 
 Please refer to the file:
 
@@ -19,8 +19,8 @@ You will also need to make IMP accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following lines
 to httpd.conf:
 
-	Include ${APACHE_SYSCONFDIR}/horde.conf
-	Include ${APACHE_SYSCONFDIR}/imp.conf
+	Include ${PKG_SYSCONFDIR}/horde.conf
+	Include ${PKG_SYSCONFDIR}/imp.conf
 
 to make Horde accessible through:
 	
diff --git a/mail/squirrelmail/MESSAGE b/mail/squirrelmail/MESSAGE
index 6742d3e1df7..2504ff5b294 100644
--- a/mail/squirrelmail/MESSAGE
+++ b/mail/squirrelmail/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/19 16:23:10 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2001/11/26 07:34:05 jlam Exp $
 
 Please run the SquirrelMail configuration script:
 
@@ -14,7 +14,7 @@ If you are running Apache and ap-php, then you may either symlink
 
 into DocumentRoot, or add the following line to httpd.conf:
 
-	Include ${APACHE_SYSCONFDIR}/squirrelmail.conf
+	Include ${PKG_SYSCONFDIR}/squirrelmail.conf
 
 to make IMAP accounts accessible through:
 	
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index cd438d6c432..0fd5089ad80 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: cupsd.sh,v 1.7 2001/11/21 21:38:54 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.8 2001/11/26 07:34:05 jlam Exp $
 #
 # Common UNIX Printing System daemon
 #
@@ -15,7 +15,7 @@ fi
 name="cupsd"
 rcvar=${name}
 command="@PREFIX@/sbin/${name}"
-required_files="@CONFDIR@/cups/${name}.conf"
+required_files="@PKG_SYSCONFDIR@/cups/${name}.conf"
 extra_commands="reload"
 
 if [ -e /etc/rc.subr ]
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index d8091bd999a..3b983c76147 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.2 2001/11/21 22:22:10 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.3 2001/11/26 07:34:05 jlam Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
@@ -18,7 +18,7 @@ command="@PREFIX@/sbin/pwcheck"
 command_args="& sleep 2"
 extra_commands="dbinit"
 
-sasldb=@CONFDIR@/sasldb.db
+sasldb=@PKG_SYSCONFDIR@/sasldb.db
 
 sasl_pwcheck_dbinit()
 {
diff --git a/security/pks/files/pksd.sh b/security/pks/files/pksd.sh
index e929c037780..f584ab0708d 100644
--- a/security/pks/files/pksd.sh
+++ b/security/pks/files/pksd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pksd.sh,v 1.4 2001/11/21 21:38:54 jlam Exp $
+# $NetBSD: pksd.sh,v 1.5 2001/11/26 07:34:06 jlam Exp $
 #
 # PROVIDE: pksd
 # REQUIRE: DAEMON
@@ -18,7 +18,7 @@ run_command="@PREFIX@/bin/pks-queue-run.sh"
 ctl_command="@PREFIX@/bin/pksdctl"
 client_command="@PREFIX@/bin/pksclient"
 
-conf_file="@CONFDIR@/${name}.conf"
+conf_file="@PKG_SYSCONFDIR@/${name}.conf"
 required_files="${conf_file}"
 extra_commands="dbinit"
 
diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo
index 7e8b9b0d0b4..22c9ef61d31 100644
--- a/www/ap-ssl/distinfo
+++ b/www/ap-ssl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/10/17 19:17:11 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/11/26 07:34:06 jlam Exp $
 
 SHA1 (mod_ssl-2.8.5-1.3.22.tar.gz) = 432be249fbaa3a87391b50af7b138c5496fac209
 Size (mod_ssl-2.8.5-1.3.22.tar.gz) = 751863 bytes
 SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15
-SHA1 (patch-ab) = b8dab2869b05c520b075ecc16ce407beeab5920e
+SHA1 (patch-ab) = bd1d4eeff91f87a2b46f1ce0ad95dab8a3c23c84
diff --git a/www/ap-ssl/files/README.mkcert b/www/ap-ssl/files/README.mkcert
index 8c2f009e95d..b972f9cddbf 100644
--- a/www/ap-ssl/files/README.mkcert
+++ b/www/ap-ssl/files/README.mkcert
@@ -1,4 +1,4 @@
-$NetBSD: README.mkcert,v 1.2 2001/04/29 20:36:47 jlam Exp $
+$NetBSD: README.mkcert,v 1.3 2001/11/26 07:34:06 jlam Exp $
 
 If you don't already have them, you will need to generate SSL certificates
 and keys for your server before Apache will start with mod_ssl support.
@@ -20,4 +20,4 @@ browser at:
 After generating your SSL certificates, you should update the certificate
 hashes with:
 
-	cd @APACHE_SYSCONFDIR@/ssl.crt; make -f Makefile.crt update
+	cd @PKG_SYSCONFDIR@/ssl.crt; make -f Makefile.crt update
diff --git a/www/ap-ssl/patches/patch-ab b/www/ap-ssl/patches/patch-ab
index b07a0f14052..59b8304c127 100644
--- a/www/ap-ssl/patches/patch-ab
+++ b/www/ap-ssl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/04/29 20:36:48 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/11/26 07:34:06 jlam Exp $
 
 --- pkg.sslsup/mkcert.sh.in.orig	Sun Apr 16 05:21:24 2000
 +++ pkg.sslsup/mkcert.sh.in
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.2 2001/04/29 20:36:48 jlam Exp $
 +done
 +
 +openssl="openssl"
-+confdir=@APACHE_SYSCONFDIR@
++confdir=@PKG_SYSCONFDIR@
 +
  #   configuration
 -#   WE ARE CALLED FROM THE PARENT DIR!
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 5e159a4b62f..3bd20dd9e7e 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.13 2001/05/14 21:27:25 jlam Exp $
+# $NetBSD: apache.sh,v 1.14 2001/11/26 07:34:06 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -14,10 +14,10 @@ rcvar=$name
 command="@PREFIX@/sbin/apachectl"
 
 apache_start=start
-if [ -f @APACHE_SYSCONFDIR@/apache_start.conf ]
+if [ -f @PKG_SYSCONFDIR@/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @APACHE_SYSCONFDIR@/apache_start.conf
+	. @PKG_SYSCONFDIR@/apache_start.conf
 fi
 
 # set defaults
diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
index 81d1cbe443a..0208f9c3a00 100644
--- a/www/apache/files/config.layout
+++ b/www/apache/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.3 2001/10/17 19:17:00 jlam Exp $
+# $NetBSD: config.layout,v 1.4 2001/11/26 07:34:06 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
@@ -7,7 +7,7 @@ bindir: ${exec_prefix}/bin
 sbindir: ${exec_prefix}/sbin
 libexecdir: ${exec_prefix}/lib/httpd
 mandir: ${prefix}/man
-sysconfdir: @APACHE_SYSCONFDIR@
+sysconfdir: @PKG_SYSCONFDIR@
 datadir: ${prefix}/share/httpd
 iconsdir: ${prefix}/share/httpd/icons
 htdocsdir: ${prefix}/share/httpd/htdocs
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 3f8f7bcd242..d8a2a50c68c 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.9 2001/05/14 21:28:33 jlam Exp $
+# $NetBSD: apache.sh,v 1.10 2001/11/26 07:34:07 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -14,10 +14,10 @@ rcvar=$name
 command="@PREFIX@/sbin/apachectl"
 
 apache_start=start
-if [ -f @APACHE_SYSCONFDIR@/apache_start.conf ]
+if [ -f @PKG_SYSCONFDIR@/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @APACHE_SYSCONFDIR@/apache_start.conf
+	. @PKG_SYSCONFDIR@/apache_start.conf
 fi
 
 # set defaults
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
index f86938090c0..620a76245b0 100644
--- a/www/apache6/files/config.layout
+++ b/www/apache6/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.2 2001/10/17 07:47:53 martti Exp $
+# $NetBSD: config.layout,v 1.3 2001/11/26 07:34:07 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
@@ -7,7 +7,7 @@ bindir: ${exec_prefix}/bin
 sbindir: ${exec_prefix}/sbin
 libexecdir: ${exec_prefix}/lib/httpd
 mandir: ${prefix}/man
-sysconfdir: @APACHE_SYSCONFDIR@
+sysconfdir: @PKG_SYSCONFDIR@
 datadir: ${prefix}/share/httpd
 iconsdir: ${prefix}/share/httpd/icons
 htdocsdir: ${prefix}/share/httpd/htdocs
diff --git a/www/apc-gui/MESSAGE b/www/apc-gui/MESSAGE
index d2733922c2f..a438e71c0ab 100644
--- a/www/apc-gui/MESSAGE
+++ b/www/apc-gui/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 02:16:15 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2001/11/26 07:34:07 jlam Exp $
 
 You will need to make APC GUI accessible through your HTTP server.
 If you are running Apache and ap-php, then you may either symlink
@@ -8,7 +8,7 @@ If you are running Apache and ap-php, then you may either symlink
 
 into DocumentRoot, or add the following line to httpd.conf:
 
-	Include ${APACHE_SYSCONFDIR}/apc_gui.conf
+	Include ${PKG_SYSCONFDIR}/apc_gui.conf
 
 to make the APC web interface accessible through:
 	
diff --git a/www/horde/MESSAGE b/www/horde/MESSAGE
index 18665ecd451..dd53804cdd2 100644
--- a/www/horde/MESSAGE
+++ b/www/horde/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 02:16:52 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2001/11/26 07:34:07 jlam Exp $
 
 Please refer to the file:
 
@@ -29,7 +29,7 @@ You will also need to make Horde accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following line
 to httpd.conf:
 
-	Include ${APACHE_SYSCONFDIR}/horde.conf
+	Include ${PKG_SYSCONFDIR}/horde.conf
 
 to make Horde accessible through:
 	
diff --git a/www/php4/MESSAGE.module b/www/php4/MESSAGE.module
index 2cf5de6114b..1cbe4f691d0 100644
--- a/www/php4/MESSAGE.module
+++ b/www/php4/MESSAGE.module
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.2 2001/11/19 16:23:15 jlam Exp $
+$NetBSD: MESSAGE.module,v 1.3 2001/11/26 07:34:07 jlam Exp $
 
-To enable this module, add the following to ${CONFDIR}/php.ini:
+To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
 
     extension=${MODNAME}.so
 
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index dea78f38234..bbba9734b3b 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2001/11/26 07:34:07 jlam Exp $
 
 DISTNAME=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -30,5 +30,3 @@ PHP_EXTENSION_DIR=	lib/php/20001222
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 .include "../../mk/bsd.prefs.mk"
-
-MESSAGE_SUBST+=		CONFDIR=${CONFDIR}
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 3d5d7a65d5f..1d641999368 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.4 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile.php,v 1.5 2001/11/26 07:34:07 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--disable-posix
 CONFIGURE_ARGS+=	--disable-session
 CONFIGURE_ARGS+=	--disable-xml
 
-CONFIGURE_ARGS+=	--with-config-file-path=${CONFDIR}
+CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-exec-dir=${PREFIX}/libexec/php4
 CONFIGURE_ARGS+=	--with-regex=system
 
diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh
index 61af6bf0f4a..cb2a13f612f 100644
--- a/www/thttpd/files/thttpd.sh
+++ b/www/thttpd/files/thttpd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: thttpd.sh,v 1.6 2001/11/21 21:38:55 jlam Exp $
+# $NetBSD: thttpd.sh,v 1.7 2001/11/26 07:34:08 jlam Exp $
 #
 # PROVIDE: thttpd
 # REQUIRE: DAEMON
@@ -13,8 +13,8 @@ fi
 name="thttpd"
 rcvar=$name
 command=@PREFIX@/sbin/${name}
-command_args="-C @CONFDIR@/${name}.conf"
-required_files="@CONFDIR@/${name}.conf"
+command_args="-C @PKG_SYSCONFDIR@/${name}.conf"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
 
 if [ -e /etc/rc.subr ]
 then