From 2661b2647597ca47edf0c8d9d69189f6ad889b06 Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Tue, 18 Oct 2011 21:59:17 +0000
Subject: Deal with the fact that if /usr/include/ndbm.h exists on Linux it
 probably belongs to gdbm_compat.  I.E. _don't_ use ndbm on Linux.

---
 lang/python26/distinfo         |  4 ++--
 lang/python26/patches/patch-am | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'lang/python26')

diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index e9d0e8c2552..e03bfd60bcb 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2011/10/01 03:11:15 dsainty Exp $
+$NetBSD: distinfo,v 1.39 2011/10/18 21:59:18 sbd Exp $
 
 SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
 RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
@@ -14,7 +14,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
 SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089
-SHA1 (patch-am) = aebb81db4aa38c3c1ef57ed4e25422685c362db2
+SHA1 (patch-am) = 740d3b3b0793d7ed152438b9dacbae457dc71076
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index d9c6eda60a8..05347373919 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.16 2011/10/01 03:11:15 dsainty Exp $
+$NetBSD: patch-am,v 1.17 2011/10/18 21:59:18 sbd Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -298,8 +298,14 @@ support building the "nis" and "crypt" modules.
  
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -1131,7 +974,7 @@
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+@@ -1128,10 +971,12 @@
+                     ndbm_libs = ['ndbm']
+                 else:
+                     ndbm_libs = []
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
++		# Don't use gdbm_compat!
++		if not self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
++		    exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
                                         libraries = ndbm_libs ) )
 -            elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
@@ -307,12 +313,13 @@ support building the "nis" and "crypt" modules.
                  gdbm_libs = ['gdbm']
                  if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
                      gdbm_libs.append('gdbm_compat')
-@@ -1147,14 +990,11 @@
+@@ -1147,14 +990,12 @@
                          libraries = gdbm_libs ) )
                  else:
                      missing.append('dbm')
 -            elif db_incs is not None:
-+            elif 1==1:
++
++            if not module_enabled(exts, 'dbm'):
                  exts.append( Extension('dbm', ['dbmmodule.c'],
 -                                       library_dirs=dblib_dir,
 -                                       runtime_library_dirs=dblib_dir,
-- 
cgit v1.2.3