Upgrade to 1.3.19

15 files changed, 120 insertions, 35 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 0ac6dcab2dca..7da597f45b62 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=    1.3.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,8 +25,8 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    ${MASTER_SITES}
-PATCHFILES=     apache_1.3.17-fix.diff
+#PATCH_SITES=    ${MASTER_SITES}
+#PATCHFILES=     apache_${PORTVERSION}-fix.diff
 
 MAINTAINER=	ache@freebsd.org
 
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index ee7dcede14d3..2d2273f86b4e 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index 60156ae0f30f..1d0c4d1df94d 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -139,9 +139,11 @@ share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
@@ -149,13 +151,17 @@ share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
 share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
@@ -167,11 +173,16 @@ share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -201,6 +212,7 @@ share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
@@ -240,6 +252,7 @@ share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
@@ -252,6 +265,7 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
@@ -260,6 +274,7 @@ 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.en
+share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
@@ -281,6 +296,8 @@ share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -288,6 +305,7 @@ share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -296,6 +314,7 @@ share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 0ac6dcab2dca..7da597f45b62 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=    1.3.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,8 +25,8 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    ${MASTER_SITES}
-PATCHFILES=     apache_1.3.17-fix.diff
+#PATCH_SITES=    ${MASTER_SITES}
+#PATCHFILES=     apache_${PORTVERSION}-fix.diff
 
 MAINTAINER=	ache@freebsd.org
 
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index ee7dcede14d3..2d2273f86b4e 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 60156ae0f30f..1d0c4d1df94d 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -139,9 +139,11 @@ share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
@@ -149,13 +151,17 @@ share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
 share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
@@ -167,11 +173,16 @@ share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -201,6 +212,7 @@ share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
@@ -240,6 +252,7 @@ share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
@@ -252,6 +265,7 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
@@ -260,6 +274,7 @@ 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.en
+share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
@@ -281,6 +296,8 @@ share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -288,6 +305,7 @@ share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -296,6 +314,7 @@ share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 0ac6dcab2dca..7da597f45b62 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=    1.3.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,8 +25,8 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    ${MASTER_SITES}
-PATCHFILES=     apache_1.3.17-fix.diff
+#PATCH_SITES=    ${MASTER_SITES}
+#PATCHFILES=     apache_${PORTVERSION}-fix.diff
 
 MAINTAINER=	ache@freebsd.org
 
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index ee7dcede14d3..2d2273f86b4e 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 60156ae0f30f..1d0c4d1df94d 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -139,9 +139,11 @@ share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
@@ -149,13 +151,17 @@ share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
 share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
@@ -167,11 +173,16 @@ share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -201,6 +212,7 @@ share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
@@ -240,6 +252,7 @@ share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
@@ -252,6 +265,7 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
@@ -260,6 +274,7 @@ 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.en
+share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
@@ -281,6 +296,8 @@ share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -288,6 +305,7 @@ share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -296,6 +314,7 @@ share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 0ac6dcab2dca..7da597f45b62 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=    1.3.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,8 +25,8 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    ${MASTER_SITES}
-PATCHFILES=     apache_1.3.17-fix.diff
+#PATCH_SITES=    ${MASTER_SITES}
+#PATCHFILES=     apache_${PORTVERSION}-fix.diff
 
 MAINTAINER=	ache@freebsd.org
 
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index ee7dcede14d3..2d2273f86b4e 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 60156ae0f30f..1d0c4d1df94d 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -139,9 +139,11 @@ share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
@@ -149,13 +151,17 @@ share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
 share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
@@ -167,11 +173,16 @@ share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -201,6 +212,7 @@ share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
@@ -240,6 +252,7 @@ share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
@@ -252,6 +265,7 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
@@ -260,6 +274,7 @@ 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.en
+share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
@@ -281,6 +296,8 @@ share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -288,6 +305,7 @@ share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -296,6 +314,7 @@ share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 0ac6dcab2dca..7da597f45b62 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=    1.3.19
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,8 +25,8 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=    ${MASTER_SITES}
-PATCHFILES=     apache_1.3.17-fix.diff
+#PATCH_SITES=    ${MASTER_SITES}
+#PATCHFILES=     apache_${PORTVERSION}-fix.diff
 
 MAINTAINER=	ache@freebsd.org
 
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index ee7dcede14d3..2d2273f86b4e 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
-MD5 (apache_1.3.17-fix.diff) = 92ad88730918bcd04763b99fe4493a41
+MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 60156ae0f30f..1d0c4d1df94d 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -139,9 +139,11 @@ share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
 share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.html
 share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
 share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.html
 share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
@@ -149,13 +151,17 @@ share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
 share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
 share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
 share/doc/apache/manual/howto/cgi.html.ja.jis
 share/doc/apache/manual/howto/footer.html
 share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
 share/doc/apache/manual/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
@@ -167,11 +173,16 @@ share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
 share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
 share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
+share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
 share/doc/apache/manual/man-template.html
@@ -201,6 +212,7 @@ share/doc/apache/manual/misc/vif-info.html
 share/doc/apache/manual/misc/windoz_keepalive.html
 share/doc/apache/manual/mod/core.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.html
 share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
@@ -240,6 +252,7 @@ share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
 share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
 share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
@@ -252,6 +265,7 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.html
 share/doc/apache/manual/mod/module-dict.html.ja.jis
 share/doc/apache/manual/mpeix.html
 share/doc/apache/manual/multilogs.html
@@ -260,6 +274,7 @@ 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.en
+share/doc/apache/manual/new_features_1_3.html.html
 share/doc/apache/manual/new_features_1_3.html.ja.jis
 share/doc/apache/manual/new_features_2_0.html
 share/doc/apache/manual/process-model.html
@@ -281,6 +296,8 @@ share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/search/manual-index.cgi
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
 share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
@@ -288,6 +305,7 @@ share/doc/apache/manual/suexec.html
 share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
 share/doc/apache/manual/vhosts/details.html
 share/doc/apache/manual/vhosts/details_1_2.html
 share/doc/apache/manual/vhosts/examples.html
@@ -296,6 +314,7 @@ share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
 share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
 share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html