Update py-bsddb3 to 4.1.6.

Changes sinec 4.1.1:
 * Extended DB & DBEnv set_get_returns_none functionality to take a
   "level" instead of a boolean flag.  The boolean 0 and 1 values still
   have the same effect.  A value of 2 extends the "return None instead
   of raising an exception" behaviour to the DBCursor set methods.
   This will become the default behaviour in pybsddb 4.2.
 * Updated documentation for set_get_returns_none.  Regenerated the
   stale html docs from the text documentation.
 * Fixed a typo in DBCursor.join_item method that made it crash instead
   of returning a value.  Obviously nobody uses it.  Wrote a test case
   for join and join_item.
 * Added the dbobj wrapper for DBEnv set_timeout method.
 * Updated README.txt
 * Added the DBEnv.set_timeout method.
 * code cleanup to use python 2.x features in .py files
 * the standalone pybsddb distribution will install a module
   called bsddb3 while the module included with python >= 2.3
   will be known as bsddb.
 * Shared all .py and .c source with the Python project.
 * Fixed DBTxn objects to raise an exception if they are used after
   the underlying DB_TXN handle becomes invalid. (rather than
   potentially causing a segfault)
 * Fixed module to work when compiled against a python without thread
   support.
 * Do not attempt to double-close DB cursor's whos underlying DB
   has already been closed (fixes a segfault).
 * Close DB objects when DB.open fails to prevent an exception about
   databases still being open when calling DBEnv.close.

5 files changed, 27 insertions, 55 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 077e8d568ca..4fa50010f2f 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.5 2003/12/07 00:53:28 epg Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/10 17:56:55 minskim Exp $
 #
 
-DISTNAME=	bsddb3-4.1.1
-PKGNAME=	${PYPKGPREFIX}-bsddb3-4.1.1
-PKGREVISION= 	3
+DISTNAME=	bsddb3-4.1.6
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://pybsddb.sourceforge.net/
-COMMENT=	Python extension module for Berkeley DB 3 and 4
+COMMENT=	Python extension module for Berkeley DB 4
 
 PYSETUPBUILDARGS=	--berkeley-db=${LOCALBASE}
 PYSETUPINSTALLARGS=	--berkeley-db=${LOCALBASE}
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
 
-BUILDLINK_DEPENDS.db4=		db4>=4.2.52
+BUILDLINK_DEPENDS.db4+=		db4>=4.2.52
 
-.include "../../databases/db4/buildlink2.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-bsddb3/PLIST b/databases/py-bsddb3/PLIST
index b2c46a1cd91..5d02c496fc1 100644
--- a/databases/py-bsddb3/PLIST
+++ b/databases/py-bsddb3/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/14 16:43:47 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/10 17:56:55 minskim Exp $
 ${PYSITELIB}/bsddb3/__init__.py
 ${PYSITELIB}/bsddb3/__init__.pyc
 ${PYSITELIB}/bsddb3/__init__.pyo
-${PYSITELIB}/bsddb3/_db.so
+${PYSITELIB}/bsddb3/_bsddb.so
 ${PYSITELIB}/bsddb3/db.py
 ${PYSITELIB}/bsddb3/db.pyc
 ${PYSITELIB}/bsddb3/db.pyo
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 9c3f343609d..d0e9a5d62e1 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/12/07 00:53:28 epg Exp $
+$NetBSD: distinfo,v 1.3 2004/02/10 17:56:55 minskim 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) = b482ddb5791db1cb7245e837b52731acc8f63141
+SHA1 (bsddb3-4.1.6.tar.gz) = 670c1e62ebb0728ed0b41971d629e6844176ed41
+Size (bsddb3-4.1.6.tar.gz) = 485193 bytes
+SHA1 (patch-aa) = d19ba6ae428f3e27029c0ed23694230cc0b82656
+SHA1 (patch-ab) = a2bcbf091689edc2c63b653ef82a0c12335713e1
diff --git a/databases/py-bsddb3/patches/patch-aa b/databases/py-bsddb3/patches/patch-aa
index a95a920d21a..727268529c3 100644
--- a/databases/py-bsddb3/patches/patch-aa
+++ b/databases/py-bsddb3/patches/patch-aa
@@ -1,14 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 19:26:04 gson Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/10 17:56:55 minskim Exp $
 
---- setup.py.orig	Sun Dec 22 00:44:30 2002
+--- setup.py.orig	2003-07-08 23:41:34.000000000 -0500
 +++ setup.py
-@@ -70,10 +70,10 @@
-         sys.exit(1)
+@@ -75,11 +75,11 @@ if os.name == 'posix':
  
      # figure out from the base setting where the lib and .h are
--    if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include')
-+    if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include/db4')
-     if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+     if not incdir:
+-        incdir = os.path.join(BERKELEYDB_DIR, 'include')
++        incdir = os.path.join(BERKELEYDB_DIR, 'include/db4')
+     if not libdir:
+         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = ['db']
 +    if not '-ldb4' in LIBS:
diff --git a/databases/py-bsddb3/patches/patch-ab b/databases/py-bsddb3/patches/patch-ab
index d662cec193e..f367743fe2d 100644
--- a/databases/py-bsddb3/patches/patch-ab
+++ b/databases/py-bsddb3/patches/patch-ab
@@ -1,36 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/12/07 00:53:28 epg Exp $
+$NetBSD: patch-ab,v 1.3 2004/02/10 17:56:55 minskim Exp $
 
---- src/_db.c.orig	Sun Dec 22 03:44:32 2002
-+++ src/_db.c
-@@ -745,7 +745,8 @@ DBCursor_dealloc(DBCursorObject* self)
-     int err;
-     if (self->dbc != NULL) {
-         MYDB_BEGIN_ALLOW_THREADS;
--        err = self->dbc->c_close(self->dbc);
-+	if (self->mydb->db != NULL)
-+            err = self->dbc->c_close(self->dbc);
-         self->dbc = NULL;
-         MYDB_END_ALLOW_THREADS;
-     }
-@@ -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)
-      */
-+#ifdef WITH_THREAD
-     PyEval_InitThreads();
-+#endif
-     MYDB_BEGIN_ALLOW_THREADS;
- #if (DBVER >= 41)
-     err = self->db->associate(self->db,
-@@ -1620,6 +1623,7 @@ DB_open(DBObject* self, PyObject* args, 
- #endif
-     MYDB_END_ALLOW_THREADS;
-     if (makeDBError(err)) {
-+	self->db->close(self->db, 0);
-         self->db = NULL;
-         return NULL;
-     }
-@@ -4214,7 +4218,11 @@ DL_EXPORT(void) init_db(void)
+--- extsrc/_bsddb.c.orig	2004-01-14 02:50:28.000000000 -0600
++++ extsrc/_bsddb.c
+@@ -4363,7 +4363,11 @@ DL_EXPORT(void) init_bsddb(void)
      ADD_INT(d, DB_MAX_PAGES);
      ADD_INT(d, DB_MAX_RECORDS);
  
@@ -42,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2003/12/07 00:53:28 epg Exp $
      ADD_INT(d, DB_XA_CREATE);
  
      ADD_INT(d, DB_CREATE);
-@@ -4363,7 +4371,7 @@ DL_EXPORT(void) init_db(void)
+@@ -4512,7 +4516,7 @@ DL_EXPORT(void) init_bsddb(void)
      ADD_INT(d, DB_CHECKPOINT);
      ADD_INT(d, DB_CURLSN);
  #endif