Upgrade to 1.3.14, use latest IPv6 patch and sync with www/apache13.

3 files changed, 49 insertions, 12 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index bc60341fdcd1..e28e99e8dc85 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache+ipv6
-PORTVERSION= 	1.3.12
+PORTVERSION=	1.3.14
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,7 +26,7 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 DISTNAME=	apache_${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	apache-1.3.12-v6-20000908a.diff.gz
+PATCHFILES=	apache-1.3.14-v6-20001114.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sumikawa@FreeBSD.org
@@ -45,15 +45,17 @@ CONFIGURE_ARGS=	\
 		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
 		--suexec-docroot=${PREFIX}/www/data \
 		--without-confadjust \
-		--enable-shared=remain \
 		--enable-rule=INET6 \
 		--enable-module=most \
 		--enable-module=auth_db \
-		--disable-module=auth_dbm
+		--enable-module=mmap_static \
+		--disable-module=auth_dbm \
+		--enable-shared=max
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
+		-DACCEPT_FILTER_NAME=\\"httpready\\"
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
 OPTIM+=		-DBUFFERED_LOGS
@@ -71,9 +73,6 @@ MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 BROKEN=		"build only on IPv6 environment"
 .endif
 
-pre-configure:
-	${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo
index 1204544ae6f5..ef725871aef9 100644
--- a/www/apache13+ipv6/distinfo
+++ b/www/apache13+ipv6/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (apache-1.3.12-v6-20000908a.diff.gz) = 4e218076276d989a878b9416f7c4f234
+MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
+MD5 (apache-1.3.14-v6-20001114.diff.gz) = ea89d6b8dd2ba9314bf2073627230b7a
diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist
index b7b60c091dc4..229585a8e8ae 100644
--- a/www/apache13+ipv6/pkg-plist
+++ b/www/apache13+ipv6/pkg-plist
@@ -17,8 +17,8 @@ etc/apache/mime.types.default
 etc/apache/srm.conf.default
 @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
 etc/rc.d/apache.sh
-include/apache/alloc.h
 include/apache/ap.h
+include/apache/ap_alloc.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
 include/apache/ap_config_auto.h
@@ -65,17 +65,35 @@ include/apache/xml/xmltok.h
 include/apache/xml/xmltok_impl.h
 libexec/apache/httpd.exp
 libexec/apache/libproxy.so
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.so
+libexec/apache/mod_autoindex.so
 libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.so
 libexec/apache/mod_digest.so
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.so
 libexec/apache/mod_headers.so
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.so
 libexec/apache/mod_info.so
+libexec/apache/mod_log_config.so
+libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mmap_static.so
+libexec/apache/mod_negotiation.so
 libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.so
 libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
 libexec/apache/mod_vhost_alias.so
 sbin/ab
@@ -84,12 +102,13 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-share/doc/apache/apache_pb.gif
+share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
+share/doc/apache/apache_pb.gif
 share/doc/apache/index.html.ca
 share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
@@ -98,17 +117,29 @@ share/doc/apache/index.html.ee
 share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
+share/doc/apache/index.html.he.iso8859-8
 share/doc/apache/index.html.it
 share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.kr.iso-kr
 share/doc/apache/index.html.lu
 share/doc/apache/index.html.nl
+share/doc/apache/index.html.no
 share/doc/apache/index.html.po.iso-pl
 share/doc/apache/index.html.pt
 share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.utf8
 share/doc/apache/index.html.se
+share/doc/apache/index.html.tw.Big5
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/configuring.html
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html
 share/doc/apache/manual/dns-caveats.html
@@ -154,6 +185,7 @@ share/doc/apache/manual/misc/perf-tuning.html
 share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
+share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
@@ -161,6 +193,7 @@ share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
+share/doc/apache/manual/mod/index-bytype.html
 share/doc/apache/manual/mod/index.html
 share/doc/apache/manual/mod/mod_access.html
 share/doc/apache/manual/mod/mod_actions.html
@@ -206,12 +239,15 @@ share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
+share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
 share/doc/apache/manual/netware.html
 share/doc/apache/manual/new_features_1_0.html
 share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
 share/doc/apache/manual/new_features_1_3.html
+share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
 share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
@@ -235,6 +271,8 @@ share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
 share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/win_compiling.html
+share/doc/apache/manual/win_service.html
 share/doc/apache/manual/windows.html
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi