6 files changed, 42 insertions, 29 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 25a60ca43120..9e9945c9c459 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	bsddb3
-PORTVERSION=	4.5.0
+PORTVERSION=	4.7.6
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pybsddb
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	perky@FreeBSD.org
@@ -26,14 +25,13 @@ PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup.py
-	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/extsrc/_bsddb.c
+	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
+	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${FIND} . | \
-		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index a5361156060e..1f3c775083cf 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,3 +1,3 @@
-MD5 (bsddb3-4.5.0.tar.gz) = e08e50b0e602396864c6061168987318
-SHA256 (bsddb3-4.5.0.tar.gz) = bb904694cc0a8b309ac19e020d857b2252b2323eb75ca672ca334631649c09c0
-SIZE (bsddb3-4.5.0.tar.gz) = 522126
+MD5 (bsddb3-4.7.6.tar.gz) = 53c06e0247b2aa4d8523d52e53378cb5
+SHA256 (bsddb3-4.7.6.tar.gz) = 062e18332e3169263b425c50d0478c910395ffd0fd6559ac8d5c68dd1bcd1975
+SIZE (bsddb3-4.7.6.tar.gz) = 207478
diff --git a/databases/py-bsddb3/files/patch-setup.py b/databases/py-bsddb3/files/patch-setup2.py
index 7856c2755c3e..46d751ec7db9 100644
--- a/databases/py-bsddb3/files/patch-setup.py
+++ b/databases/py-bsddb3/files/patch-setup2.py
@@ -1,6 +1,6 @@
---- setup.py.orig	Fri Jun  3 16:27:21 2005
-+++ setup.py	Mon Oct 10 22:43:16 2005
-@@ -197,8 +197,8 @@
+--- setup2.py.orig	2009-06-30 14:58:28.711417858 +0800
++++ setup2.py	2009-06-30 14:59:05.363767161 +0800
+@@ -204,8 +204,8 @@
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -11,12 +11,3 @@
      else:
          if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
          libname = []
-@@ -221,7 +221,7 @@
-     if not status and results.find('libdb.') >= 0:
-         static = 1
- 
--    if static:
-+    if 0:
-         print """\
- \aWARNING:
- \tIt appears that the old bsddb module is staticly linked in the
diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py
new file mode 100644
index 000000000000..085acb026287
--- /dev/null
+++ b/databases/py-bsddb3/files/patch-setup3.py
@@ -0,0 +1,13 @@
+--- setup3.py.orig	2009-06-30 14:58:24.819924337 +0800
++++ setup3.py	2009-06-30 14:59:39.207070800 +0800
+@@ -204,8 +204,8 @@
+         incdir = os.path.join(BERKELEYDB_DIR, 'include')
+     if not libdir:
+         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
+-    if not '-ldb' in LIBS:
+-        libname = [dblib]
++    if not '-l%%DBVERSION%%' in LIBS:
++        libname = ['%%DBVERSION%%']
+     else:
+         if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
+         libname = []
diff --git a/databases/py-bsddb3/pkg-descr b/databases/py-bsddb3/pkg-descr
index 46f362f7e634..fde9b4f8acc6 100644
--- a/databases/py-bsddb3/pkg-descr
+++ b/databases/py-bsddb3/pkg-descr
@@ -7,4 +7,4 @@ these are fully supported in the Python wrappers.  Please see the
 document in developers' web site for more details on the types and
 methods provided.
 
-WWW: http://pybsddb.sourceforge.net/
+WWW: http://www.jcea.es/programacion/pybsddb.htm
diff --git a/databases/py-bsddb3/pkg-plist b/databases/py-bsddb3/pkg-plist
index 9b959fa21e67..08c14332af14 100644
--- a/databases/py-bsddb3/pkg-plist
+++ b/databases/py-bsddb3/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_INCLUDEDIR%%/bsddb3/bsddb.h
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.py
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyo
@@ -20,12 +21,12 @@
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.py
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/test_support.py
+%%PYTHON_SITELIBDIR%%/bsddb3/test_support.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/test_support.pyo
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_1413192.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_1413192.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_1413192.pyo
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.py
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyo
@@ -53,9 +54,15 @@
 %%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_distributed_transactions.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_distributed_transactions.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_distributed_transactions.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.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
@@ -77,11 +84,15 @@
 %%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_replication.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_replication.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_replication.pyo
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.py
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.pyo
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.py
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyc
 %%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyo
+@dirrm %%PYTHON_INCLUDEDIR%%/bsddb3
 @dirrm %%PYTHON_SITELIBDIR%%/bsddb3/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bsddb3