[Midnightbsd-cvs] mports [21538] trunk/databases/py-bsddb3: 6.1.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 5 20:49:54 EDT 2016
Revision: 21538
http://svnweb.midnightbsd.org/mports/?rev=21538
Author: laffer1
Date: 2016-08-05 20:49:54 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
6.1.1
Modified Paths:
--------------
trunk/databases/py-bsddb3/Makefile
trunk/databases/py-bsddb3/distinfo
trunk/databases/py-bsddb3/files/patch-setup2.py
trunk/databases/py-bsddb3/files/patch-setup3.py
Modified: trunk/databases/py-bsddb3/Makefile
===================================================================
--- trunk/databases/py-bsddb3/Makefile 2016-08-06 00:44:43 UTC (rev 21537)
+++ trunk/databases/py-bsddb3/Makefile 2016-08-06 00:49:54 UTC (rev 21538)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= bsddb3
-PORTVERSION= 5.3.0
+PORTVERSION= 6.1.1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -9,15 +9,15 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Python extension module for BerkeleyDB 3 and 4
-LICENSE= python
+LICENSE= bsd3
+USE_BDB= yes
USES= python
-USE_PYTHON= autoplist distutils
-USE_BDB= 48+
+USE_PYTHON= distutils autoplist
PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
PYDISTUTILS_BUILDARGS= --libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
-PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
+PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${TRUE_PREFIX} --berkeley-db=${LOCALBASE}
PORTDOCS= *
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
@@ -25,9 +25,11 @@
post-patch:
${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
+ ${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
+ ${REINPLACE_CMD} 's,%%BDB_LIB_NAME%%,${BDB_LIB_NAME},' ${WRKSRC}/setup3.py
post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+ @${MKDIR} ${DOCSDIR}
+ (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
.include <bsd.port.mk>
Modified: trunk/databases/py-bsddb3/distinfo
===================================================================
--- trunk/databases/py-bsddb3/distinfo 2016-08-06 00:44:43 UTC (rev 21537)
+++ trunk/databases/py-bsddb3/distinfo 2016-08-06 00:49:54 UTC (rev 21538)
@@ -1,2 +1,2 @@
-SHA256 (bsddb3-5.3.0.tar.gz) = 4619f6189e5f94e337c62ae398ccb9c25568f3c3cab39970a4ea7625d38f8b3e
-SIZE (bsddb3-5.3.0.tar.gz) = 385113
+SHA256 (bsddb3-6.1.1.tar.gz) = 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3
+SIZE (bsddb3-6.1.1.tar.gz) = 450571
Modified: trunk/databases/py-bsddb3/files/patch-setup2.py
===================================================================
--- trunk/databases/py-bsddb3/files/patch-setup2.py 2016-08-06 00:44:43 UTC (rev 21537)
+++ trunk/databases/py-bsddb3/files/patch-setup2.py 2016-08-06 00:49:54 UTC (rev 21538)
@@ -1,6 +1,6 @@
---- setup2.py.orig 2011-03-08 22:16:14.000000000 +0800
-+++ setup2.py 2011-03-15 16:00:42.000000000 +0800
-@@ -53,10 +53,7 @@
+--- setup2.py.orig 2016-02-08 21:14:26 UTC
++++ setup2.py
+@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
category=DeprecationWarning)
@@ -8,11 +8,12 @@
- from setuptools import setup, Extension
-except :
- from distutils.core import setup, Extension
+-
+from distutils.core import setup, Extension
-
from distutils.dep_util import newer
import distutils.ccompiler
-@@ -247,8 +244,8 @@
+
+@@ -288,8 +284,8 @@ if os.name == 'posix':
incdir = os.path.join(BERKELEYDB_DIR, 'include')
if not libdir:
libdir = os.path.join(BERKELEYDB_DIR, 'lib')
@@ -23,3 +24,12 @@
else:
if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
libname = []
+@@ -328,7 +324,7 @@ if os.name == 'posix':
+
+ # read db.h to figure out what version of Berkeley DB this is
+ ver = None
+- with open(os.path.join(incdir, 'db.h'), 'r') as f :
++ with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
+ db_h_lines = f.readlines()
+ db_ver_re = re.compile(
+ r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
Modified: trunk/databases/py-bsddb3/files/patch-setup3.py
===================================================================
--- trunk/databases/py-bsddb3/files/patch-setup3.py 2016-08-06 00:44:43 UTC (rev 21537)
+++ trunk/databases/py-bsddb3/files/patch-setup3.py 2016-08-06 00:49:54 UTC (rev 21538)
@@ -1,6 +1,6 @@
---- setup3.py.orig 2011-03-15 16:10:41.000000000 +0800
-+++ setup3.py 2011-03-15 16:12:40.000000000 +0800
-@@ -53,10 +53,7 @@
+--- setup3.py.orig 2016-02-08 21:18:47 UTC
++++ setup3.py
+@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
category=DeprecationWarning)
@@ -8,18 +8,28 @@
- from setuptools import setup, Extension
-except :
- from distutils.core import setup, Extension
+-
+from distutils.core import setup, Extension
-
from distutils.dep_util import newer
import distutils.ccompiler
-@@ -247,8 +244,8 @@
+
+@@ -288,8 +284,8 @@ if os.name == 'posix':
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%%']
++ if not '-l%%BDB_LIB_NAME%%' in LIBS:
++ libname = ['%%BDB_LIB_NAME%%']
else:
if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
libname = []
+@@ -328,7 +324,7 @@ if os.name == 'posix':
+
+ # read db.h to figure out what version of Berkeley DB this is
+ ver = None
+- with open(os.path.join(incdir, 'db.h'), 'r') as f :
++ with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
+ db_h_lines = f.readlines()
+ db_ver_re = re.compile(
+ r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
More information about the Midnightbsd-cvs
mailing list