Upgrade to 1.3.22

5 files changed, 72 insertions, 32 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 02b0094b30ef..5a6444099467 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.20
+PORTVERSION=    1.3.22
 CATEGORIES=	www
 MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index 243e8f460044..722ea9d62460 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f
+MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90
diff --git a/www/apache13/files/FreeBSD.layout b/www/apache13/files/FreeBSD.layout
index 5524e186e9c0..29ec00a18559 100644
--- a/www/apache13/files/FreeBSD.layout
+++ b/www/apache13/files/FreeBSD.layout
@@ -10,6 +10,7 @@
     datadir:       $prefix/www
     iconsdir:      $datadir/icons
     htdocsdir:     $datadir/data
+    manualdir:     $prefix/share/doc/apache/manual
     cgidir:        $datadir/cgi-bin
     includedir:    $prefix/include/apache
     localstatedir: /var
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index e4448f1e47ca..8615b1e3f9e0 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.tmpl.orig	Tue Jan 11 22:47:41 2000
-+++ Makefile.tmpl	Mon Jan 24 19:50:42 2000
-@@ -123,6 +123,7 @@
+--- Makefile.tmpl.orig	Sun Oct  7 02:01:09 2001
++++ Makefile.tmpl	Sun Oct 14 11:14:32 2001
+@@ -127,6 +127,7 @@
  runtimedir      = @runtimedir@
  logfiledir      = @logfiledir@
  proxycachedir   = @proxycachedir@
@@ -8,19 +8,20 @@
  
  libexecdir_relative   = @libexecdir_relative@
  
-@@ -266,9 +267,9 @@
+@@ -270,10 +271,10 @@
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
 -	$(MKDIR) $(root)$(htdocsdir)
 +	$(MKDIR) $(root)$(doc_prefix)
+ 	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
 +	$(MKDIR) $(root)$(cgidir).default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
-@@ -452,25 +453,33 @@
+@@ -457,33 +458,41 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -32,25 +33,34 @@
 +#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 +#        else \
 +		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
 -		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
 -		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
 -	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
+-	-@if [ -d $(TOP)/htdocs/manual ]; then \
 +		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
 +		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
++		find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \
++#        fi
++#        -@if [ -d $(TOP)/htdocs/manual ]; then \
+ 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+ 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+ 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
+ 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+-	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+-	else \
 +#        fi
 +	if [ ! -d $(root)$(htdocsdir) ]; then \
 +		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+  	fi
++	fi
 +	$(RM) $(root)$(htdocsdir).default
 +	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
 +#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++#                echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
 +#        else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
@@ -61,13 +71,15 @@
 +			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
 +			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
  		done; \
+-	fi
 +#        fi
 +	if [ ! -d $(root)$(cgidir) ]; then \
 +		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
- 	fi
++  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -509,10 +518,10 @@
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+@@ -522,10 +531,10 @@
  			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
  			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index 0ff3407e0b0d..94045c1d0260 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -101,13 +101,12 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-share/doc/apache/README.rus
+share/doc/apache/apache_pb.gif
 @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
@@ -123,6 +122,7 @@ 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.nn
 share/doc/apache/index.html.no
 share/doc/apache/index.html.po.iso-pl
 share/doc/apache/index.html.pt
@@ -137,20 +137,30 @@ share/doc/apache/index.html.ru.utf8
 share/doc/apache/index.html.se
 share/doc/apache/index.html.zh.Big5
 share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html.en
+share/doc/apache/manual/bind.html.fr
+share/doc/apache/manual/bind.html.html
+share/doc/apache/manual/cgi_path.html.en
+share/doc/apache/manual/cgi_path.html.fr
+share/doc/apache/manual/cgi_path.html.html
 share/doc/apache/manual/configuring.html.en
 share/doc/apache/manual/configuring.html.fr
 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.fr
 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/cygwin.html
+share/doc/apache/manual/dns-caveats.html.en
+share/doc/apache/manual/dns-caveats.html.fr
+share/doc/apache/manual/dns-caveats.html.html
 share/doc/apache/manual/dso.html
 share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
+share/doc/apache/manual/env.html.en
+share/doc/apache/manual/env.html.html
+share/doc/apache/manual/env.html.ja.jis
 share/doc/apache/manual/footer.html
 share/doc/apache/manual/handler.html.en
 share/doc/apache/manual/handler.html.html
@@ -184,11 +194,14 @@ share/doc/apache/manual/install.html.es
 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.en
 share/doc/apache/manual/invoking.html.fr
 share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/keepalive.html.en
+share/doc/apache/manual/keepalive.html.html
+share/doc/apache/manual/keepalive.html.ja.jis
 share/doc/apache/manual/location.html
+share/doc/apache/manual/logs.html
 share/doc/apache/manual/man-template.html
 share/doc/apache/manual/misc/API.html
 share/doc/apache/manual/misc/FAQ.html
@@ -214,17 +227,27 @@ 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
+share/doc/apache/manual/mod/core.html.en
+share/doc/apache/manual/mod/core.html.fr
+share/doc/apache/manual/mod/core.html.html
 share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.fr
 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/directives.html.de
+share/doc/apache/manual/mod/directives.html.en
+share/doc/apache/manual/mod/directives.html.fr
+share/doc/apache/manual/mod/directives.html.html
+share/doc/apache/manual/mod/directives.html.ja.jis
 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-bytype.html.en
 share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/index-bytype.html.html
+share/doc/apache/manual/mod/index.html.en
 share/doc/apache/manual/mod/index.html.fr
+share/doc/apache/manual/mod/index.html.html
+share/doc/apache/manual/mod/index.html.ja.jis
 share/doc/apache/manual/mod/mod_access.html
 share/doc/apache/manual/mod/mod_actions.html
 share/doc/apache/manual/mod/mod_alias.html
@@ -314,7 +337,7 @@ 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
+share/doc/apache/manual/stopping.html.en
 share/doc/apache/manual/stopping.html.fr
 share/doc/apache/manual/stopping.html.html
 share/doc/apache/manual/suexec.html.en
@@ -336,11 +359,15 @@ 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
-share/doc/apache/manual/vhosts/name-based.html
+share/doc/apache/manual/vhosts/name-based.html.en
+share/doc/apache/manual/vhosts/name-based.html.html
+share/doc/apache/manual/vhosts/name-based.html.ja.jis
 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/win_service.html.en
+share/doc/apache/manual/win_service.html.html
+share/doc/apache/manual/win_service.html.ja.jis
 share/doc/apache/manual/windows.html
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi