Update www/apache to 1.3.24 with EAPI patch from mod_ssl-2.8.8-1.3.24.

Relevant changes from version 1.3.23 include:

     * Prevent invalid client hostnames from appearing in the log file.
     * Various mod_proxy improvements, such as the new ProxyIOBufferSize
       directive.
     * The new ''IgnoreCase' keyword to the IndexOptions directive.
     * mod_rewrite's 'rnd' was broken and has been fixed.
     * The '-S' option of 'apxs' was not able to handle quotes; also 'apxs'
       is now rebuilt when options are changed.
     * proxy now correctly handles Cookies and X-Cache headers.
     * Fixed a problem in TPF when we were using the wrong subpool when
       opening the error log.
     * pthread accept() mutexes on Solaris were broken (since we were
       not linking against pthread)

4 files changed, 31 insertions, 23 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index b65fa20db29..c1eb4d87533 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.91 2002/02/28 05:45:33 jlam Exp $
+# $NetBSD: Makefile,v 1.92 2002/04/02 14:13:01 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).
 
-DISTNAME=		apache_1.3.23
-PKGNAME=		apache-1.3.23
-PKGREVISION=		1
+DISTNAME=		apache_1.3.24
+PKGNAME=		apache-1.3.24
+PKGREVISION=		# empty
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
-			http://www.apache.de/dist/httpd/ \
-			http://www.netbsd.org/images/logos/
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			sitedrivenby.gif
+			http://www.apache.de/dist/httpd/
 
-MASTER_SITES+=		http://www.modssl.org/source/ \
-			ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/
-DISTFILES+=		${MODSSL_DISTNAME}${EXTRACT_SUFX}
-MODSSL_DISTNAME=	mod_ssl-2.8.7-1.3.23
+APACHE_DIST=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=		${APACHE_DIST}
+
+NETBSD_LOGO=		sitedrivenby.gif
+SITES_${NETBSD_LOGO}=	http://www.netbsd.org/images/logos/
+DISTFILES+=		${NETBSD_LOGO}
+
+MODSSL_DISTNAME=	mod_ssl-2.8.8-1.3.24
+MODSSL_DIST=		${MODSSL_DISTNAME}${EXTRACT_SUFX}
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
+SITES_${MODSSL_DIST}=	http://www.modssl.org/source/ \
+			ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/
+DISTFILES+=		${MODSSL_DIST}
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
@@ -109,6 +114,8 @@ SUPPORT_FILES=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
 SUPPORT_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
 RCD_SCRIPTS=	apache
 
+MAKE_DIRS=		${PREFIX}/share/httpd
+MAKE_DIRS+=		${PREFIX}/share/httpd/htdocs
 OWN_DIRS=		/var/log/httpd
 OWN_DIRS+=		/var/spool/httpd
 OWN_DIRS_PERMS+=	/var/spool/httpd/proxy nobody nobody 0755
diff --git a/www/apache/PLIST b/www/apache/PLIST
index d6f7a36759d..1e5a0fb9adb 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/01 16:04:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/02 14:13:02 jlam Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -217,6 +217,7 @@ share/httpd/htdocs/manual/mod/index.html.fr
 share/httpd/htdocs/manual/mod/index.html.html
 share/httpd/htdocs/manual/mod/index.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_access.html
+share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_actions.html
 share/httpd/htdocs/manual/mod/mod_alias.html
 share/httpd/htdocs/manual/mod/mod_asis.html
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 3e4b66a74fe..b59570f845c 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2002/03/28 17:17:08 thorpej Exp $
+$NetBSD: distinfo,v 1.15 2002/04/02 14:13:02 jlam Exp $
 
-SHA1 (apache_1.3.23.tar.gz) = 20aa246303be1948f240cd7c5c3cf50d97d06868
-Size (apache_1.3.23.tar.gz) = 2210130 bytes
+SHA1 (apache_1.3.24.tar.gz) = b758d4227820c3cfb33f8237926391fddee736eb
+Size (apache_1.3.24.tar.gz) = 2232504 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.7-1.3.23.tar.gz) = c8a2b838b6e54e2fb1ef0983c65996b1260bb2b0
-Size (mod_ssl-2.8.7-1.3.23.tar.gz) = 751993 bytes
+SHA1 (mod_ssl-2.8.8-1.3.24.tar.gz) = 9d9e7d0b78591a56b3c251a25a47e394719c8e36
+Size (mod_ssl-2.8.8-1.3.24.tar.gz) = 752322 bytes
 SHA1 (patch-aa) = 9ebfc626364271a60a4db4b1b0c28c92060a9f35
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
@@ -14,7 +14,7 @@ SHA1 (patch-ae) = 037e24a3019025f031172af0102f043ddf2f0556
 SHA1 (patch-af) = 4b4450ceede5c803023eef41c63a2058e7577821
 SHA1 (patch-ag) = f1cc9b833afd87b42aac99431d696f3780762bab
 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
-SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695
+SHA1 (patch-ai) = 08a27cd408c409a9f94b9b8579aeec2c40ea86dc
 SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
 SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
index 13e41ca6a2a..8ada8fdb436 100644
--- a/www/apache/patches/patch-ai
+++ b/www/apache/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.7 2001/10/22 18:02:53 jlam Exp $
+$NetBSD: patch-ai,v 1.8 2002/04/02 14:13:03 jlam Exp $
 
---- src/support/apxs.pl.orig	Sat Jun  9 01:06:57 2001
-+++ src/support/apxs.pl	Sat Jun  9 01:11:28 2001
-@@ -459,8 +459,7 @@
+--- src/support/apxs.pl.orig	Tue Apr  2 02:15:23 2002
++++ src/support/apxs.pl
+@@ -460,8 +460,7 @@
          if ($^O ne "MSWin32") {
              $t =~ s|^.+/([^/]+)$|$1|;
              if ($opt_i) {