Make compile with db4-4.4.x. Remove BROKEN.

4 files changed, 49 insertions, 8 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index be85d736a8e..569383acd43 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/01/10 20:22:48 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/10 21:06:31 wiz Exp $
 #
 
 DISTNAME=	bsddb3-4.3.3
@@ -17,8 +17,6 @@ PYSETUPINSTALLARGS=	--berkeley-db=${BUILDLINK_PREFIX.db4}
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
-BROKEN=		Does not compile with db4-4.4 API.
-
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index b6abeb861d6..827cd3e2c4b 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/08/05 18:21:04 drochner Exp $
+$NetBSD: distinfo,v 1.8 2006/01/10 21:06:31 wiz Exp $
 
 SHA1 (bsddb3-4.3.3.tar.gz) = e8fd20c540fa3f5120627f3f3829773380521d90
 RMD160 (bsddb3-4.3.3.tar.gz) = acc0991def46d212686b4ab587822f6a293f00c3
 Size (bsddb3-4.3.3.tar.gz) = 516635 bytes
-SHA1 (patch-aa) = 301787930b05613388ffad4f72586e132da8aa6d
+SHA1 (patch-aa) = cffa6777e9ea7d77492cc3ae3d4dc53f80979e74
+SHA1 (patch-ab) = 7dfd209653bcc4b6f06a8a5352e4fe1460d9e858
diff --git a/databases/py-bsddb3/patches/patch-aa b/databases/py-bsddb3/patches/patch-aa
index 788a051b040..2353def5f96 100644
--- a/databases/py-bsddb3/patches/patch-aa
+++ b/databases/py-bsddb3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/01/02 12:43:12 seb Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/10 21:06:31 wiz Exp $
 
---- setup.py.orig	2004-12-16 09:10:17.000000000 +0000
+--- setup.py.orig	2005-06-03 09:27:21.000000000 +0200
 +++ setup.py
-@@ -177,11 +177,11 @@ if os.name == 'posix':
+@@ -194,11 +194,11 @@ if os.name == 'posix':
  
      # figure out from the base setting where the lib and .h are
      if not incdir:
diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab
new file mode 100644
index 00000000000..8e48901d93a
--- /dev/null
+++ b/databases/py-bsddb3/patches/patch-ab
@@ -0,0 +1,42 @@
+$NetBSD: patch-ab,v 1.5 2006/01/10 21:06:31 wiz Exp $
+
+--- extsrc/_bsddb.c.orig	2005-06-06 20:09:39.000000000 +0200
++++ extsrc/_bsddb.c
+@@ -4294,8 +4294,13 @@ DBEnv_lock_stat(DBEnvObject* self, PyObj
+ #endif
+     MAKE_ENTRY(nrequests);
+     MAKE_ENTRY(nreleases);
++#if (DBVER < 44)
+     MAKE_ENTRY(nnowaits);
+     MAKE_ENTRY(nconflicts);
++#else
++    MAKE_ENTRY(lock_nowait);
++    MAKE_ENTRY(lock_wait);
++#endif
+     MAKE_ENTRY(ndeadlocks);
+     MAKE_ENTRY(regsize);
+     MAKE_ENTRY(region_wait);
+@@ -5133,7 +5138,11 @@ DL_EXPORT(void) init_bsddb(void)
+     ADD_INT(d, DB_LOCK_IREAD);
+     ADD_INT(d, DB_LOCK_IWR);
+ #if (DBVER >= 33)
++#if (DBVER < 44)
+     ADD_INT(d, DB_LOCK_DIRTY);
++#else
++    ADD_INT(d, DB_LOCK_READ_UNCOMMITTED);
++#endif
+     ADD_INT(d, DB_LOCK_WWRITE);
+ #endif
+ 
+@@ -5230,7 +5239,11 @@ DL_EXPORT(void) init_bsddb(void)
+     ADD_INT(d, DB_OPFLAGS_MASK);
+     ADD_INT(d, DB_RMW);
+ #if (DBVER >= 33)
++#if (DBVER < 44)
+     ADD_INT(d, DB_DIRTY_READ);
++#else
++    ADD_INT(d, DB_READ_UNCOMMITTED);
++#endif
+     ADD_INT(d, DB_MULTIPLE);
+     ADD_INT(d, DB_MULTIPLE_KEY);
+ #endif