From 499e0c4b797840a592cd16bc2215e1e403a97e86 Mon Sep 17 00:00:00 2001
From: Patrick Li <pat@FreeBSD.org>
Date: Sat, 23 Mar 2002 08:31:55 +0000
Subject: Update to 2.0.32

PR:		36040
Submitted by:	maintainer
---
 www/apache22/files/patch-configure | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

(limited to 'www/apache22/files/patch-configure')

diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
index 007d46173167..7ceda58436da 100644
--- a/www/apache22/files/patch-configure
+++ b/www/apache22/files/patch-configure
@@ -1,31 +1,13 @@
---- configure.orig	Tue Nov 13 04:07:39 2001
-+++ configure	Fri Nov 16 23:32:52 2001
-@@ -1084,7 +1084,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 $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
- 
-   # 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 @@
+--- configure.orig	Fri Feb 22 03:43:38 2002
++++ configure	Fri Feb 22 03:44:56 2002
+@@ -11095,7 +11095,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
 +#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
 +#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
-- 
cgit v1.2.3