2 files changed, 12 insertions, 29 deletions

diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
index 7a85d2f86f30..8a3cef3275c6 100644
--- a/www/apache22/files/patch-configure
+++ b/www/apache22/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct  3 14:43:28 2002
-+++ configure	Wed Jan  8 19:58:11 2003
-@@ -1520,7 +1520,7 @@
+--- configure.orig	Mon Mar 31 16:48:51 2003
++++ configure	Thu Apr  3 21:18:08 2003
+@@ -1513,7 +1513,7 @@
        $srcdir/config.layout > $pldconf
    layout_name=$LAYOUT
    . $pldconf
@@ -9,25 +9,25 @@
    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 @@
+@@ -2613,7 +2613,7 @@
+     ac_sub_cache_file="$ac_popdir/$cache_file" ;;
    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"
+-              if eval $SHELL $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 $SHELL $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 @@
+@@ -2888,7 +2888,7 @@
+     ac_sub_cache_file="$ac_popdir/$cache_file" ;;
    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"
+-              if eval $SHELL $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 $SHELL $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 @@
+@@ -15634,6 +15634,9 @@
  
  cat >>confdefs.h <<_ACEOF
  #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
diff --git a/www/apache22/files/patch-srclib:apr:include:apr.h b/www/apache22/files/patch-srclib:apr:include:apr.h
deleted file mode 100644
index f6e2e55f0de5..000000000000
--- a/www/apache22/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)