Use BDB_LIBS to obtain the BDB library name, instead of guessing

it from BUILDLINK_TRANSFORM.  This fixes PR 37297.

3 files changed, 9 insertions, 12 deletions

diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 855850ccd1c..22fc97537a3 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2007/07/02 20:24:27 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.37 2007/12/24 01:19:47 minskim Exp $
 #
 
 DISTNAME=	Python-2.3.5
@@ -102,6 +102,7 @@ PLIST_SUBST+=	NOSHLIB="@comment "
 MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE:Q}
 MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
+MAKE_ENV+=	PY_BDB_LIBS=${BDB_LIBS:Q}
 PLIST_SUBST+=	BSDDBMODULE=
 PLIST_SUBST+=	NOSHLIB=
 .  if ${OPSYS} == "Interix"
@@ -112,10 +113,6 @@ PLIST_SUBST+=	NISMODULE=
 .  endif
 .endif
 
-.if defined(BUILDLINK_TRANSFORM)
-MAKE_ENV+=	PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
-.endif
-
 PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
 
 TEST_TARGET=	test
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index e079c49ab18..eaac3cfdfc9 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2007/10/10 11:15:13 rillig Exp $
+$NetBSD: distinfo,v 1.40 2007/12/24 01:19:48 minskim Exp $
 
 SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
 RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -12,7 +12,7 @@ SHA1 (patch-af) = f161ce64bb1b318926bd9c534fe7050d7ddb636f
 SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
 SHA1 (patch-ai) = 0e8564ec8157fb5c48c801294213c66ae89a55a1
 SHA1 (patch-al) = 98818fe37c3bac94bee91fe4f3dd8633172bec49
-SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
+SHA1 (patch-am) = 786de1c656656fb900308a4811f1e9956db485b7
 SHA1 (patch-bb) = 4bc4b8d73ed273bb753db5d6d971d446b730e165
 SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
 SHA1 (patch-cb) = 301205b29db1ca60f06b2dc0423f5f911eabcd18
diff --git a/lang/python23/patches/patch-am b/lang/python23/patches/patch-am
index e1f266589f5..ba4f0654c74 100644
--- a/lang/python23/patches/patch-am
+++ b/lang/python23/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.5 2004/04/13 22:48:41 recht Exp $
+$NetBSD: patch-am,v 1.6 2007/12/24 01:19:48 minskim Exp $
 
---- setup.py.orig	2003-10-21 15:01:21.000000000 -0500
+--- setup.py.orig	2005-01-17 13:07:49.000000000 -0800
 +++ setup.py
 @@ -15,7 +15,7 @@ from distutils.command.install import in
  from distutils.command.install_lib import install_lib
@@ -268,8 +268,8 @@ $NetBSD: patch-am,v 1.5 2004/04/13 22:48:41 recht Exp $
 +                        else:
 +                            raise NotFound
 +            try:
-+                bltransform = os.environ['PY_BDB_TRANSFORM']
-+                m = re.search(r"l:db:(db.)\s*", bltransform)
++                bdblib = os.environ['PY_BDB_LIBS']
++                m = re.search(r"-l(db.)\s*", bdblib)
 +                if m is not None and m.group(1) is not None:
 +                    dblibs = [m.group(1)]
 +            except:
@@ -339,7 +339,7 @@ $NetBSD: patch-am,v 1.5 2004/04/13 22:48:41 recht Exp $
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
  
          if platform == 'sunos5':
-@@ -1140,7 +1195,7 @@ def main():
+@@ -1148,7 +1203,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install