[cvs] dists/10.4/unstable/main/finkinfo/libs libaprutil.0-mysql.info, 1.2, 1.3 libaprutil.0-odbc.info, 1.2, 1.3 libaprutil.0-postgresql.info, 1.2, 1.3 libaprutil.0-shlibs.info, 1.8, 1.9 libaprutil.0-shlibs.patch, 1.1, 1.2 libaprutil.0-sqlite2.info, 1.2, 1.3 libaprutil.0-sqlite3.info, 1.2, 1.3

[Daniel J. <dan...@us...>]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25428

Modified Files:
	libaprutil.0-mysql.info libaprutil.0-odbc.info 
	libaprutil.0-postgresql.info libaprutil.0-shlibs.info 
	libaprutil.0-shlibs.patch libaprutil.0-sqlite2.info 
	libaprutil.0-sqlite3.info 
Log Message:
New upstream version.


Index: libaprutil.0-shlibs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-shlibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libaprutil.0-shlibs.patch	19 Aug 2010 02:34:59 -0000	1.1
+++ libaprutil.0-shlibs.patch	13 Oct 2010 12:02:24 -0000	1.2
@@ -29,154 +29,6 @@
      ;;
      --ldap-libs)
      flags="$flags $LDAP_LIBS"
-diff -ru apr-util-1.3.9.orig/build/dbm.m4 apr-util-1.3.9/build/dbm.m4
---- apr-util-1.3.9.orig/build/dbm.m4	2008-11-21 01:32:58.000000000 -0500
-+++ apr-util-1.3.9/build/dbm.m4	2010-08-10 17:20:56.000000000 -0400
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -522,6 +522,44 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB48: is DB4.8 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB48], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
-+    "$places",
-+    "db48/db.h db4/db.h db.h",
-+    "db-4.8 db4-4.8 db48 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -606,6 +644,18 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db48)
-+    APU_CHECK_DB48("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -618,6 +668,10 @@
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+  APU_CHECK_DB48("$all_places")
-+  if test "$apu_db_version" != "4"; then
-   APU_CHECK_DB47("$all_places")
-   if test "$apu_db_version" != "4"; then
-     APU_CHECK_DB46("$all_places")
-@@ -652,6 +706,8 @@
-       fi
-     fi
-   fi
-+  fi
-+  fi
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
-@@ -679,11 +735,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47,db48,db50])
-     fi
-     requested="$withval"
-   ], [
-@@ -882,6 +938,14 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db48)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -889,7 +953,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
- 
-diff -ru apr-util-1.3.9.orig/dbm/apr_dbm_berkeleydb.c apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c
---- apr-util-1.3.9.orig/dbm/apr_dbm_berkeleydb.c	2008-11-21 03:22:35.000000000 -0500
-+++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c	2010-08-10 17:20:56.000000000 -0400
-@@ -37,7 +37,9 @@
-  * DB_185, DB2, DB3, and DB4.
-  */
- 
--#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
-+#if   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR > 4)
-+#define DB_VER 4
-+#elif   defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
- /* We will treat anything greater than 4.1 as DB4.
-  * We can treat 4.0 as DB3.
-  */
 diff -ru apr-util-1.3.9.orig/test/Makefile.in apr-util-1.3.9/test/Makefile.in
 --- apr-util-1.3.9.orig/test/Makefile.in	2009-05-31 07:53:31.000000000 -0400
 +++ apr-util-1.3.9/test/Makefile.in	2010-08-10 17:47:07.000000000 -0400

Index: libaprutil.0-sqlite2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-sqlite2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-sqlite2.info	19 Aug 2010 02:34:59 -0000	1.2
+++ libaprutil.0-sqlite2.info	13 Oct 2010 12:02:24 -0000	1.3
@@ -1,21 +1,19 @@
 Package: libaprutil.0-sqlite2
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
-	libaprutil.0-shlibs (= %v-%r),
+	libaprutil.0-shlibs (>= %v-%r),
 	openldap24-shlibs,
 	sqlite-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
 	gdbm3,
 	libapr.0-dev (>= 1.4.2-1),
-	libaprutil.0-dev (= %v-%r),
+	libaprutil.0-dev (>= %v-%r),
 	libiconv-dev,
 	openldap24-dev,
 	pkgconfig,
@@ -25,16 +23,14 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<

Index: libaprutil.0-shlibs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-shlibs.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libaprutil.0-shlibs.info	19 Aug 2010 02:34:59 -0000	1.8
+++ libaprutil.0-shlibs.info	13 Oct 2010 12:02:24 -0000	1.9
@@ -1,5 +1,5 @@
 Package: libaprutil.0-shlibs
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
@@ -11,8 +11,6 @@
 	openldap24-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
@@ -28,16 +26,14 @@
 Suggests: libaprutil.0-mysql, libaprutil.0-odbc, libaprutil.0-postgresql, libaprutil.0-sqlite2, libaprutil.0-sqlite3
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: %n.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<

Index: libaprutil.0-odbc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-odbc.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-odbc.info	19 Aug 2010 02:34:59 -0000	1.2
+++ libaprutil.0-odbc.info	13 Oct 2010 12:02:24 -0000	1.3
@@ -1,21 +1,19 @@
 Package: libaprutil.0-odbc
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
-	libaprutil.0-shlibs (= %v-%r),
+	libaprutil.0-shlibs (>= %v-%r),
 	openldap24-shlibs,
 	unixodbc2-shlibs | unixodbc2-nox-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
 	gdbm3,
 	libapr.0-dev (>= 1.4.2-1),
-	libaprutil.0-dev (= %v-%r),
+	libaprutil.0-dev (>= %v-%r),
 	libiconv-dev,
 	openldap24-dev,
 	pkgconfig,
@@ -25,16 +23,14 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<

Index: libaprutil.0-mysql.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-mysql.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-mysql.info	19 Aug 2010 02:34:59 -0000	1.2
+++ libaprutil.0-mysql.info	13 Oct 2010 12:02:24 -0000	1.3
@@ -1,21 +1,19 @@
 Package: libaprutil.0-mysql
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
-	libaprutil.0-shlibs (= %v-%r),
+	libaprutil.0-shlibs (>= %v-%r),
 	mysql-unified-shlibs,
 	openldap24-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
 	gdbm3,
 	libapr.0-dev (>= 1.4.2-1),
-	libaprutil.0-dev (= %v-%r),
+	libaprutil.0-dev (>= %v-%r),
 	libiconv-dev,
 	mysql-unified-dev,
 	openldap24-dev,
@@ -25,16 +23,14 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<

Index: libaprutil.0-postgresql.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-postgresql.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-postgresql.info	19 Aug 2010 02:34:59 -0000	1.2
+++ libaprutil.0-postgresql.info	13 Oct 2010 12:02:24 -0000	1.3
@@ -1,21 +1,19 @@
 Package: libaprutil.0-postgresql
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
-	libaprutil.0-shlibs (= %v-%r),
+	libaprutil.0-shlibs (>= %v-%r),
 	openldap24-shlibs,
 	postgresql84-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
 	gdbm3,
 	libapr.0-dev (>= 1.4.2-1),
-	libaprutil.0-dev (= %v-%r),
+	libaprutil.0-dev (>= %v-%r),
 	libiconv-dev,
 	openldap24-dev,
 	pkgconfig,
@@ -25,16 +23,14 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<

Index: libaprutil.0-sqlite3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libaprutil.0-sqlite3.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libaprutil.0-sqlite3.info	19 Aug 2010 02:34:59 -0000	1.2
+++ libaprutil.0-sqlite3.info	13 Oct 2010 12:02:24 -0000	1.3
@@ -1,21 +1,19 @@
 Package: libaprutil.0-sqlite3
-Version: 1.3.9
+Version: 1.3.10
 Revision: 1
 
 Depends: <<
-	libaprutil.0-shlibs (= %v-%r),
+	libaprutil.0-shlibs (>= %v-%r),
 	openldap24-shlibs,
 	sqlite3-shlibs
 <<
 BuildDepends: <<
-	autoconf2.6,
-	automake1.11,
 	db48-aes | db48,
 	expat1,
 	fink (>= 0.24.12),
 	gdbm3,
 	libapr.0-dev (>= 1.4.2-1),
-	libaprutil.0-dev (= %v-%r),
+	libaprutil.0-dev (>= %v-%r),
 	libiconv-dev,
 	openldap24-dev,
 	pkgconfig,
@@ -25,16 +23,14 @@
 # a transient libaprutil0-shlibs accidentally installed something else at the install_name location
 
 Source: mirror:apache:apr/apr-util-%v.tar.bz2
-Source-MD5: 29dd557f7bd891fc2bfdffcfa081db59
+Source-MD5: 6a6f501a1b2a45166b8ffd6df29204bb
 
 PatchFile: libaprutil.0-shlibs.patch
-PatchFile-MD5: 63c4b3bb379c350258be5c332c6bf27b
+PatchFile-MD5: 715582c612af83f014b243bf0f5c35cd
 PatchScript: <<
   ### Fix layout
   perl -pi -e 's,/usr/local,%p,g' config.layout
-  ### Add support for db48 and 50
   %{default_script}
-  autoreconf -fi
 <<
 
 ConfigureParams: <<