Attachment 146920 Details for Bug 189131 – py-bsddb3-6.1.0

[patch] py-bsddb3-6.1.0

py-bsddb3-6.1.0_1.patch (text/plain), 2.21 KB, created by Muhammad Moinur Rahman on 2014-09-06 11:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-09-06 11:19:18 UTC

Size: 2.21 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN /usr/ports//databases/py-bsddb3/Makefile ./Makefile
>--- /usr/ports//databases/py-bsddb3/Makefile	2014-09-03 18:48:52.000000000 +0600
>+++ ./Makefile	2014-09-06 18:02:13.811318532 +0600
>@@ -26,7 +26,8 @@
> 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
>+	${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}
>diff -ruN /usr/ports//databases/py-bsddb3/files/patch-setup3.py ./files/patch-setup3.py
>--- /usr/ports//databases/py-bsddb3/files/patch-setup3.py	2014-01-22 23:40:44.000000000 +0600
>+++ ./files/patch-setup3.py	2014-09-06 17:07:51.543543569 +0600
>@@ -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
>++++ setup3.py
>+@@ -86,10 +86,7 @@
>              category=DeprecationWarning)
>  
>  
>@@ -12,14 +12,23 @@
>  
>  from distutils.dep_util import newer
>  import distutils.ccompiler
>-@@ -247,8 +244,8 @@
>+@@ -295,8 +292,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%%']
>++    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 = []
>+@@ -336,7 +333,7 @@
>+     # read db.h to figure out what version of Berkeley DB this is
>+     ver = None
>+     # This should move to "with" when we drop support for Python 2.4 and 2.5
>+-    f = open(os.path.join(incdir, 'db.h'), 'r')
>++    f = open('%%BDB_INCLUDE_DIR%%/db.h', 'r')
>+     db_h_lines = f.readlines()
>+     f.close()
>+     db_ver_re = re.compile(
>====> Cleaning up
>===> Done

Flags:

bofh: maintainer-approval+

Actions: View | Diff

Attachments on bug 189131: 142149 | 146769 | 146920