Update of /cvsroot/fink/experimental/thesin/finkinfo/test
In directory sc8-pr-cvs1:/tmp/cvs-serv19722

Modified Files:
        apache2-2.0.46-1.patch 
Log Message:
Okay enabled IPv6 and really fixed teh db4 -> db-4.1 in apu I hope :P

Index: apache2-2.0.46-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/test/apache2-2.0.46-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apache2-2.0.46-1.patch      23 Jun 2003 15:44:24 -0000      1.2
+++ apache2-2.0.46-1.patch      23 Jun 2003 16:38:16 -0000      1.3
@@ -12,7 +12,7 @@
        
 diff -ruN httpd-2.0.46.orig/default-fink.conf httpd-2.0.46/default-fink.conf
 --- httpd-2.0.46.orig/default-fink.conf        Wed Dec 31 17:00:00 1969
-+++ httpd-2.0.46/default-fink.conf     Mon Jun 23 09:33:00 2003
++++ httpd-2.0.46/default-fink.conf     Mon Jun 23 10:00:58 2003
 @@ -0,0 +1,74 @@
 +--enable-v4-mapped
 +--enable-modules=all
@@ -61,7 +61,7 @@
 +--enable-speling
 +--enable-rewrite
 +--enable-so
-+--with-dbm=db4
++--with-dbm=db-4.1
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
@@ -2412,9 +2412,42 @@
          fi
          # This is a shared library
        
+diff -ruN httpd-2.0.46.orig/srclib/apr/configure httpd-2.0.46/srclib/apr/configure
+--- httpd-2.0.46.orig/srclib/apr/configure     Tue May 27 23:11:12 2003
++++ httpd-2.0.46/srclib/apr/configure  Mon Jun 23 10:12:07 2003
+@@ -36739,7 +36739,7 @@
+ fi;
+ 
+ case $host in
+-  *apple-darwin*)
++  not*apple-darwin*)
+     # It appears that Jaguar has all the right features, but
+     # getnameinfo() fails to find the hostname for a mapped
+     # address.
 diff -ruN httpd-2.0.46.orig/srclib/apr-util/configure 
httpd-2.0.46/srclib/apr-util/configure
 --- httpd-2.0.46.orig/srclib/apr-util/configure        Tue May 27 23:11:17 2003
-+++ httpd-2.0.46/srclib/apr-util/configure     Mon Jun 23 09:41:50 2003
++++ httpd-2.0.46/srclib/apr-util/configure     Mon Jun 23 10:31:04 2003
+@@ -852,7 +852,7 @@
+   --with-ldap-lib=path    path to ldap lib file
+   --with-ldap=library     ldap library to use
+   --with-dbm=DBM          choose the DBM type to use.
+-                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
++                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db-4.1}
+  --with-gdbm=DIR          specify GDBM location
+  --with-ndbm=PATH
+     Find the NDBM header and library in \`PATH/include' and
+@@ -6495,9 +6495,9 @@
+ 
+   if test "$withval" = "yes"; then
+     { { echo "$as_me:$LINENO: error: --with-dbm needs to specify a DBM type to use.
+-One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" >&5
++One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db-4.1" >&5
+ echo "$as_me: error: --with-dbm needs to specify a DBM type to use.
+-One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" >&2;}
++One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db-4.1" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+   requested="$withval"
 @@ -7611,13 +7611,13 @@
  fi
  if test $ac_cv_header_db4_db_h = yes; then
@@ -2432,6 +2465,15 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
+@@ -7663,7 +7663,7 @@
+ if test $ac_cv_lib_db4_db_create = yes; then
+ 
+   apu_db_header=db4/db.h
+-  apu_db_lib=db4
++  apu_db_lib=db-4.1
+   apu_db_version=4
+ 
+ else
 @@ -9472,13 +9472,13 @@
  fi
  if test $ac_cv_header_db4_db_h = yes; then
@@ -2449,6 +2491,24 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
+@@ -9524,7 +9524,7 @@
+ if test $ac_cv_lib_db4_db_create = yes; then
+ 
+   apu_db_header=db4/db.h
+-  apu_db_lib=db4
++  apu_db_lib=db-4.1
+   apu_db_version=4
+ 
+ else
+@@ -12451,7 +12451,7 @@
+    { (exit 1); exit 1; }; }
+     fi
+     ;;
+-  db4)
++  db4 | db-4.1)
+ 
+ if test "${ac_cv_header_db4_db_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for db4/db.h" >&5
 @@ -12556,13 +12556,13 @@
  fi
  if test $ac_cv_header_db4_db_h = yes; then
@@ -2466,6 +2526,36 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
+@@ -12608,7 +12608,7 @@
+ if test $ac_cv_lib_db4_db_create = yes; then
+ 
+   apu_db_header=db4/db.h
+-  apu_db_lib=db4
++  apu_db_lib=db-4.1
+   apu_db_version=4
+ 
+ else
+@@ -13022,7 +13022,7 @@
+ 
+     if test "$apu_db_version" = "4"; then
+       apu_use_db=1
+-      apu_default_dbm=db4
++      apu_default_dbm=db-4.1
+     else
+       { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+ echo "$as_me: error: Berkeley db4 not found" >&2;}
+@@ -13035,9 +13035,9 @@
+     ;;
+   *)
+     { { echo "$as_me:$LINENO: error: --with-dbm=$look_for is an unknown DBM type.
+-Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" >&5
++Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db-4.1" >&5
+ echo "$as_me: error: --with-dbm=$look_for is an unknown DBM type.
+-Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4" >&2;}
++Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db-4.1" >&2;}
+    { (exit 1); exit 1; }; }
+     ;;
+ esac
 diff -ruN httpd-2.0.46.orig/srclib/apr-util/xml/expat/conftools/ltmain.sh 
httpd-2.0.46/srclib/apr-util/xml/expat/conftools/ltmain.sh
 --- httpd-2.0.46.orig/srclib/apr-util/xml/expat/conftools/ltmain.sh    Tue May 27 
23:11:17 2003
 +++ httpd-2.0.46/srclib/apr-util/xml/expat/conftools/ltmain.sh Mon Jun 23 09:33:01 
2003




-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to