From e51e806f5a7b424f1559a8fd4f0de689a65083cc Mon Sep 17 00:00:00 2001
From: epg <epg>
Date: Sun, 7 Dec 2003 00:53:28 +0000
Subject: Make this work with DB 4.2 and bump PKGREVISION.

---
 databases/py-bsddb3/Makefile         |  6 ++++--
 databases/py-bsddb3/distinfo         |  4 ++--
 databases/py-bsddb3/patches/patch-ab | 31 ++++++++++++++++++++++++++-----
 3 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'databases')

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index ae6fb18c62f..077e8d568ca 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:28:51 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/07 00:53:28 epg Exp $
 #
 
 DISTNAME=	bsddb3-4.1.1
 PKGNAME=	${PYPKGPREFIX}-bsddb3-4.1.1
-PKGREVISION= 	2
+PKGREVISION= 	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
 
@@ -18,6 +18,8 @@ USE_BUILDLINK2=	yes
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
+BUILDLINK_DEPENDS.db4=		db4>=4.2.52
+
 .include "../../databases/db4/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 672b50e6d3e..9c3f343609d 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+$NetBSD: distinfo,v 1.2 2003/12/07 00:53:28 epg Exp $
 
 SHA1 (bsddb3-4.1.1.tar.gz) = c30d9d06c760b2c73c4987fb7fd79f17421d10d4
 Size (bsddb3-4.1.1.tar.gz) = 484382 bytes
 SHA1 (patch-aa) = c5012b82afda6e47a2cfcaa102811c0510fe65ec
-SHA1 (patch-ab) = 7ac97eae4ae0663cbb594010d24c2ddcde2cf15e
+SHA1 (patch-ab) = b482ddb5791db1cb7245e837b52731acc8f63141
diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab
index d86796816cf..d662cec193e 100644
--- a/databases/py-bsddb3/patches/patch-ab
+++ b/databases/py-bsddb3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/07 00:53:28 epg Exp $
 
---- src/_db.c.orig	Sun Dec 22 00:44:32 2002
+--- src/_db.c.orig	Sun Dec 22 03:44:32 2002
 +++ src/_db.c
-@@ -745,7 +745,8 @@
+@@ -745,7 +745,8 @@ DBCursor_dealloc(DBCursorObject* self)
      int err;
      if (self->dbc != NULL) {
          MYDB_BEGIN_ALLOW_THREADS;
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
          self->dbc = NULL;
          MYDB_END_ALLOW_THREADS;
      }
-@@ -1071,7 +1072,9 @@
+@@ -1071,7 +1072,9 @@ DB_associate(DBObject* self, PyObject* a
       * threads have already been initialized.
       *  (see pybsddb-users mailing list post on 2002-08-07)
       */
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
      MYDB_BEGIN_ALLOW_THREADS;
  #if (DBVER >= 41)
      err = self->db->associate(self->db,
-@@ -1620,6 +1623,7 @@
+@@ -1620,6 +1623,7 @@ DB_open(DBObject* self, PyObject* args, 
  #endif
      MYDB_END_ALLOW_THREADS;
      if (makeDBError(err)) {
@@ -30,3 +30,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
          self->db = NULL;
          return NULL;
      }
+@@ -4214,7 +4218,11 @@ DL_EXPORT(void) init_db(void)
+     ADD_INT(d, DB_MAX_PAGES);
+     ADD_INT(d, DB_MAX_RECORDS);
+ 
++#if (DBVER >= 42)
++    ADD_INT(d, DB_RPCCLIENT);
++#else
+     ADD_INT(d, DB_CLIENT);
++#endif
+     ADD_INT(d, DB_XA_CREATE);
+ 
+     ADD_INT(d, DB_CREATE);
+@@ -4363,7 +4371,7 @@ DL_EXPORT(void) init_db(void)
+     ADD_INT(d, DB_CHECKPOINT);
+     ADD_INT(d, DB_CURLSN);
+ #endif
+-#if (DBVER >= 33)
++#if (DBVER >= 33 && DBVER < 42)
+     ADD_INT(d, DB_COMMIT);
+ #endif
+     ADD_INT(d, DB_CONSUME);
-- 
cgit v1.2.3