Update to 4.1.3

4 files changed, 62 insertions, 13 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index d500cc9ed72..4ce41f15876 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bsddb3
-PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTVERSION=	4.1.3
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pybsddb
@@ -19,6 +18,7 @@ COMMENT=	Python extension module for BerkeleyDB 3 and 4
 .if defined(WITH_DB3)
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 DBVERSION=	db3
+PKGNAMESUFFIX=	-db3
 .else
 LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 DBVERSION=	db4
@@ -32,6 +32,6 @@ PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DBVERSION%%,${DBVERSION},g' ${WRKSRC}/setup.py
-	${REINPLACE_CMD} 's,<db\.h>,<${DBVERSION}/db.h>,' ${WRKSRC}/src/_db.c
+	${REINPLACE_CMD} 's,<db\.h>,<${DBVERSION}/db.h>,' ${WRKSRC}/extsrc/_bsddb.c
 
 .include <bsd.port.mk>
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index db8fe2197c7..af77aa1fb95 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1 +1 @@
-MD5 (bsddb3-3.4.0.tar.gz) = e433307b4ee1dd7be4fa1177b8be575a
+MD5 (bsddb3-4.1.3.tar.gz) = a99ceebb787749123a9075a93eb3601b
diff --git a/databases/py-bsddb3/files/patch-setup.py b/databases/py-bsddb3/files/patch-setup.py
index dc004b0e905..421d966ad0a 100644
--- a/databases/py-bsddb3/files/patch-setup.py
+++ b/databases/py-bsddb3/files/patch-setup.py
@@ -1,9 +1,9 @@
---- setup.py.orig	Thu Jul 11 03:48:34 2002
-+++ setup.py	Thu Jul 11 03:51:34 2002
-@@ -68,8 +68,8 @@
-     # figure out from the base setting where the lib and .h are
-     if not incdir: incdir = os.path.join(BERKELEYDB_DIR, 'include')
-     if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+--- setup.py.orig	Mon Feb  3 11:28:52 2003
++++ setup.py	Mon Mar  3 16:22:31 2003
+@@ -73,8 +73,8 @@
+         incdir = os.path.join(BERKELEYDB_DIR, 'include')
+     if not libdir:
+         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = ['db']
 +    if not '-l%%DBVERSION%%' in LIBS:
@@ -11,8 +11,8 @@
      else:
          libname = []
      utils = []
-@@ -93,7 +93,7 @@
-     if not status and string.find(results, 'libdb.') >= 0:
+@@ -96,7 +96,7 @@
+     if not status and results.find('libdb.') >= 0:
          static = 1
  
 -    if static:
diff --git a/databases/py-bsddb3/pkg-plist b/databases/py-bsddb3/pkg-plist
index 7a03eb215bd..46c22f4fb04 100644
--- a/databases/py-bsddb3/pkg-plist
+++ b/databases/py-bsddb3/pkg-plist
@@ -1,7 +1,7 @@
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.py
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/_db.so
+%%PYTHON_SITELIBDIR%%/bsddb3/_bsddb.so
 %%PYTHON_SITELIBDIR%%/bsddb3/db.py
 %%PYTHON_SITELIBDIR%%/bsddb3/db.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/db.pyo
@@ -20,4 +20,53 @@
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.py
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_env_close.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_env_close.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_env_close.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/bsddb3/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bsddb3