Upgrade to 1.3.17

3 files changed, 48 insertions, 18 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index eb0f186..85b1132 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	1.3.14
-PORTREVISION=	1
+PORTVERSION=    1.3.17
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
@@ -26,9 +25,6 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
 DISTNAME=	apache_${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	apache_${PORTVERSION}-fix.diff
-
 MAINTAINER=	ache@freebsd.org
 
 #
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index 7378135..f51b5ce 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
-MD5 (apache_1.3.14-fix.diff) = 3af2b747ef1bd02a3fbdca2355040974
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 36cbf5c..60156ae 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -112,6 +112,7 @@ share/doc/apache/index.html.cz
 share/doc/apache/index.html.de
 share/doc/apache/index.html.dk
 share/doc/apache/index.html.ee
+share/doc/apache/index.html.el
 share/doc/apache/index.html.en
 share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
@@ -137,16 +138,25 @@ 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/configuring.html.en
+share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.ja.jis
 share/doc/apache/manual/dns-caveats.html
 share/doc/apache/manual/dso.html
 share/doc/apache/manual/ebcdic.html
 share/doc/apache/manual/env.html
 share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html
+share/doc/apache/manual/handler.html.en
+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.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/images/apache_header.gif
 share/doc/apache/manual/images/custom_errordocs.gif
 share/doc/apache/manual/images/home.gif
 share/doc/apache/manual/images/index.gif
@@ -154,10 +164,13 @@ share/doc/apache/manual/images/mod_rewrite_fig1.fig
 share/doc/apache/manual/images/mod_rewrite_fig1.gif
 share/doc/apache/manual/images/mod_rewrite_fig2.fig
 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
+share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html
+share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
@@ -187,7 +200,8 @@ 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
-share/doc/apache/manual/mod/directive-dict.html
+share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.ja.jis
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -210,7 +224,6 @@ share/doc/apache/manual/mod/mod_cookies.html
 share/doc/apache/manual/mod/mod_digest.html
 share/doc/apache/manual/mod/mod_dir.html
 share/doc/apache/manual/mod/mod_dld.html
-share/doc/apache/manual/mod/mod_dll.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
@@ -226,7 +239,8 @@ share/doc/apache/manual/mod/mod_log_referer.html
 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
+share/doc/apache/manual/mod/mod_negotiation.html.en
+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
 share/doc/apache/manual/mod/mod_setenvif.html
@@ -237,19 +251,37 @@ 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/mod/module-dict.html.en
+share/doc/apache/manual/mod/module-dict.html.ja.jis
 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_1_3.html.en
+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
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/programs/apachectl.html
+share/doc/apache/manual/programs/apxs.html
+share/doc/apache/manual/programs/dbmmanage.html
+share/doc/apache/manual/programs/footer.html
+share/doc/apache/manual/programs/header.html
+share/doc/apache/manual/programs/htdigest.html
+share/doc/apache/manual/programs/htpasswd.html
+share/doc/apache/manual/programs/httpd.html
+share/doc/apache/manual/programs/index.html
+share/doc/apache/manual/programs/logresolve.html
+share/doc/apache/manual/programs/other.html
+share/doc/apache/manual/programs/rotatelogs.html
+share/doc/apache/manual/programs/suexec.html
 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.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
@@ -263,7 +295,8 @@ share/doc/apache/manual/vhosts/fd-limits.html
 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
+share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.ja.jis
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
@@ -390,9 +423,11 @@ www/icons/world2.gif
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
+@dirrm share/doc/apache/manual/howto
 @dirrm share/doc/apache/manual/images
 @dirrm share/doc/apache/manual/misc
 @dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/programs
 @dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
 @dirrm share/doc/apache/manual