Index: Makefile =================================================================== --- Makefile (revision 367239) +++ Makefile (working copy) @@ -26,7 +26,7 @@ post-patch: ${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py ${REINPLACE_CMD} 's,,<${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 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: files/patch-setup3.py =================================================================== --- files/patch-setup3.py (revision 367239) +++ files/patch-setup3.py (working copy) @@ -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 '-ldb-4.8' in LIBS: ++ libname = ['db-4.8'] 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(