Date: Mon, 12 Sep 2005 16:34:50 +0200 (CEST) From: Søren Straarup <xride@x12.dk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: perky@FreeBSD.org Subject: ports/86014: [PATCH] databases/bsddb3: update to 4.3.3 Message-ID: <20050912143450.4A7C3415C@beacon.x12.dk> Resent-Message-ID: <200509121440.j8CEeIFE058834@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 86014
>Category: ports
>Synopsis: [PATCH] databases/bsddb3: update to 4.3.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 12 14:40:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Søren Straarup
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD beacon.x12.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Tue Sep 6 13:55:41 CEST
>Description:
- Update to 4.3.3
Removed file(s):
- files/patch-setup.py
Port maintainer (perky@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- py24-bsddb3-4.3.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports//databases/py24-bsddb3/Makefile /space/portstrees/FreeBSD/ports/databases/py-bsddb3/Makefile
--- /usr/ports//databases/py24-bsddb3/Makefile Mon Sep 12 16:23:19 2005
+++ /space/portstrees/FreeBSD/ports/databases/py-bsddb3/Makefile Mon Sep 12 15:01:05 2005
@@ -6,7 +6,7 @@
#
PORTNAME= bsddb3
-PORTVERSION= 4.2.4
+PORTVERSION= 4.3.3
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pybsddb
@@ -20,7 +20,7 @@
.elif defined(WITH_DB4)
WITH_BDB_VER?= 4
.else
-WITH_BDB_VER?= 41
+WITH_BDB_VER?= 42
.endif
.if defined(WITH_BDB_VER)
@@ -37,7 +37,7 @@
DBVERSION= db41
DBHEADER= db41
.elif ${WITH_BDB_VER} == 42
-LIB_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42
+LIB_DEPENDS= db-4.2:${PORTSDIR}/databases/db42
DBVERSION= db-4.2
DBHEADER= db42
.else
@@ -53,6 +53,8 @@
PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
post-patch:
+ ${REINPLACE_CMD} 's,if 0,if static,' ${WRKSRC}/setup.py
+ ${REINPLACE_CMD} 's,-ldb,-l%%DBVERSION%%,' ${WRKSRC}/setup.py
${REINPLACE_CMD} 's,%%DBVERSION%%,${DBVERSION},g' ${WRKSRC}/setup.py
${REINPLACE_CMD} 's,<db\.h>,<${DBHEADER}/db.h>,' ${WRKSRC}/extsrc/_bsddb.c
diff -ruN --exclude=CVS /usr/ports//databases/py24-bsddb3/distinfo /space/portstrees/FreeBSD/ports/databases/py-bsddb3/distinfo
--- /usr/ports//databases/py24-bsddb3/distinfo Mon Sep 12 16:23:19 2005
+++ /space/portstrees/FreeBSD/ports/databases/py-bsddb3/distinfo Mon Sep 12 15:01:05 2005
@@ -1,2 +1,2 @@
-MD5 (bsddb3-4.2.4.tar.gz) = e7cf57b849e63e0a2dd791d9ad5a377a
-SIZE (bsddb3-4.2.4.tar.gz) = 508095
+MD5 (bsddb3-4.3.3.tar.gz) = b3a18a3315d6e1d8d55779d89940a07c
+SIZE (bsddb3-4.3.3.tar.gz) = 516635
diff -ruN --exclude=CVS /usr/ports//databases/py24-bsddb3/files/patch-setup.py /space/portstrees/FreeBSD/ports/databases/py-bsddb3/files/patch-setup.py
--- /usr/ports//databases/py24-bsddb3/files/patch-setup.py Mon Sep 12 16:23:19 2005
+++ /space/portstrees/FreeBSD/ports/databases/py-bsddb3/files/patch-setup.py Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
---- 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:
-+ libname = ['%%DBVERSION%%']
- else:
- libname = []
- utils = []
-@@ -96,7 +96,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 -ruN --exclude=CVS /usr/ports//databases/py24-bsddb3/pkg-plist /space/portstrees/FreeBSD/ports/databases/py-bsddb3/pkg-plist
--- /usr/ports//databases/py24-bsddb3/pkg-plist Mon Sep 12 16:23:19 2005
+++ /space/portstrees/FreeBSD/ports/databases/py-bsddb3/pkg-plist Mon Sep 12 15:01:05 2005
@@ -1,72 +1,75 @@
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.py
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/_pybsddb.so
%%PYTHON_SITELIBDIR%%/bsddb3/db.py
-%%PYTHON_SITELIBDIR%%/bsddb3/db.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/db.pyo
%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyo
%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyo
%%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/dbtables.py
+%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.py
+%%PYTHON_SITELIBDIR%%/bsddb3/__init__.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compare.py
%%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_thread.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_env_close.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.py
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.py
%%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_get_none.pyc
%%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_lock.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compare.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.pyc
%%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_all.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.pyc
%%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_basics.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.pyo
%%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_compare.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyo
%%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_env_close.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyo
%%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/__init__.pyo
%%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
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/_pybsddb.so
+%%PYTHON_SITELIBDIR%%/bsddb3/db.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bsddb3/db.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyo
+%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyo
@dirrm %%PYTHON_SITELIBDIR%%/bsddb3/tests
@dirrm %%PYTHON_SITELIBDIR%%/bsddb3
--- py24-bsddb3-4.3.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050912143450.4A7C3415C>