[pkgsrc/trunk]: pkgsrc/databases/bdb-xml This version of bdb-xml requires db<...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1066b81184b2
branches:  trunk
changeset: 547662:1066b81184b2
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Sep 24 19:32:00 2008 +0000

description:
This version of bdb-xml requires db<4.7.  Depend on db46 instead of db4.
This fixes the build error shown on Joerg's bulk builds on NetBSD-current.

Bump PKGREVISION.

diffstat:

 databases/bdb-xml/Makefile         |   8 ++++----
 databases/bdb-xml/buildlink3.mk    |   4 ++--
 databases/bdb-xml/distinfo         |   4 ++--
 databases/bdb-xml/patches/patch-aa |  10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (92 lines):

diff -r a7efe91cee05 -r 1066b81184b2 databases/bdb-xml/Makefile
--- a/databases/bdb-xml/Makefile        Wed Sep 24 16:17:30 2008 +0000
+++ b/databases/bdb-xml/Makefile        Wed Sep 24 19:32:00 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/09/06 20:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/09/24 19:32:00 minskim Exp $
 
 DISTNAME=      dbxml-1.2.1
 PKGNAME=       ${DISTNAME:S/db/bdb-/}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    databases
 MASTER_SITES=  http://www.sleepycat.com/update/snapshot/
 
@@ -23,11 +23,11 @@
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           YES
 
-CONFIGURE_ARGS+=       --with-berkeleydb=${BUILDLINK_PREFIX.db4}
+CONFIGURE_ARGS+=       --with-berkeleydb=${BUILDLINK_PREFIX.db46}
 CONFIGURE_ARGS+=       --with-xerces=${BUILDLINK_PREFIX.xerces-c}
 CONFIGURE_ARGS+=       --with-pathan=${BUILDLINK_PREFIX.libpathan}
 
-.include "../../databases/db4/buildlink3.mk"
+.include "../../databases/db46/buildlink3.mk"
 .include "../../textproc/libpathan/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a7efe91cee05 -r 1066b81184b2 databases/bdb-xml/buildlink3.mk
--- a/databases/bdb-xml/buildlink3.mk   Wed Sep 24 16:17:30 2008 +0000
+++ b/databases/bdb-xml/buildlink3.mk   Wed Sep 24 19:32:00 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/09/06 20:54:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2008/09/24 19:32:00 minskim Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BDB_XML_BUILDLINK3_MK:=        ${BDB_XML_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@
 BUILDLINK_PKGSRCDIR.bdb-xml?=  ../../databases/bdb-xml
 .endif # BDB_XML_BUILDLINK3_MK
 
-.include "../../databases/db4/buildlink3.mk"
+.include "../../databases/db46/buildlink3.mk"
 .include "../../textproc/libpathan/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 
diff -r a7efe91cee05 -r 1066b81184b2 databases/bdb-xml/distinfo
--- a/databases/bdb-xml/distinfo        Wed Sep 24 16:17:30 2008 +0000
+++ b/databases/bdb-xml/distinfo        Wed Sep 24 19:32:00 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/04/03 11:18:23 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/09/24 19:32:00 minskim Exp $
 
 SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842
 RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7
 Size (dbxml-1.2.1.tar.gz) = 3151529 bytes
-SHA1 (patch-aa) = 8bf913113e7fe700adb94463b5f69e99b3c20063
+SHA1 (patch-aa) = c868c2009ba44fcbb0fe22e0e9603743e6acba45
 SHA1 (patch-ab) = 4e124704238d4d3c6fc753d28ce3cb0bd5e3731f
 SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc
 SHA1 (patch-ad) = dfbfa3fe27f8da99b35964223a754f8223a5b7e9
diff -r a7efe91cee05 -r 1066b81184b2 databases/bdb-xml/patches/patch-aa
--- a/databases/bdb-xml/patches/patch-aa        Wed Sep 24 16:17:30 2008 +0000
+++ b/databases/bdb-xml/patches/patch-aa        Wed Sep 24 19:32:00 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/01/02 17:32:13 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/09/24 19:32:00 minskim Exp $
 
 --- ../dist/configure.orig     2004-01-27 16:12:02.000000000 +0000
 +++ ../dist/configure
@@ -7,17 +7,17 @@
        with_berkeleydb="/usr/local/BerkeleyDB.4.2"
  fi
 -if test `ls "$with_berkeleydb"/lib/libdb_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
-+if test `ls "$with_berkeleydb"/lib/libdb4_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
++if test `ls "$with_berkeleydb"/lib/libdb46_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
        echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5
  echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6
 -      db_version=`ls "$with_berkeleydb"/lib/libdb_cxx-*.la | sed 's/.*db_cxx-\(.*\).la/\1/'`
-+      db_version=`ls "$with_berkeleydb"/lib/libdb4_cxx-*.la | sed 's/.*db4_cxx-\(.*\).la/\1/'`
++      db_version=`ls "$with_berkeleydb"/lib/libdb46_cxx-*.la | sed 's/.*db46_cxx-\(.*\).la/\1/'`
        echo "$as_me:$LINENO: result: $db_version" >&5
  echo "${ECHO_T}$db_version" >&6
 -      echo "$CPPFLAGS" | grep "$with_berkeleydb/include" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include"
 -      LIBS="$LIBS $with_berkeleydb/lib/libdb_cxx-$db_version.la"
-+      echo "$CPPFLAGS" | grep "$with_berkeleydb/include/db4" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include/db4"
-+      LIBS="$LIBS $with_berkeleydb/lib/libdb4_cxx-$db_version.la"
++      echo "$CPPFLAGS" | grep "$with_berkeleydb/include/db46" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include/db46"
++      LIBS="$LIBS $with_berkeleydb/lib/libdb46_cxx-$db_version.la"
  
        # find test lib locations, if specified, and possible
        # it could be safer to require that --with-berkelydb point to a build