Update to 2.0.28

PR:		32043
Submitted by:	maintainer

12 files changed, 252 insertions, 378 deletions

diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 341c8dfd087f..4c26f2dcc806 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,123 +1,45 @@
---- Makefile.in.orig	Wed Apr  4 02:03:35 2001
-+++ Makefile.in	Sun Apr  8 06:06:58 2001
-@@ -16,7 +16,7 @@
- targets         = $(PROGRAMS) $(other_targets)
- phony_targets   = $(srcdir)/buildmark.c
- install_targets = install-conf install-htdocs install-icons install-other \
--	install-cgi install-include install-support install-suexec
-+	install-cgi install-include install-support install-manpages install-suexec
- DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
- 	configure generated_lists include/ap_config_auto.h \
- 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-@@ -28,25 +28,32 @@
- install-conf:
- 	@echo Installing configuration files
- 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-+
- 	@cd docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(sysconfdir); \
-+		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 	done; \
- 	for i in *-std*; do \
- 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- 		    -e 's#@@Port@@#$(PORT)#g' \
--			< $$i > $(sysconfdir)/$$i; \
--		chmod 0644 $(sysconfdir)/$$i; \
-+			< $$i > $(sysconfdir)/$$i.default; \
-+		chmod 0644 $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
- 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 		fi; \
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
--			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
-+			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
- 		fi; \
- 	done
- 
- htdocs-srcdir = docs/docroot
-+htman-srcdir = docs/manual
-+doc_prefix = $(prefix)/share/doc/apache
-+man-srcdir = docs/man
- 
- docs::
- 	mkdir -p ./docs/api
-@@ -57,11 +64,14 @@
+--- Makefile.in.orig	Mon Oct 22 21:46:29 2001
++++ Makefile.in	Sat Nov 17 01:36:38 2001
+@@ -51,7 +51,7 @@
+ 					< $$i; \
+ 				for j in $(DSO_MODULES) "^EOL^"; do \
+ 					if test $$j != "^EOL^"; then \
+-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
++						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
+ 					fi; \
+ 				done; \
+ 				sed -e '1,/@@LoadModule@@/d' \
+@@ -93,11 +93,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
 -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
--	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
--	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
+-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
 -	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-+	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
-+	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
-+	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
-+	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
-+	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
-+	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
-+	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-icons:
- 	@echo Installing icons
-@@ -71,24 +81,27 @@
++	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
++	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
++.if !defined(NOPORTDOCS)
++	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
++	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
++.endif
++	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-error:
+ 	@echo Installing error documents
+@@ -113,9 +116,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
 -	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
-+	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
 +	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
  
- install-support:
- 	@echo Installing Support Binaries
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
--	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-+	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
-+	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
-+	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
- 	@cp -p $(builddir)/support/htpasswd $(bindir)
- 	@cp -p $(builddir)/support/htdigest $(bindir)
--	@cp -p $(builddir)/support/rotatelogs $(bindir)
--	@cp -p $(builddir)/support/logresolve $(bindir)
--	@cp -p $(builddir)/support/ab $(bindir)
--	@cp -p $(builddir)/support/apachectl $(bindir)
--	chmod 755 $(bindir)/apachectl
-+	@cp -p $(builddir)/support/rotatelogs $(sbindir)
-+	@cp -p $(builddir)/support/logresolve $(sbindir)
-+	@cp -p $(builddir)/support/ab $(sbindir)
-+	@cp -p $(builddir)/support/apachectl $(sbindir)
-+	chmod 755 $(sbindir)/apachectl
- 	@if test -f $(builddir)/support/apxs; then \
--	    cp -p $(builddir)/support/apxs $(bindir); \
--	    chmod 755 $(bindir)/apxs; \
-+	    cp -p $(builddir)/support/apxs $(sbindir); \
-+	    chmod 755 $(sbindir)/apxs; \
- 	fi
- 
- 
-@@ -117,6 +130,15 @@
- 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
- 	@chmod 644 $(includedir)/*.h
-+
-+install-manpages:
-+	@echo Installing manual pages
-+	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
-+	@for sect in 1 8; do \
-+		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
-+		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
-+	done;
-+	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
+ install-other:
+ 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache22/files/patch-build:rules.mk b/www/apache22/files/patch-build:rules.mk
deleted file mode 100644
index d5058a91d8ca..000000000000
--- a/www/apache22/files/patch-build:rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
-+++ build/rules.mk	Sun Apr  8 01:05:46 2001
-@@ -172,9 +172,9 @@
- all-p: $(targets)
- install-p: $(targets) $(install_targets)
- 	@if test -n '$(PROGRAMS)'; then \
--		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
-+		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 		for i in "$(PROGRAMS)"; do \
--			$(INSTALL_PROGRAM) $$i $(bindir); \
-+			$(INSTALL_PROGRAM) $$i $(sbindir); \
- 		done; \
- 	fi
- 
diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout
index 75a700c6a805..0bb23d72594f 100644
--- a/www/apache22/files/patch-config.layout
+++ b/www/apache22/files/patch-config.layout
@@ -1,6 +1,6 @@
---- config.layout.orig	Sat Apr  7 04:19:44 2001
-+++ config.layout	Sat Apr  7 04:20:28 2001
-@@ -249,3 +249,22 @@
+--- config.layout.orig	Fri Oct 26 11:59:26 2001
++++ config.layout	Fri Nov 16 18:36:14 2001
+@@ -285,3 +285,25 @@
      logfiledir:    $prefix/logs
      proxycachedir: $prefix/proxy
  </Layout>
@@ -14,8 +14,11 @@
 +    mandir:        $prefix/man
 +    sysconfdir:    $prefix/etc/apache
 +    datadir:       $prefix/www
++    installbuilddir: $prefix/share/mk/apache
++    errordir:      $datadir/error
 +    iconsdir:      $datadir/icons
 +    htdocsdir:     $datadir/data
++    manualdir:     ${prefix}/share/doc/apache
 +    cgidir:        $datadir/cgi-bin
 +    includedir:    $prefix/include/apache
 +    localstatedir: /var
diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
index 2640a5466ac0..007d46173167 100644
--- a/www/apache22/files/patch-configure
+++ b/www/apache22/files/patch-configure
@@ -1,50 +1,32 @@
---- configure.orig	Wed Apr  4 12:45:36 2001
-+++ configure	Sat Apr 14 18:25:08 2001
-@@ -3760,7 +3760,9 @@
-       -e "s/[ 	]*$/'/g" \
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
-   . $pldconf
-+  prefix=$prefix_backup
-   rm $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-@@ -3777,7 +3779,7 @@
-         ;;
-     esac
-     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
--    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
-+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
-     if test "$autosuffix" = "yes"; then
-       if echo $val | grep apache >/dev/null; then
-         addtarget=no
-@@ -3788,7 +3790,7 @@
-         val="$val/apache"
-       fi
-     fi
--    eval "$var='$val'"
-+    eval "$var=\"$val\""
-   done
-   
+--- configure.orig	Tue Nov 13 04:07:39 2001
++++ configure	Fri Nov 16 23:32:52 2001
+@@ -1084,7 +1084,7 @@
+   esac
  
-@@ -9678,6 +9680,10 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -1175,7 +1175,7 @@
+   esac
  
-   
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
-   
- 
-   
-@@ -9814,7 +9820,7 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
+@@ -10508,7 +10508,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
 +#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf b/www/apache22/files/patch-docs:conf:httpd-std.conf
index 928bc48b70d4..eb63c30ac79a 100644
--- a/www/apache22/files/patch-docs:conf:httpd-std.conf
+++ b/www/apache22/files/patch-docs:conf:httpd-std.conf
@@ -1,53 +1,24 @@
---- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
-+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
+--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
++++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
 @@ -64,7 +64,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- 
- #
- # ScoreBoardFile: File used to store internal server process information.
-@@ -73,7 +73,7 @@
- # no two invocations of Apache share the same scoreboard file.
  #
+ <IfModule !mpm_winnt.c>
  <IfModule !perchild.c>
 -ScoreBoardFile logs/apache_runtime_status
 +ScoreBoardFile /var/run/apache_runtime_status
  </IfModule>
+ </IfModule>
+ 
+@@ -73,7 +73,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
  
  #
-@@ -182,6 +182,28 @@
- #
- # Example:
- # LoadModule foo_module modules/mod_foo.so
-+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
-+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
-+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
-+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
-+#LoadModule cgid_module			libexec/apache/mod_cgid.so
-+#LoadModule dav_module			libexec/apache/mod_dav.so
-+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
-+#LoadModule digest_module		libexec/apache/mod_digest.so
-+#LoadModule expires_module		libexec/apache/mod_expires.so
-+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
-+#LoadModule headers_module		libexec/apache/mod_headers.so
-+#LoadModule imap_module			libexec/apache/mod_imap.so
-+#LoadModule include_module		libexec/apache/mod_include.so
-+#LoadModule info_module			libexec/apache/mod_info.so
-+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
-+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
-+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
-+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
-+#LoadModule speling_module		libexec/apache/mod_speling.so
-+#LoadModule status_module		libexec/apache/mod_status.so
-+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
-+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
- 
- ### Section 2: 'Main' server configuration
- #
-@@ -220,8 +242,8 @@
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -229,8 +229,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -55,10 +26,10 @@
 -Group #-1
 +User www
 +Group www
+ </IfModule>
  
  #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -249,7 +271,7 @@
+@@ -259,7 +259,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -67,7 +38,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -274,7 +296,7 @@
+@@ -284,7 +284,7 @@
  #
  # This should be changed to whatever you set DocumentRoot to.
  #
@@ -76,31 +47,7 @@
  
  #
  # This may also be "None", "All", or any combination of "Indexes",
-@@ -326,7 +348,22 @@
- # DirectoryIndex: Name of the file or files to use as a pre-written HTML
- # directory index.  Separate multiple entries with spaces.
- #
--DirectoryIndex index.html
-+<IfModule mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.php3 index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.php3 index.html
-+    </IfModule>
-+</IfModule>
-+<IfModule !mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.html
-+    </IfModule>
-+</IfModule>
- 
- #
- # AccessFileName: The name of the file to look for in each directory
-@@ -372,7 +409,7 @@
+@@ -377,7 +377,7 @@
  # TypesConfig describes where the mime.types file (or equivalent) is
  # to be found.
  #
@@ -109,8 +56,8 @@
  
  #
  # DefaultType is the default MIME type the server will use for a document
-@@ -397,7 +434,7 @@
- # module is part of the server.
+@@ -396,7 +396,7 @@
+ # directive tells the module where the hint definitions are located.
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
@@ -118,7 +65,7 @@
  </IfModule>
  
  #
-@@ -417,7 +454,7 @@
+@@ -416,7 +416,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -127,7 +74,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -442,7 +479,7 @@
+@@ -441,7 +441,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -136,7 +83,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -455,7 +492,7 @@
+@@ -454,7 +454,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -145,9 +92,9 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -474,9 +511,9 @@
- # require it to be present in the URL.  So "/icons" isn't aliased in this
- # example, only "/icons/"..
+@@ -478,9 +478,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
  #
 -Alias /icons/ "@@ServerRoot@@/icons/"
 +Alias /icons/ "@@ServerRoot@@/www/icons/"
@@ -157,7 +104,19 @@
      Options Indexes MultiViews
      AllowOverride None
      Order allow,deny
-@@ -491,7 +528,7 @@
+@@ -492,9 +492,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/manual"
++Alias /manual "@@ServerRoot@@/share/doc/apache"
+ 
+-<Directory "@@ServerRoot@@/manual">
++<Directory "@@ServerRoot@@/share/doc/apache">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -509,21 +509,21 @@
  # The same rules about trailing "/" apply to ScriptAlias directives as to
  # Alias.
  #
@@ -166,7 +125,14 @@
  
  <IfModule mod_cgid.c>
  #
-@@ -505,7 +542,7 @@
+ # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+ # for setting UNIX socket for communicating with cgid.
+ #
+-#Scriptsock            logs/cgisock
++Scriptsock            /var/run/cgisock
+ </IfModule>
+ 
+ #
  # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  #
@@ -175,31 +141,24 @@
      AllowOverride None
      Options None
      Order allow,deny
-@@ -657,6 +694,7 @@
- AddLanguage ja .ja
- AddLanguage pl .po
- AddLanguage kr .kr
-+AddLanguage ko .kr
- AddLanguage pt .pt
- AddLanguage no .no
- AddLanguage pt-br .pt-br
-@@ -741,8 +779,17 @@
- # For example, the PHP3 module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
--#AddType application/x-httpd-php3 .php3
--#AddType application/x-httpd-php3-source .phps
-+<IfModule mod_php3.c>
-+    AddType application/x-httpd-php3 .php3
-+    AddType application/x-httpd-php3-source .php3s
-+</IfModule>
-+#
-+# And for PHP 4.x, use:
-+#
-+<IfModule mod_php4.c>
-+    AddType application/x-httpd-php .php
-+    AddType application/x-httpd-php-source .phps
-+</IfModule>
- 
- AddType application/x-tar .tgz
+@@ -851,9 +851,9 @@
+ #
+ 
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/error/"
++    Alias /error/ "@@ServerRoot@@/www/error/"
+ 
+-    <Directory "@@ServerRoot@@/error">
++    <Directory "@@ServerRoot@@/www/error">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -964,7 +964,7 @@
+ # Bring in additional module-specific configurations
+ #
+ <IfModule mod_ssl.c>
+-    Include conf/ssl.conf
++    Include etc/apache/ssl.conf
+ </IfModule>
+ 
  
diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf b/www/apache22/files/patch-docs:conf:ssl-std.conf
new file mode 100644
index 000000000000..f647b91fac48
--- /dev/null
+++ b/www/apache22/files/patch-docs:conf:ssl-std.conf
@@ -0,0 +1,96 @@
+--- docs/conf/ssl-std.conf.orig	Fri Nov 16 21:56:55 2001
++++ docs/conf/ssl-std.conf	Fri Nov 16 22:00:27 2001
+@@ -57,7 +57,7 @@
+ #SSLSessionCache        none
+ #SSLSessionCache        shmht:logs/ssl_scache(512000)
+ #SSLSessionCache        shmcb:logs/ssl_scache(512000)
+-SSLSessionCache         dbm:logs/ssl_scache
++SSLSessionCache         dbm:/var/log/httpd-ssl_scache
+ SSLSessionCacheTimeout  300
+ 
+ #   Semaphore:
+@@ -99,11 +99,11 @@
+ <VirtualHost _default_:443>
+ 
+ #  General setup for the virtual host
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ ServerName new.host.name:443
+ ServerAdmin you@your.address
+-ErrorLog logs/error_log
+-TransferLog logs/access_log
++ErrorLog /var/log/httpd-error.log
++TransferLog /var/log/httpd-access.log
+ 
+ #   SSL Engine Switch:
+ #   Enable/Disable SSL for this virtual host.
+@@ -122,16 +122,16 @@
+ #   built time. Keep in mind that if you've both a RSA and a DSA
+ #   certificate you can configure both in parallel (to also allow
+ #   the use of DSA ciphers, etc.)
+-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
+-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
+ 
+ #   Server Private Key:
+ #   If the key is not combined with the certificate, use this
+ #   directive to point at the key file.  Keep in mind that if
+ #   you've both a RSA and a DSA private key you can configure
+ #   both in parallel (to also allow the use of DSA ciphers, etc.)
+-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
+-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
+ 
+ #   Server Certificate Chain:
+ #   Point SSLCertificateChainFile at a file containing the
+@@ -140,7 +140,7 @@
+ #   the referenced file can be the same as SSLCertificateFile
+ #   when the CA certificates are directly appended to the server
+ #   certificate for convinience.
+-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
+ 
+ #   Certificate Authority (CA):
+ #   Set the CA certificate verification path where to find CA
+@@ -149,8 +149,8 @@
+ #   Note: Inside SSLCACertificatePath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
+-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
+ 
+ #   Certificate Revocation Lists (CRL):
+ #   Set the CA revocation path where to find CA CRLs for client
+@@ -159,8 +159,8 @@
+ #   Note: Inside SSLCARevocationPath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
+-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
+ 
+ #   Client Authentication (Type):
+ #   Client certificate verification type and depth.  Types are
+@@ -220,7 +220,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     SSLOptions +StdEnvVars
+ </Files>
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     SSLOptions +StdEnvVars
+ </Directory>
+ 
+@@ -255,7 +255,7 @@
+ #   Per-Server Logging:
+ #   The home of a custom SSL log file. Use this when you want a
+ #   compact non-error SSL logfile on a virtual host basis.
+-CustomLog logs/ssl_request_log \
++CustomLog /var/log/httpd-ssl_request.log \
+           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ 
+ </VirtualHost>                                  
diff --git a/www/apache22/files/patch-include:httpd.h b/www/apache22/files/patch-include:httpd.h
deleted file mode 100644
index 9f8fdf34997b..000000000000
--- a/www/apache22/files/patch-include:httpd.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
-+++ include/httpd.h	Sat Apr  7 09:08:43 2001
-@@ -127,7 +127,7 @@
- /* Set default for OS/2 file system */
- #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
- #else
--#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
-+#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
- #endif
- #endif /* DOCUMENT_LOCATION */
- 
-@@ -144,7 +144,7 @@
- #if defined(OS2) || defined(WIN32)
- #define DEFAULT_ERRORLOG "logs/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -160,7 +160,7 @@
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -247,7 +247,7 @@
- 
- /* The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
- #endif
- 
- /*
diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib:apr-util:Makefile.in
deleted file mode 100644
index 652901dae28a..000000000000
--- a/www/apache22/files/patch-srclib:apr-util:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
-+++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
-@@ -22,8 +22,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -43,7 +43,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib:apr:Makefile.in
deleted file mode 100644
index 4c0292f73af8..000000000000
--- a/www/apache22/files/patch-srclib:apr:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
-+++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
-@@ -37,8 +37,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -58,7 +58,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    ./build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in
index 739a622d74de..f5b347b4633d 100644
--- a/www/apache22/files/patch-support:apachectl.in
+++ b/www/apache22/files/patch-support:apachectl.in
@@ -1,23 +1,22 @@
---- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
-+++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+--- support/apachectl.in.orig	Fri Nov 16 21:22:36 2001
++++ support/apachectl.in	Fri Nov 16 22:07:31 2001
 @@ -25,10 +25,10 @@
  # --------------------                              --------------------
  # 
  # the path to your PID file
--PIDFILE=@prefix@/logs/httpd.pid
-+PIDFILE=/var/run/httpd.pid
+-PIDFILE=@prefix@/logs/@progname@.pid
++PIDFILE=/var/run/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/httpd'
-+HTTPD='@prefix@/sbin/httpd'
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='@prefix@/sbin/@progname@'
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+
 +eval `limits -e -C daemon` >/dev/null 2>&1
  
  ERROR=0
diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in
index 70ca84075675..9ababb75322e 100644
--- a/www/apache22/files/patch-support:apxs.in
+++ b/www/apache22/files/patch-support:apxs.in
@@ -1,11 +1,20 @@
---- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
-+++ support/apxs.in	Sat Apr  7 11:55:28 2001
-@@ -73,7 +73,7 @@
- my $prefix            = "$CFG_PREFIX";
- my $CFG_EXEC_PREFIX   = "@exec_prefix@";
- my $exec_prefix       = "$CFG_EXEC_PREFIX";
--my $CFG_SBINDIR       = "@bindir@";
-+my $CFG_SBINDIR       = "@sbindir@";
- my $CFG_INCLUDEDIR    = "@includedir@";
- my $CFG_LIBEXECDIR    = "@libexecdir@";
- my $CFG_SYSCONFDIR    = "@sysconfdir@";
+--- support/apxs.in.orig	Sat Nov  3 05:09:20 2001
++++ support/apxs.in	Sat Nov 17 02:51:43 2001
+@@ -66,7 +66,7 @@
+ 
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);
+ 
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $CFG_TARGET     = get_vars("progname");
+@@ -218,7 +218,7 @@
+ ##
+ ##  Initial shared object support check
+ ##
+-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
++my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+ 
diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support:log_server_status.in
index 3549aa89f8c5..d8a970ebe8cd 100644
--- a/www/apache22/files/patch-support:log_server_status.in
+++ b/www/apache22/files/patch-support:log_server_status.in
@@ -1,15 +1,15 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+--- support/log_server_status.in.orig	Fri Nov 16 22:11:16 2001
++++ support/log_server_status.in	Fri Nov 16 22:13:50 2001
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
 -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
++$wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
 -$request = "/status/?auto";     # Request to send
-+$request = "/server-status/?auto";     # Request to send
++$request = "/status-status/?auto";     # Request to send
  
  sub tcp_connect
  {