update to 4.4.2

changes:
-Added support for compiling and linking with BerkeleyDB 4.4.20
-bugfixes
-Wrap the DBEnv.set_tx_timeout method

4 files changed, 10 insertions, 51 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 8520c8ae348..dad6fd83d55 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/07 21:36:37 drochner Exp $
 #
 
-DISTNAME=	bsddb3-4.3.3
+DISTNAME=	bsddb3-4.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
 
diff --git a/databases/py-bsddb3/PLIST b/databases/py-bsddb3/PLIST
index aafe6767435..706deb1ecee 100644
--- a/databases/py-bsddb3/PLIST
+++ b/databases/py-bsddb3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/05 18:21:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/02/07 21:36:37 drochner Exp $
 ${PYSITELIB}/bsddb3/__init__.py
 ${PYSITELIB}/bsddb3/__init__.pyc
 ${PYSITELIB}/bsddb3/__init__.pyo
@@ -24,6 +24,9 @@ ${PYSITELIB}/bsddb3/dbutils.pyo
 ${PYSITELIB}/bsddb3/tests/__init__.py
 ${PYSITELIB}/bsddb3/tests/__init__.pyc
 ${PYSITELIB}/bsddb3/tests/__init__.pyo
+${PYSITELIB}/bsddb3/tests/test_1413192.py
+${PYSITELIB}/bsddb3/tests/test_1413192.pyc
+${PYSITELIB}/bsddb3/tests/test_1413192.pyo
 ${PYSITELIB}/bsddb3/tests/test_all.py
 ${PYSITELIB}/bsddb3/tests/test_all.pyc
 ${PYSITELIB}/bsddb3/tests/test_all.pyo
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 827cd3e2c4b..3d57e4b974b 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/01/10 21:06:31 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/02/07 21:36:37 drochner 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 (bsddb3-4.4.2.tar.gz) = e4cd5b65e209a97722bbf8d7d9cf4ea2d05cde68
+RMD160 (bsddb3-4.4.2.tar.gz) = bbe579842e67cff7bb9d34fc2d2a96bc3464af4e
+Size (bsddb3-4.4.2.tar.gz) = 518015 bytes
 SHA1 (patch-aa) = cffa6777e9ea7d77492cc3ae3d4dc53f80979e74
-SHA1 (patch-ab) = 7dfd209653bcc4b6f06a8a5352e4fe1460d9e858
diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab
deleted file mode 100644
index 8e48901d93a..00000000000
--- a/databases/py-bsddb3/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$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