release/4.8.0

12 files changed, 0 insertions, 479 deletions

diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh
deleted file mode 100644
index ab1a71895d0c..000000000000
--- a/www/apache21/files/apache.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-PREFIX=@@PREFIX@@
-
-case "$1" in
-start)
-	[ "@@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 ' apache2'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/www/apache21/files/config.layout b/www/apache21/files/config.layout
deleted file mode 100644
index e1f6e37ef756..000000000000
--- a/www/apache21/files/config.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<Layout FreeBSD>
-  prefix:        /usr/local
-  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/build
-  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
-</Layout>
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
deleted file mode 100644
index 728fb88af957..000000000000
--- a/www/apache21/files/patch-Makefile.in
+++ /dev/null
@@ -1,109 +0,0 @@
---- Makefile.in.orig	Mon Sep 30 08:34:40 2002
-+++ Makefile.in	Thu Oct  3 21:05:42 2002
-@@ -36,10 +36,13 @@
- 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
- 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
- 	    fi; \
-+	    cp -f $$i $$i-dist; \
-+	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
- 	done; \
- 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 	    cd $$j ; \
- 	    for i in *-std*.conf; do \
-+		[ -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,6 +60,9 @@
- 	    				if test "x$$j" = "xssl"; then \
- 	    					echo "<IfDefine SSL>"; \
- 	    				fi; \
-+					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
-+					        echo -n "#"; \
-+					fi; \
- 	    				if test $$j != "^EOL^"; then \
- 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 	    				fi; \
-@@ -106,45 +112,33 @@
- 	doxygen $(top_srcdir)/docs/doxygen.conf
- 
- install-htdocs:
--	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
--           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
--        else \
--	    echo Installing HTML documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
--	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
--	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+	@echo Installing HTML documents
-+	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
-+	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
- 
- install-error:
--	-@if [ -d $(DESTDIR)$(errordir) ]; then \
--           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
--        else \
--	    echo Installing error documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
--	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
--	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+	@echo Installing error documents
-+	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
-+	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
-+	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
- 
- install-icons:
--	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
--           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
--        else \
--	    echo Installing icons ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
--	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
--	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
--
-+	@echo Installing icons
-+	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
-+	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
-+	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
-+ 
- install-cgi:
--	-@if [ -d $(DESTDIR)$(cgidir) ];then \
--	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
--	else \
--	   echo Installing CGIs ; \
--	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
--	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
--	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
--
-+	@echo Installing CGIs
-+	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+ 
- install-other:
- 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
- 	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
-@@ -185,11 +179,13 @@
- 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
- 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
- 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
--	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
- 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
-+.if !defined(NOPORTDOCS)
-+	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
-+.endif
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure
deleted file mode 100644
index 7a85d2f86f30..000000000000
--- a/www/apache21/files/patch-configure
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	Thu Oct  3 14:43:28 2002
-+++ configure	Wed Jan  8 19:58:11 2003
-@@ -1520,7 +1520,7 @@
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-   . $pldconf
--  rm $pldconf
-+  rm -f $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir errordir iconsdir htdocsdir cgidir \
-              includedir localstatedir runtimedir logfiledir libdir \
-@@ -2627,7 +2627,7 @@
-   esac
- 
-   # 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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir"
-+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir"
-   then :
-     echo "srclib/apr configured properly"
-   else
-@@ -2908,7 +2908,7 @@
-   esac
- 
-   # 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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir"
-+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir"
-   then :
-     echo "srclib/apr-util configured properly"
-   else
-@@ -15652,6 +15652,9 @@
- 
- cat >>confdefs.h <<_ACEOF
- #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}"
- _ACEOF
- 
- 
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf.in b/www/apache21/files/patch-docs:conf:httpd-std.conf.in
deleted file mode 100644
index d87b8bdcc679..000000000000
--- a/www/apache21/files/patch-docs:conf:httpd-std.conf.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- docs/conf/httpd-std.conf.in.orig	Wed Apr 24 07:24:35 2002
-+++ docs/conf/httpd-std.conf.in	Tue May  7 19:29:28 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>
- 
-@@ -263,8 +263,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>
- 
-@@ -450,7 +450,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.
-@@ -475,20 +475,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
deleted file mode 100644
index 39ea9c6e7483..000000000000
--- a/www/apache21/files/patch-docs:conf:ssl-std.conf
+++ /dev/null
@@ -1,107 +0,0 @@
---- docs/conf/ssl-std.conf.orig	Fri May 17 04:05:24 2002
-+++ docs/conf/ssl-std.conf	Tue Jun 18 23:15:32 2002
-@@ -55,15 +55,15 @@
- #   Configure the SSL Session Cache: First the mechanism 
- #   to use and second the expiring timeout (in seconds).
- #SSLSessionCache        none
--#SSLSessionCache        shmht:logs/ssl_scache(512000)
--#SSLSessionCache        shmcb:logs/ssl_scache(512000)
--SSLSessionCache         dbm:logs/ssl_scache
-+#SSLSessionCache        shmht:/var/log/httpd-ssl_scache(512000)
-+#SSLSessionCache        shmcb:/var/log/httpd-ssl_scache(512000)
-+SSLSessionCache         dbm:/var/log/httpd-ssl_scache
- SSLSessionCacheTimeout  300
- 
- #   Semaphore:
- #   Configure the path to the mutual exclusion semaphore the
- #   SSL engine uses internally for inter-process synchronization. 
--SSLMutex  file:logs/ssl_mutex
-+SSLMutex  file:/var/log/httpd-ssl_mutex
- 
- #   Pseudo Random Number Generator (PRNG):
- #   Configure one or more sources to seed the PRNG of the 
-@@ -89,11 +89,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.
-@@ -111,16 +111,16 @@
- #   in mind that if you have both an 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/apache2/ssl.crt/server.crt
-+#SSLCertificateFile @@ServerRoot@@/etc/apache2/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/apache2/ssl.key/server.key
-+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server-dsa.key
- 
- #   Server Certificate Chain:
- #   Point SSLCertificateChainFile at a file containing the
-@@ -129,7 +129,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/apache2/ssl.crt/ca.crt
- 
- #   Certificate Authority (CA):
- #   Set the CA certificate verification path where to find CA
-@@ -138,8 +138,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/apache2/ssl.crt
-+#SSLCACertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/ca-bundle.crt
- 
- #   Certificate Revocation Lists (CRL):
- #   Set the CA revocation path where to find CA CRLs for client
-@@ -148,8 +148,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/apache2/ssl.crl
-+#SSLCARevocationFile @@ServerRoot@@/etc/apache2/ssl.crl/ca-bundle.crl
- 
- #   Client Authentication (Type):
- #   Client certificate verification type and depth.  Types are
-@@ -209,7 +209,7 @@
- <Files ~ "\.(cgi|shtml|phtml|php3?)$">
-     SSLOptions +StdEnvVars
- </Files>
--<Directory "@@ServerRoot@@/cgi-bin">
-+<Directory "@@ServerRoot@@/www/cgi-bin">
-     SSLOptions +StdEnvVars
- </Directory>
- 
-@@ -244,7 +244,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/apache21/files/patch-server:main.c b/www/apache21/files/patch-server:main.c
deleted file mode 100644
index d297d4425fdb..000000000000
--- a/www/apache21/files/patch-server:main.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- server/main.c.orig	Thu Jun 13 04:34:56 2002
-+++ server/main.c	Sun Jul 21 08:54:09 2002
-@@ -78,6 +78,11 @@
- #include "ap_mpm.h"
- #include "mpm_common.h"
- 
-+#ifdef FREEBSD_THREAD_HACK
-+#include <unistd.h>
-+AP_DECLARE(int) ap_exists_config_define(const char *name);
-+#endif
-+
- /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
-  *          extern functions and global data in another appropriate module.
-  *
-@@ -558,6 +563,21 @@
-         destroy_and_exit_process(process, 1);
-     }
- 
-+#ifdef FREEBSD_THREAD_HACK
-+    {
-+	int r;
-+
-+	if (! ap_exists_config_define("NO_DETACH")) {
-+	    if ((r = fork()) > 0)
-+		return 0;
-+	    if (r == -1) {
-+		perror("fork");
-+		return 0;
-+	    }
-+	    setsid();
-+	}
-+    }
-+#endif
-     ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp);
-     ap_fixup_virtual_hosts(pconf, server_conf);
-     ap_fini_vhost_config(pconf, server_conf);
diff --git a/www/apache21/files/patch-srclib:apr:include:apr.h b/www/apache21/files/patch-srclib:apr:include:apr.h
deleted file mode 100644
index f6e2e55f0de5..000000000000
--- a/www/apache21/files/patch-srclib:apr:include:apr.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- srclib/apr/include/apr.h.in.orig	Fri Nov 15 17:33:00 2002
-+++ srclib/apr/include/apr.h.in	Fri Nov 15 17:33:10 2002
-@@ -299,11 +299,11 @@
- #endif
- 
- /* header files for PATH_MAX, _POSIX_PATH_MAX */
--#if APR_HAVE_SYS_SYSLIMITS_H
--#include <sys/syslimits.h>
--#endif
- #if APR_HAVE_LIMITS_H
- #include <limits.h>
-+#endif
-+#if APR_HAVE_SYS_SYSLIMITS_H
-+#include <sys/syslimits.h>
- #endif
- 
- #if defined(PATH_MAX)
diff --git a/www/apache21/files/patch-srclib:apr:include:apr_atomic.h b/www/apache21/files/patch-srclib:apr:include:apr_atomic.h
deleted file mode 100644
index 14d1dd444ba3..000000000000
--- a/www/apache21/files/patch-srclib:apr:include:apr_atomic.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- srclib/apr/include/apr_atomic.h.orig	Wed May  1 03:41:59 2002
-+++ srclib/apr/include/apr_atomic.h	Tue May  7 19:37:45 2002
-@@ -175,10 +175,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-srclib:apr:threadproc:unix:procsup.c b/www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c
deleted file mode 100644
index 13c663af7bd4..000000000000
--- a/www/apache21/files/patch-srclib:apr:threadproc:unix:procsup.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- srclib/apr/threadproc/unix/procsup.c.orig	Mon Apr  8 22:08:18 2002
-+++ srclib/apr/threadproc/unix/procsup.c	Sun Jul 21 08:45:44 2002
-@@ -59,6 +59,7 @@
-     int x;
- 
-     chdir("/");
-+#ifndef FREEBSD_THREAD_HACK
- #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
-     /* Don't detach for MPE because child processes can't survive the death of
-      * the parent. */
-@@ -89,6 +90,7 @@
-     if (setpgid(0, 0) == -1) {
-         return errno;
-     }
-+#endif
- #endif
- 
-     /* close out the standard file descriptors */
diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in
deleted file mode 100644
index 57d2af876b8f..000000000000
--- a/www/apache21/files/patch-support:apachectl.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- support/apachectl.in.orig	Mon May 27 20:46:01 2002
-+++ support/apachectl.in	Thu Jul 11 21:12:36 2002
-@@ -31,8 +31,8 @@
- HTTPD='@exp_sbindir@/@progname@'
- #
- # pick up any necessary environment variables
--if test -f @exp_bindir@/envvars; then
--  . @exp_bindir@/envvars
-+if test -f @exp_sbindir@/envvars; then
-+  . @exp_sbindir@/envvars
- fi
- #
- # a command that outputs a formatted text version of the HTML at the
-@@ -46,6 +46,7 @@
- #
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+eval `limits -e -C daemon` >/dev/null 2>&1
- 
- ERROR=0
- if [ "x$ARGV" = "x" ] ; then 
diff --git a/www/apache21/files/patch-support:log_server_status.in b/www/apache21/files/patch-support:log_server_status.in
deleted file mode 100644
index 136bafb9ff1a..000000000000
--- a/www/apache21/files/patch-support:log_server_status.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/log_server_status.in.orig	Tue Jun 18 23:21:53 2002
-+++ support/log_server_status.in	Tue Jun 18 23:23:08 2002
-@@ -63,7 +63,7 @@
- #
- require 'sys/socket.ph';
- 
--$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "@logfiledir@/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
-@@ -96,7 +96,7 @@
- 	chomp($date);
- 	($day,$time)=split(/:/,$date);
- 	$res=&tcp_connect($server,$port);
--	open(OUT,">>$wherelog$day");
-+	open(OUT,">>$wherelog$day.log");
- 	if ($res) {
- 		print OUT "$time:-1:-1:-1:-1:$res\n";
- 		exit 1;