12 files changed, 157 insertions, 249 deletions

diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh
index ca4321814e5a..ab1a71895d0c 100644
--- a/www/apache21/files/apache.sh
+++ b/www/apache21/files/apache.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+PREFIX=@@PREFIX@@
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+	[ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl
+	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
 	;;
 stop)
-	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index dc71e6df0a20..6e19ed4299c9 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Jan 23 16:10:16 2002
-+++ Makefile.in	Fri Feb 22 03:32:58 2002
-@@ -32,7 +32,9 @@
+--- Makefile.in.orig	Sat Apr  6 04:36:06 2002
++++ Makefile.in	Sun Apr  7 08:26:45 2002
+@@ -33,12 +33,15 @@
  	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
  	@cd $(top_srcdir)/docs/conf; \
  	for i in mime.types magic; do \
@@ -9,9 +9,15 @@
 +		cp -f $$i $$i.default; \
 +		$(INSTALL_DATA) $$i.default $(sysconfdir); \
  	done; \
+ 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
+ 		cd $$j ; \
  	for i in *-std* ssl.conf; do \
  		[ -f $$i ] || continue; \
-@@ -54,7 +56,7 @@
++		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
+ 		( \
+ 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,7 +60,7 @@
  						echo "<IfDefine SSL>"; \
  					fi; \
  					if test $$j != "^EOL^"; then \
@@ -20,7 +26,7 @@
  					fi; \
  					if test "x$$j" = "xssl"; then \
  						echo "</IfDefine>"; \
-@@ -106,11 +108,14 @@
+@@ -106,11 +109,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
@@ -32,23 +38,23 @@
 +.if !defined(NOPORTDOCS)
  	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
  	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
--	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+-	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
 +.endif
-+	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
  
  install-error:
  	@echo Installing error documents
-@@ -126,9 +131,10 @@
+@@ -126,9 +132,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
--	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+-	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
+-	@test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
 +	@(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 {} \;)
++	@test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
  
  install-other:
  	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache21/files/patch-config.layout b/www/apache21/files/patch-config.layout
index 8fae2764a544..55349a330eb1 100644
--- a/www/apache21/files/patch-config.layout
+++ b/www/apache21/files/patch-config.layout
@@ -1,29 +1,29 @@
---- config.layout.orig	Thu Feb 21 03:02:06 2002
-+++ config.layout	Thu Feb 21 03:04:56 2002
-@@ -307,3 +307,26 @@
-     infodir:       $exec_prefix/share/info
-     installbuilddir: $prefix/etc/apache2/build
+--- config.layout.orig	Fri Mar 29 04:04:47 2002
++++ config.layout	Sun Apr  7 06:27:03 2002
+@@ -309,3 +309,26 @@
+     installbuilddir: ${prefix}/etc/apache2/build
+     errordir:      ${datadir}/error
  </Layout>
 +
 +<Layout FreeBSD>
 +    prefix:        /usr/local
-+    exec_prefix:   $prefix
-+    bindir:        $exec_prefix/bin
-+    sbindir:       $exec_prefix/sbin
-+    libexecdir:    $exec_prefix/libexec/apache
-+    mandir:        $prefix/man
-+    sysconfdir:    $prefix/etc/apache2
-+    datadir:       $prefix/www
-+    installbuilddir: $prefix/share/apache
-+    errordir:      $datadir/error
-+    iconsdir:      $datadir/icons
-+    htdocsdir:     $datadir/data
-+    manualdir:     $prefix/share/doc/apache
-+    cgidir:        $datadir/cgi-bin
-+    includedir:    $prefix/include/apache
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
++    libexecdir:    ${exec_prefix}/libexec/apache2
++    mandir:        ${prefix}/man
++    sysconfdir:    ${prefix}/etc/apache2
++    datadir:       ${prefix}/www
++    installbuilddir: ${prefix}/share/apache2
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/data
++    manualdir:     ${prefix}/share/doc/apache2
++    cgidir:        ${datadir}/cgi-bin
++    includedir:    ${prefix}/include/apache2
 +    localstatedir: /var
-+    runtimedir:    $localstatedir/run
-+    logfiledir:    $localstatedir/log
-+    proxycachedir: $datadir/proxy
-+    infodir:       $exec_prefix/share/info
++    runtimedir:    ${localstatedir}/run
++    logfiledir:    ${localstatedir}/log
++    proxycachedir: ${datadir}/proxy
++    infodir:       ${exec_prefix}/share/info
 +</Layout>
diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure
index 7ceda58436da..8c3f38a5bc46 100644
--- a/www/apache21/files/patch-configure
+++ b/www/apache21/files/patch-configure
@@ -1,14 +1,12 @@
---- configure.orig	Fri Feb 22 03:43:38 2002
-+++ configure	Fri Feb 22 03:44:56 2002
-@@ -11095,7 +11095,10 @@
- EOF
+--- configure.orig	Sat Apr  6 15:19:30 2002
++++ configure	Sun Apr  7 09:13:07 2002
+@@ -12087,6 +12087,9 @@
  
  cat >> confdefs.h <<EOF
--#define SERVER_CONFIG_FILE "conf/$progname.conf"
-+#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
-+#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
-+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
+ #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
++#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
++#define DOCUMENT_LOCATION "${rel_htdocsdir}"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf b/www/apache21/files/patch-docs:conf:httpd-std.conf
deleted file mode 100644
index 8b0665b95c63..000000000000
--- a/www/apache21/files/patch-docs:conf:httpd-std.conf
+++ /dev/null
@@ -1,171 +0,0 @@
---- docs/conf/httpd-std.conf.orig	Fri Jan 25 09:24:47 2002
-+++ docs/conf/httpd-std.conf	Fri Feb 22 02:32:28 2002
-@@ -66,7 +66,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--ScoreBoardFile logs/apache_runtime_status
-+ScoreBoardFile /var/run/apache_runtime_status
- </IfModule>
- </IfModule>
- 
-@@ -76,7 +76,7 @@
- # identification number when it starts.
- #
- <IfModule !mpm_netware.c>
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- </IfModule>
- 
- #
-@@ -248,8 +248,8 @@
- #  when the value of (unsigned)Group is above 60000; 
- #  don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User www
-+Group www
- </IfModule>
- </IfModule>
- 
-@@ -279,7 +279,7 @@
- # documents. By default, all requests are taken from this directory, but
- # symbolic links and aliases may be used to point to other locations.
- #
--DocumentRoot "@@ServerRoot@@/htdocs"
-+DocumentRoot "@@ServerRoot@@/www/data"
- 
- #
- # Each directory to which Apache has access can be configured with respect
-@@ -304,7 +304,7 @@
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
--<Directory "@@ServerRoot@@/htdocs">
-+<Directory "@@ServerRoot@@/www/data">
- 
- #
- # Possible values for the Options directive are "None", "All",
-@@ -397,7 +397,7 @@
- # TypesConfig describes where the mime.types file (or equivalent) is
- # to be found.
- #
--TypesConfig conf/mime.types
-+TypesConfig etc/apache2/mime.types
- 
- #
- # DefaultType is the default MIME type the server will use for a document
-@@ -416,7 +416,7 @@
- # directive tells the module where the hint definitions are located.
- #
- <IfModule mod_mime_magic.c>
--    MIMEMagicFile conf/magic
-+    MIMEMagicFile etc/apache2/magic
- </IfModule>
- 
- #
-@@ -436,7 +436,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.
- #
--ErrorLog logs/error_log
-+ErrorLog /var/log/httpd-error.log
- 
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -461,20 +461,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog /var/log/httpd-access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog logs/referer_log referer
--#CustomLog logs/agent_log agent
-+#CustomLog /var/log/httpd-referer_log referer
-+#CustomLog /var/log/httpd-agent_log agent
- 
- #
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog /var/log/httpd-access.log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -498,9 +498,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/"
- 
--<Directory "@@ServerRoot@@/icons">
-+<Directory "@@ServerRoot@@/www/icons">
-     Options Indexes MultiViews
-     AllowOverride None
-     Order allow,deny
-@@ -512,9 +512,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
-@@ -529,21 +529,21 @@
- # The same rules about trailing "/" apply to ScriptAlias directives as to
- # Alias.
- #
--ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
-+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
- 
- <IfModule mod_cgid.c>
- #
- # 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.
- #
--<Directory "@@ServerRoot@@/cgi-bin">
-+<Directory "@@ServerRoot@@/www/cgi-bin">
-     AllowOverride None
-     Options None
-     Order allow,deny
-@@ -859,9 +859,9 @@
- 
- <IfModule mod_negotiation.c>
- <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
-@@ -974,7 +974,7 @@
- # Bring in additional module-specific configurations
- #
- <IfModule mod_ssl.c>
--    Include conf/ssl.conf
-+    Include etc/apache2/ssl.conf
- </IfModule>
- 
- 
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf.in b/www/apache21/files/patch-docs:conf:httpd-std.conf.in
new file mode 100644
index 000000000000..91ccd0b595b0
--- /dev/null
+++ b/www/apache21/files/patch-docs:conf:httpd-std.conf.in
@@ -0,0 +1,65 @@
+--- docs/conf/httpd-std.conf.in.orig	Thu Apr  4 18:15:43 2002
++++ docs/conf/httpd-std.conf.in	Sun Apr  7 11:51:13 2002
+@@ -68,7 +68,7 @@
+ #
+ <IfModule !mpm_netware.c>
+ <IfModule !perchild.c>
+-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
++#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
+ </IfModule>
+ </IfModule>
+ 
+@@ -78,7 +78,7 @@
+ # identification number when it starts.
+ #
+ <IfModule !mpm_netware.c>
+-PidFile @rel_logfiledir@/httpd.pid
++PidFile @rel_runtimedir@/httpd.pid
+ </IfModule>
+ 
+ #
+@@ -250,8 +250,8 @@
+ #  when the value of (unsigned)Group is above 60000; 
+ #  don't use Group #-1 on these systems!
+ #
+-User nobody
+-Group #-1
++User www
++Group www
+ </IfModule>
+ </IfModule>
+ 
+@@ -437,7 +437,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.
+ #
+-ErrorLog @rel_logfiledir@/error_log
++ErrorLog @rel_logfiledir@/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -462,20 +462,20 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog @rel_logfiledir@/access_log common
++#CustomLog @rel_logfiledir@/httpd-access.log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+ # following directives.
+ #
+-#CustomLog @rel_logfiledir@/referer_log referer
+-#CustomLog @rel_logfiledir@/agent_log agent
++#CustomLog @rel_logfiledir@/httpd-referer.log referer
++#CustomLog @rel_logfiledir@/httpd-agent.log agent
+ 
+ #
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog @rel_logfiledir@/access_log combined
++CustomLog @rel_logfiledir@/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
diff --git a/www/apache21/files/patch-docs:conf:ssl-std.conf b/www/apache21/files/patch-docs:conf:ssl-std.conf
index 9dcf0d50384a..b13bee04e6af 100644
--- a/www/apache21/files/patch-docs:conf:ssl-std.conf
+++ b/www/apache21/files/patch-docs:conf:ssl-std.conf
@@ -1,5 +1,5 @@
 --- docs/conf/ssl-std.conf.orig	Thu Nov  8 07:16:09 2001
-+++ docs/conf/ssl-std.conf	Fri Feb 22 02:37:27 2002
++++ docs/conf/ssl-std.conf	Sun Apr  7 09:26:02 2002
 @@ -55,15 +55,15 @@
  #   Configure the SSL Session Cache: First the mechanism 
  #   to use and second the expiring timeout (in seconds).
diff --git a/www/apache21/files/patch-srclib:apr-util:configure b/www/apache21/files/patch-srclib:apr-util:configure
index bd10fd35df68..bf6d83956754 100644
--- a/www/apache21/files/patch-srclib:apr-util:configure
+++ b/www/apache21/files/patch-srclib:apr-util:configure
@@ -1,6 +1,6 @@
---- srclib/apr-util/configure.orig	Fri Feb 22 02:55:35 2002
-+++ srclib/apr-util/configure	Fri Feb 22 02:56:03 2002
-@@ -5770,7 +5770,7 @@
+--- srclib/apr-util/configure.orig	Sat Apr  6 15:19:28 2002
++++ srclib/apr-util/configure	Sun Apr  7 06:35:09 2002
+@@ -5790,7 +5790,7 @@
  
  
  if test -z "$expat_include_dir"; then
@@ -8,4 +8,4 @@
 +  for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do
      
    echo $ac_n "checking for Expat in $d""... $ac_c" 1>&6
- echo "configure:5777: checking for Expat in $d" >&5
+ echo "configure:5797: checking for Expat in $d" >&5
diff --git a/www/apache21/files/patch-srclib:apr:include:apr_atomic.h b/www/apache21/files/patch-srclib:apr:include:apr_atomic.h
new file mode 100644
index 000000000000..b9622dfc5c8a
--- /dev/null
+++ b/www/apache21/files/patch-srclib:apr:include:apr_atomic.h
@@ -0,0 +1,17 @@
+--- srclib/apr/include/apr_atomic.h.orig	Sun Apr  7 22:54:09 2002
++++ srclib/apr/include/apr_atomic.h	Sun Apr  7 22:55:03 2002
+@@ -191,10 +191,10 @@
+ #include <machine/atomic.h>
+ 
+ #define apr_atomic_t apr_uint32_t
+-#define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
+-#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
+-#define apr_atomic_inc(mem)          atomic_add_int(mem,1)
+-#define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
++#define apr_atomic_add(mem, val)     (atomic_add_int(mem,val),mem)
++#define apr_atomic_dec(mem)          (atomic_subtract_int(mem,1),mem)
++#define apr_atomic_inc(mem)          (atomic_add_int(mem,1),mem)
++#define apr_atomic_set(mem, val)     (atomic_set_int(mem, val),mem)
+ #define apr_atomic_read(mem)         *mem
+ 
+ #define APR_ATOMIC_NEED_CAS_DEFAULT 1
diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in
index 2e4ba03f6166..2c49f1d188f8 100644
--- a/www/apache21/files/patch-support:apachectl.in
+++ b/www/apache21/files/patch-support:apachectl.in
@@ -1,18 +1,14 @@
---- support/apachectl.in.orig	Sat Dec 15 22:56:36 2001
-+++ support/apachectl.in	Fri Feb 22 02:40:03 2002
-@@ -26,10 +26,10 @@
- # --------------------                              --------------------
- # 
- # the path to your PID file
--PIDFILE=@prefix@/logs/@progname@.pid
-+PIDFILE=/var/run/@progname@.pid
+--- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
++++ support/apachectl.in	Sun Apr  7 08:49:25 2002
+@@ -29,7 +29,7 @@
+ PIDFILE=@exp_runtimedir@/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/@progname@'
-+HTTPD='@prefix@/sbin/@progname@'
+-HTTPD='@exp_bindir@/@progname@'
++HTTPD='@exp_sbindir@/@progname@'
  #
  # pick up any necessary environment variables
- if test -f @prefix@/bin/envvars; then
+ if test -f @exp_bindir@/envvars; then
 @@ -47,6 +47,7 @@
  #
  # --------------------                              --------------------
diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in
index 6ea17a914bdc..5e6f5fdf6cdc 100644
--- a/www/apache21/files/patch-support:apxs.in
+++ b/www/apache21/files/patch-support:apxs.in
@@ -1,40 +1,40 @@
---- support/apxs.in.orig	Sat Feb  2 04:25:14 2002
-+++ support/apxs.in	Fri Feb 22 02:49:11 2002
+--- support/apxs.in.orig	Thu Mar 14 05:48:05 2002
++++ support/apxs.in	Sun Apr  7 08:47:34 2002
 @@ -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/apache/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/apache2/config_vars.mk",\%config_vars);
  
  my $exec_prefix    = get_vars("exec_prefix");
  my $CFG_TARGET     = get_vars("progname");
-@@ -414,7 +414,7 @@
+@@ -415,7 +415,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
 -        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-+        push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
++        push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
          unshift(@objs, $lo);
      }
  
-@@ -439,7 +439,7 @@
+@@ -440,7 +440,7 @@
          $opt .= " -l$opt_l";
      }
  
 -    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
-+    push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
++    push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -470,8 +470,8 @@
+@@ -471,8 +471,8 @@
          $t =~ s|^.+/([^/]+)$|$1|;
          $t =~ s|\.la$|\.so|;
          if ($opt_i) {
 -	    push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
 -                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
-+	    push(@cmds, "$prefix/share/apache/instdso.sh SH_LIBTOOL='" .
-+                 "$prefix/share/apache/libtool' $f $CFG_LIBEXECDIR");
++	    push(@cmds, "$prefix/share/apache2/instdso.sh SH_LIBTOOL='" .
++                 "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
  	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
          }
  
diff --git a/www/apache21/files/patch-support:log_server_status.in b/www/apache21/files/patch-support:log_server_status.in
index 20e899a9272c..191377e97c58 100644
--- a/www/apache21/files/patch-support:log_server_status.in
+++ b/www/apache21/files/patch-support:log_server_status.in
@@ -1,5 +1,5 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Fri Feb 22 02:50:20 2002
+--- support/log_server_status.in.orig	Thu Mar 14 05:48:06 2002
++++ support/log_server_status.in	Sun Apr  7 08:47:53 2002
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';