Update www/apache to 1.3.23nb1. Changes from version 1.3.23 include using

the EAPI patches from modssl-2.8.7-1.3.23.  Also, link against the MM
Shared Memory library (devel/libmm) to provide shared memory support in
Apache/EAPI.  For example, this allows mod_ssl to use a high-performance
RAM-based session cache instead of a disk-based one.

3 files changed, 28 insertions, 5 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 169360e750c..b65fa20db29 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.90 2002/02/05 05:35:11 jmc Exp $
+# $NetBSD: Makefile,v 1.91 2002/02/28 05:45:33 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
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
@@ -15,7 +16,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 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.6-1.3.23
+MODSSL_DISTNAME=	mod_ssl-2.8.7-1.3.23
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 
 MAINTAINER=		jlam@netbsd.org
@@ -36,6 +37,7 @@ CONFIGURE_ARGS+=	--enable-rule=EAPI				\
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
+CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_DIR}"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -159,6 +161,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
 
+.include "../../devel/libmm/buildlink.mk"
 .include "../../textproc/expat/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 877967c11ee..a6dae084693 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2002/02/01 16:04:39 jlam Exp $
+$NetBSD: distinfo,v 1.13 2002/02/28 05:45:33 jlam Exp $
 
 SHA1 (apache_1.3.23.tar.gz) = 20aa246303be1948f240cd7c5c3cf50d97d06868
 Size (apache_1.3.23.tar.gz) = 2210130 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.6-1.3.23.tar.gz) = 74b2e35c69780b8de00a06ed7b7d0d1acf904d3b
-Size (mod_ssl-2.8.6-1.3.23.tar.gz) = 752025 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 (patch-aa) = 9ebfc626364271a60a4db4b1b0c28c92060a9f35
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
@@ -17,3 +17,4 @@ SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
 SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695
 SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
+SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2
diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al
new file mode 100644
index 00000000000..bae9c607d66
--- /dev/null
+++ b/www/apache/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.4 2002/02/28 05:45:33 jlam Exp $
+
+--- htdocs/manual/mod/index.html.en.orig	Thu Feb 28 00:09:28 2002
++++ htdocs/manual/mod/index.html.en
+@@ -219,12 +219,12 @@
+       <dt><a href="mod_speling.html">mod_speling</a> Apache 1.3 and
+       up</dt>
+ 
++      <dd>Automatically correct minor typos in URLs</dd>
++
+       <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl
+       applied</dt>
+       
+       <dd>Apache SSL interface to OpenSSL</dd>
+-
+-      <dd>Automatically correct minor typos in URLs</dd>
+ 
+       <dt><a href="mod_status.html">mod_status</a> Apache 1.1 and
+       up</dt>