summaryrefslogtreecommitdiff
path: root/lang/python21
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2005-05-29 08:03:25 +0000
committerminskim <minskim@pkgsrc.org>2005-05-29 08:03:25 +0000
commit421cbfa4dd0e138d88ffbc2f6824c10ad9cc0fad (patch)
tree3484f3e1a9ad9ac49b029e8cd50674c580056e3d /lang/python21
parentc62240d1f44ac21ff13818abfa41f8fd797b55d3 (diff)
downloadpkgsrc-421cbfa4dd0e138d88ffbc2f6824c10ad9cc0fad.tar.gz
Make the bsddb module build when pkgsrc bdb is used.
Diffstat (limited to 'lang/python21')
-rw-r--r--lang/python21/Makefile5
-rw-r--r--lang/python21/distinfo4
-rw-r--r--lang/python21/patches/patch-ac37
3 files changed, 38 insertions, 8 deletions
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index d2328d46441..c04b94a0763 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/29 06:26:50 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/29 08:03:25 minskim Exp $
#
DISTNAME= Python-2.1.3
@@ -52,6 +52,9 @@ BSDDB=
BSDDB= "@comment "
.else
.include "../../mk/bdb.buildlink3.mk"
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
+MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
.endif
PLIST_SUBST+= BSDDB=${BSDDB}
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index fbd37533bc5..f95af0786dd 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2005/05/29 07:35:54 minskim Exp $
+$NetBSD: distinfo,v 1.17 2005/05/29 08:03:25 minskim Exp $
SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
RMD160 (Python-2.1.3.tgz) = d7216480cf884507d97bf7932767871977fc1ccc
Size (Python-2.1.3.tgz) = 6194432 bytes
SHA1 (patch-aa) = 8273acc49a9eedad6e09685098178f3b7fb8f1c6
SHA1 (patch-ab) = f87a4d5c76182ab27ba79b42f00e8a2ff63bcf2b
-SHA1 (patch-ac) = a1d830b73a055d5312e7ce5c39932da38e93584e
+SHA1 (patch-ac) = 731a0dd2286ee9ca95c26f92e74f2cbd0fdd905a
SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
diff --git a/lang/python21/patches/patch-ac b/lang/python21/patches/patch-ac
index cd3e6bbfb65..876aa59c66f 100644
--- a/lang/python21/patches/patch-ac
+++ b/lang/python21/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2005/05/29 07:35:54 minskim Exp $
+$NetBSD: patch-ac,v 1.8 2005/05/29 08:03:25 minskim Exp $
--- setup.py.orig 2001-12-27 15:51:02.000000000 -0600
+++ setup.py
@@ -68,7 +68,34 @@ $NetBSD: patch-ac,v 1.7 2005/05/29 07:35:54 minskim Exp $
if (ssl_incs is not None and
ssl_libs is not None):
-@@ -408,8 +409,8 @@ class PyBuildExt(build_ext):
+@@ -346,16 +347,20 @@ class PyBuildExt(build_ext):
+ # (See http://electricrain.com/greg/python/bsddb3/ for an interface to
+ # BSD DB 3.x.)
+
++ bdb_type = os.environ['PY_BDB_TYPE']
++ dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
+ dblib = []
+- if self.compiler.find_library_file(lib_dirs, 'db'):
++ if self.compiler.find_library_file(dblib_dir, 'db'):
+ dblib = ['db']
++ elif self.compiler.find_library_file(dblib_dir, bdb_type):
++ dblib = [bdb_type]
+
+- db185_incs = find_file('db_185.h', inc_dirs,
+- ['/usr/include/db3', '/usr/include/db2'])
+- db_inc = find_file('db.h', inc_dirs, ['/usr/include/db1'])
+- if db185_incs is not None:
++ db_inc = [os.environ['PY_BDB_INCDIRS']]
++ if bdb_type in ['db2', 'db3', 'db4']:
+ exts.append( Extension('bsddb', ['bsddbmodule.c'],
+- include_dirs = db185_incs,
++ include_dirs = db_inc,
++ library_dirs = dblib_dir,
++ runtime_library_dirs = dblib_dir,
+ define_macros=[('HAVE_DB_185_H',1)],
+ libraries = dblib ) )
+ elif db_inc is not None:
+@@ -408,8 +413,8 @@ class PyBuildExt(build_ext):
if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
curses_libs = ['ncurses']
@@ -79,7 +106,7 @@ $NetBSD: patch-ac,v 1.7 2005/05/29 07:35:54 minskim Exp $
elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
# OSX has an old Berkeley curses, not good enough for the _curses module.
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +418,8 @@ class PyBuildExt(build_ext):
+@@ -417,8 +422,8 @@ class PyBuildExt(build_ext):
else:
curses_libs = ['curses', 'termcap']
@@ -90,7 +117,7 @@ $NetBSD: patch-ac,v 1.7 2005/05/29 07:35:54 minskim Exp $
# If the curses module is enabled, check for the panel module
if (os.path.exists('Modules/_curses_panel.c') and
-@@ -451,23 +452,7 @@ class PyBuildExt(build_ext):
+@@ -451,23 +456,7 @@ class PyBuildExt(build_ext):
# Andrew Kuchling's zlib module.
# This require zlib 1.1.3 (or later).
# See http://www.cdrom.com/pub/infozip/zlib/
@@ -115,7 +142,7 @@ $NetBSD: patch-ac,v 1.7 2005/05/29 07:35:54 minskim Exp $
# Interface to the Expat XML parser
#
-@@ -609,7 +594,7 @@ def main():
+@@ -609,7 +598,7 @@ def main():
ext_modules=[Extension('struct', ['structmodule.c'])],
# Scripts to install