use apache 1.3.11 + IPv6 patch as base version.

for changes between 1.3.9 to 1.3.11, please see commit logs for
pkgsrc/www/apache, or apache changelogs.

6 files changed, 75 insertions, 54 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 1301ce61d7c..872cf3698a4 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/02/20 22:05:42 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2000/02/21 07:14:44 itojun Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -10,8 +10,8 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.9
-PKGNAME=		apache6-1.3.9p0
+DISTNAME=		apache_1.3.11
+PKGNAME=		apache6-1.3.11p0
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
 			ftp://ftp.modssl.org/source/ \
@@ -21,7 +21,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 #			${SSL_DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		apache-139-v6-19990901a.diff.gz
+PATCHFILES=		apache-1.3.11-v6-20000220a.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		itojun@itojun.org
@@ -47,6 +47,8 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 CONFIGURE_SCRIPT=	configure.v6
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
+BUILD_DEFS+=		USE_INET6
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(USE_INET6) || ${USE_INET6} != YES
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
index d2cd8239c52..b3b90cd66aa 100644
--- a/www/apache6/files/md5
+++ b/www/apache6/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.3 1999/09/01 07:41:02 itojun Exp $
+$NetBSD: md5,v 1.4 2000/02/21 07:14:45 itojun Exp $
 
-MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
+MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache-139-v6-19990901a.diff.gz) = 64fea82095fbc58a5367551f9e686483
+MD5 (apache-1.3.11-v6-20000220a.diff.gz) = 70c4aaf1c79fa6d933e31b9e0a54e018
diff --git a/www/apache6/files/patch-sum b/www/apache6/files/patch-sum
index ce835f13cd8..e69bbab0411 100644
--- a/www/apache6/files/patch-sum
+++ b/www/apache6/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.4 1999/09/03 04:06:33 itojun Exp $
+$NetBSD: patch-sum,v 1.5 2000/02/21 07:14:45 itojun Exp $
 
-MD5 (patch-aa) = 9289ac3db45bab5d9623aeddcca6c2eb
+MD5 (patch-aa) = 7cdc55b80eb5389605960973c6c888ad
 MD5 (patch-ab) = 4b835238ed8e929366119786655a0ffc
 MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
 MD5 (patch-ah) = c3e3a232e0c5028a15dea4473bf39955
 MD5 (patch-aj) = e4878583ffc2957e50c25d3d22d1d4db
-MD5 (patch-ak) = a37c1b64080ee65e1137c7a969375b47
+MD5 (patch-ak) = f025ef3f85f08ba8374148f3dcc0eccf
 MD5 (patch-al) = 392b4228824401ad7d1676d2054fa1d6
-MD5 (patch-am) = fd4d430a5dab5ff28ed5bd041a1abf48
+MD5 (patch-am) = 06fcd06d209d53e87b02e94707bdd21c
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
index 3aa29ae1745..f880346ec78 100644
--- a/www/apache6/patches/patch-ab
+++ b/www/apache6/patches/patch-ab
@@ -1,34 +1,38 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+$NetBSD: patch-ab,v 1.2 2000/02/21 07:14:45 itojun Exp $
 
---- htdocs/index.html.orig	Wed May 20 10:59:42 1998
-+++ htdocs/index.html	Thu Dec  3 09:48:59 1998
-@@ -38,14 +38,26 @@
-   <A
-    HREF="manual/index.html"
-   >documentation</A>
--  has been included with this distribution.
-+  has been included with this distribution.<BR>
-+  If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+  <A
-+   HREF="manual/mod/mod_ssl/index.html"
-+  >SSL documentation</A>
-+  carefully.
-   </P>
-   <P>
--  The Webmaster of this site is free to use the image below on
--  an Apache-powered Web server.  Thanks for using Apache!
-+  Information on the NetBSD multiplatform operating system can be found
-+  at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
-+  </P>
-+  <P>
-+  The Webmaster of this site is free to use the images below on
-+  an Apache/NetBSD-powered Web server.  Thanks for using <A HREF="http://www.apache.org/">Apache</A> on <A HREF="http://www.netbsd.org/">NetBSD</A>!
-   </P>
-   <DIV ALIGN="CENTER">
-    <IMG SRC="apache_pb.gif" ALT="">
-+   <A HREF="http://www.netbsd.org/">
-+        <IMG SRC="sitedrivenby.gif" border=0
-+             ALT="Site driven by NetBSD - NetBSD rocks!"></A>
-   </DIV>
-  </BODY>
+--- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
++++ htdocs/index.html.en	Sun Jan 30 17:00:58 2000
+@@ -28,11 +28,29 @@
+ 
+ 
+ <P>
+-The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
+-
++The Apache <A HREF="manual/index.html">documentation</A>
++has been included with this distribution.<BR>
++If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
++<A
++ HREF="manual/mod/mod_ssl/index.html"
++>SSL documentation</A>
++carefully.
++</P>
++<P>
++Information on the NetBSD multiplatform operating system can be found
++at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
++</P>
+ <P>
+-You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
++The Webmaster of this site is free to use the images below on
++an Apache/NetBSD-powered Web server.  Thanks for using
++<A HREF="http://www.apache.org/">Apache</A> on
++<A HREF="http://www.netbsd.org/">NetBSD</A>!
++</P>
+ 
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT="">
++<A HREF="http://www.netbsd.org/">
++<IMG SRC="sitedrivenby.gif" border=0 
++ ALT="Site driven by NetBSD - NetBSD rocks!"></A>
++</DIV>
+ </BODY>
  </HTML>
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
index f1b192acb6f..6715644245c 100644
--- a/www/apache6/patches/patch-ak
+++ b/www/apache6/patches/patch-ak
@@ -1,15 +1,14 @@
-$NetBSD: patch-ak,v 1.2 1999/09/01 07:41:03 itojun Exp $
-
---- src/support/apxs.pl.orig	Sat Jul 24 11:05:02 1999
-+++ src/support/apxs.pl	Wed Sep  1 00:06:50 1999
-@@ -426,8 +426,9 @@
+$NetBSD: patch-ak,v 1.3 2000/02/21 07:14:45 itojun Exp $
+--- src/support/apxs.pl.orig	Thu Dec 16 08:10:30 1999
++++ src/support/apxs.pl	Sun Feb 20 22:14:55 2000
+@@ -424,8 +424,9 @@
          my $t = $f;
          $t =~ s|^.+/([^/]+)$|$1|;
          if ($opt_i) {
--	    push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
--	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+#	    push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-+#	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+-            push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++#           push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
++#           push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
 +	    push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
          }
  
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index 943f7c2e295..51c0d9540e6 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/09/01 07:41:04 itojun Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/02/21 07:14:45 itojun Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -40,7 +40,9 @@ include/httpd/multithread.h
 include/httpd/os-inline.c
 include/httpd/os.h
 include/httpd/rfc1413.h
+include/httpd/sa_len.h
 include/httpd/scoreboard.h
+include/httpd/sockaddr_storage.h
 include/httpd/util_date.h
 include/httpd/util_md5.h
 include/httpd/util_script.h
@@ -76,7 +78,19 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 share/httpd/htdocs/apache_pb.gif
-share/httpd/htdocs/index.html
+share/httpd/htdocs/index.html.ca
+share/httpd/htdocs/index.html.cz
+share/httpd/htdocs/index.html.de
+share/httpd/htdocs/index.html.dk
+share/httpd/htdocs/index.html.ee
+share/httpd/htdocs/index.html.en
+share/httpd/htdocs/index.html.es
+share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.it
+share/httpd/htdocs/index.html.lu
+share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.pt
+share/httpd/htdocs/index.html.se
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
@@ -123,6 +137,7 @@ share/httpd/htdocs/manual/misc/perf-dec.html
 share/httpd/htdocs/manual/misc/perf-hp.html
 share/httpd/htdocs/manual/misc/perf-tuning.html
 share/httpd/htdocs/manual/misc/perf.html
+share/httpd/htdocs/manual/misc/rewriteguide.html
 share/httpd/htdocs/manual/misc/security_tips.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
@@ -177,6 +192,7 @@ share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
 share/httpd/htdocs/manual/multilogs.html
+share/httpd/htdocs/manual/netware.html
 share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html