Attachment #142099 for bug #189070

View | Details | Raw Unified | Return to bug 189070
Collapse All | Expand All

Lines 2-8 Link Here

(-)./Makefile (-1 / +4 lines)
2	# $FreeBSD: head/databases/py-bsddb3/Makefile 346882 2014-03-03 11:41:38Z rm $	2	# $FreeBSD: head/databases/py-bsddb3/Makefile 346882 2014-03-03 11:41:38Z rm $
3		3
4	PORTNAME= bsddb3	4	PORTNAME= bsddb3
5	PORTVERSION= 5.3.0	5	PORTVERSION= 6.0.1
6	CATEGORIES= databases python	6	CATEGORIES= databases python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 10-15 Link Here
10	MAINTAINER= wen@FreeBSD.org	10	MAINTAINER= wen@FreeBSD.org
11	COMMENT= Python extension module for BerkeleyDB 3 and 4	11	COMMENT= Python extension module for BerkeleyDB 3 and 4
12		12
		13	LICENSE= BSD3CLAUSE
		14
13	USE_BDB= 43+	15	USE_BDB= 43+
14	USE_PYTHON= yes	16	USE_PYTHON= yes
15	USE_PYDISTUTILS= yes	17	USE_PYDISTUTILS= yes
Lines 25-30 Link Here
25	post-patch:	27	post-patch:
26	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py	28	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
27	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h	29	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h
		30	${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py
28		31
29	post-install:	32	post-install:
30	@${MKDIR} ${STAGEDIR}${DOCSDIR}	33	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (bsddb3-5.3.0.tar.gz) = 4619f6189e5f94e337c62ae398ccb9c25568f3c3cab39970a4ea7625d38f8b3e	1	SHA256 (bsddb3-6.0.1.tar.gz) = abc34d83d6cbb40f1626ecc2b62e8163ba204f4bb6a65c23b125a171d224bf6d
2	SIZE (bsddb3-5.3.0.tar.gz) = 385113	2	SIZE (bsddb3-6.0.1.tar.gz) = 347002




--- setup2.py.orig	2011-03-08 22:16:14.000000000 +0800
+++ setup2.py	2011-03-15 16:00:42.000000000 +0800
@@ -86,10 +86,7 @@
             category=DeprecationWarning)
 
 

 
 from distutils.dep_util import newer
 import distutils.ccompiler
@@ -292,8 +289,8 @@
         incdir = os.path.join(BERKELEYDB_DIR, 'include')
     if not libdir:
         libdir = os.path.join(BERKELEYDB_DIR, 'lib')

     else:
         if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
         libname = []
@@ -332,7 +329,7 @@
 
     # read db.h to figure out what version of Berkeley DB this is
     ver = None
-    db_h_lines = open(os.path.join(incdir, 'db.h'), 'r').readlines()
+    db_h_lines = open('%%BDB_INCLUDE_DIR%%/db.h', 'r').readlines()
     db_ver_re = re.compile(
         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
     db_ver2 = db_ver

Return to bug 189070

Lines 1-6 Link Here

(-)./files/patch-setup2.py (-2 / +11 lines)
1	--- setup2.py.orig 2011-03-08 22:16:14.000000000 +0800	1	--- setup2.py.orig 2011-03-08 22:16:14.000000000 +0800
2	+++ setup2.py 2011-03-15 16:00:42.000000000 +0800	2	+++ setup2.py 2011-03-15 16:00:42.000000000 +0800
3	@@ -53,10 +53,7 @@	3	@@ -86,10 +86,7 @@
4	category=DeprecationWarning)	4	category=DeprecationWarning)
5		5
6		6
Lines 12-18 Link Here
12		12
13	from distutils.dep_util import newer	13	from distutils.dep_util import newer
14	import distutils.ccompiler	14	import distutils.ccompiler
15	@@ -247,8 +244,8 @@	15	@@ -292,8 +289,8 @@
16	incdir = os.path.join(BERKELEYDB_DIR, 'include')	16	incdir = os.path.join(BERKELEYDB_DIR, 'include')
17	if not libdir:	17	if not libdir:
18	libdir = os.path.join(BERKELEYDB_DIR, 'lib')	18	libdir = os.path.join(BERKELEYDB_DIR, 'lib')
Lines 23-25 Link Here
23	else:	23	else:
24	if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"	24	if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
25	libname = []	25	libname = []
		26	@@ -332,7 +329,7 @@
		27
		28	# read db.h to figure out what version of Berkeley DB this is
		29	ver = None
		30	- db_h_lines = open(os.path.join(incdir, 'db.h'), 'r').readlines()
		31	+ db_h_lines = open('%%BDB_INCLUDE_DIR%%/db.h', 'r').readlines()
		32	db_ver_re = re.compile(
		33	r'^#define\s+DB_VERSION_STRING\s.Berkeley DB (\d+\.\d+).')
		34	db_ver2 = db_ver