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.

11 files changed, 117 insertions, 38 deletions

diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 8b34ed4f229..ba4e5edee73 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2011/09/14 17:00:20 hans Exp $
+$NetBSD: distinfo,v 1.36 2011/10/18 21:59:17 sbd Exp $
 
 SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96
 RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5
 SHA1 (patch-al) = 3bcbdcacc451c8a354ea2d9e9887e61edaabfa41
-SHA1 (patch-am) = 31158eee32363963e2f6d0bd528f0b291453de74
+SHA1 (patch-am) = 3db16b0d139c9ae113378aeb94a4cdf9828148ce
 SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
 SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843
 SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81
diff --git a/lang/python24/patches/patch-am b/lang/python24/patches/patch-am
index ca5559e75c2..e2e4671bea4 100644
--- a/lang/python24/patches/patch-am
+++ b/lang/python24/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.6 2009/09/19 09:30:41 obache Exp $
+$NetBSD: patch-am,v 1.7 2011/10/18 21:59:17 sbd Exp $
 
 --- setup.py.orig	2006-10-08 17:41:25.000000000 +0000
 +++ setup.py
@@ -261,25 +261,37 @@ $NetBSD: patch-am,v 1.6 2009/09/19 09:30:41 obache Exp $
  
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -689,11 +574,13 @@
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+@@ -686,16 +571,21 @@
+                     ndbm_libs = ['ndbm']
+                 else:
+                     ndbm_libs = []
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
++                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')
 -                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-+            elif find_file("ndbm.h", db_incs, []) is not None:
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
 -                                       define_macros=[('HAVE_GDBM_NDBM_H',None)],
 -                                       libraries = ['gdbm'] ) )
+-            elif db_incs is not None:
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
++
++            if not module_enabled(exts, 'dbm'):
++                if find_file("ndbm.h", db_incs, []) is not None:
++                    exts.append( Extension('dbm', ['dbmmodule.c'],
 +                                       library_dirs=dblib_dir,
 +                                       runtime_library_dirs=dblib_dir,
 +                                       include_dirs=db_incs,
 +                                       define_macros=[('HAVE_NDBM_H',None)],
 +                                       libraries=dblibs))
-             elif db_incs is not None:
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
++                elif db_incs is not None:
++                    exts.append( Extension('dbm', ['dbmmodule.c'],
                                         library_dirs=dblib_dir,
-@@ -1224,8 +1111,8 @@
+                                        runtime_library_dirs=dblib_dir,
+                                        include_dirs=db_incs,
+@@ -1224,8 +1114,8 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index f24409e4a6b..e06009c62db 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2011/09/14 17:06:32 hans Exp $
+$NetBSD: distinfo,v 1.18 2011/10/18 21:59:18 sbd Exp $
 
 SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699
 RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f
-SHA1 (patch-am) = d2e59cbc21542c436f1b1957e6089b4cda21ef8b
+SHA1 (patch-am) = ba4a651cc5ab930c9b2abd030d6376110b5d90fa
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
 SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf
diff --git a/lang/python25/patches/patch-am b/lang/python25/patches/patch-am
index 77e72ea2b49..323b3ade935 100644
--- a/lang/python25/patches/patch-am
+++ b/lang/python25/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $
+$NetBSD: patch-am,v 1.8 2011/10/18 21:59:18 sbd Exp $
 
 --- setup.py.orig	2008-10-16 18:58:19.000000000 +0000
 +++ setup.py
@@ -350,8 +350,14 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $
  
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -884,11 +670,6 @@ class PyBuildExt(build_ext):
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+@@ -881,15 +667,13 @@ class PyBuildExt(build_ext):
+                     ndbm_libs = ['ndbm']
+                 else:
+                     ndbm_libs = []
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
++
++                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')
@@ -359,10 +365,13 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $
 -                exts.append( Extension('dbm', ['dbmmodule.c'],
 -                                       define_macros=[('HAVE_GDBM_NDBM_H',None)],
 -                                       libraries = ['gdbm'] ) )
-             elif db_incs is not None:
+-            elif db_incs is not None:
++
++            if not module_enabled(exts, 'dbm'):
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         library_dirs=dblib_dir,
-@@ -899,9 +680,9 @@ class PyBuildExt(build_ext):
+                                        runtime_library_dirs=dblib_dir,
+@@ -899,9 +683,9 @@ class PyBuildExt(build_ext):
                                         libraries=dblibs))
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
@@ -375,7 +384,7 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $
  
          # Unix-only modules
          if platform not in ['mac', 'win32']:
-@@ -1536,8 +1317,8 @@ def main():
+@@ -1536,8 +1320,8 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
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,
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 63789d81c7e..2aa816cb998 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/09/30 08:37:24 yyamano Exp $
+$NetBSD: distinfo,v 1.10 2011/10/18 21:59:18 sbd Exp $
 
 SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
@@ -12,7 +12,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
 SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
-SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66
+SHA1 (patch-am) = 593f14d9f4ad9f46c57cc43a2a6402ffb9312437
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
 SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index 5163f520b34..0b341b9060b 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2011/06/13 11:31:13 obache Exp $
+$NetBSD: patch-am,v 1.4 2011/10/18 21:59:18 sbd Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -270,10 +270,30 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
-@@ -1193,18 +1012,14 @@ class PyBuildExt(build_ext):
+@@ -1160,13 +979,15 @@ class PyBuildExt(build_ext):
+                             ndbm_libs = ['ndbm']
+                         else:
+                             ndbm_libs = []
+-                        print "building dbm using ndbm"
+-                        dbmext = Extension('dbm', ['dbmmodule.c'],
++                        if not self.compiler.find_library_file(lib_dirs,
++                                                                    'gdbm'):
++                            print "building dbm using ndbm"
++                            dbmext = Extension('dbm', ['dbmmodule.c'],
+                                            define_macros=[
+                                                ('HAVE_NDBM_H',None),
+                                                ],
+                                            libraries=ndbm_libs)
+-                        break
++                            break
+ 
+                 elif cand == "gdbm":
+                     if self.compiler.find_library_file(lib_dirs, 'gdbm'):
+@@ -1192,19 +1013,16 @@ class PyBuildExt(build_ext):
+                                     ],
                                  libraries = gdbm_libs)
                              break
-                 elif cand == "bdb":
+-                elif cand == "bdb":
 -                    if db_incs is not None:
 -                        print "building dbm using bdb"
 -                        dbmext = Extension('dbm', ['dbmmodule.c'],
@@ -286,6 +306,8 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -                                               ],
 -                                           libraries=dblibs)
 -                        break
++
++                if cand == "bdb" and dbmext is None:
 +		    print "building dbm using bdb"
 +		    dbmext = Extension('dbm', ['dbmmodule.c'],
 +				       define_macros=[
@@ -297,7 +319,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
              if dbmext is not None:
                  exts.append(dbmext)
              else:
-@@ -2066,9 +1881,9 @@ def main():
+@@ -2066,9 +1884,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 851ab27d17e..59deba0ea67 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/09/10 11:23:12 obache Exp $
+$NetBSD: distinfo,v 1.4 2011/10/18 21:59:18 sbd Exp $
 
 SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c
 RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = ae156c486007cfd14d378dd211108d3af4b841b1
 SHA1 (patch-ab) = 7d4d6aa9239f53f1ce9ecd377890d71557c58ca4
 SHA1 (patch-ah) = f93c0aab7b0d5e8e9f80433dda5ed5a22861f6b9
 SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a
-SHA1 (patch-am) = 47d6b7993c1c8e3e203490eb14bf66888f3e39d6
+SHA1 (patch-am) = c7861e5c3bee63efa360218a2ff4685a23b45a3e
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b
 SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20
diff --git a/lang/python31/patches/patch-am b/lang/python31/patches/patch-am
index 75ea6a20ce2..2e291d574ee 100644
--- a/lang/python31/patches/patch-am
+++ b/lang/python31/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2011/09/10 11:23:12 obache Exp $
+$NetBSD: patch-am,v 1.3 2011/10/18 21:59:18 sbd Exp $
 
 --- setup.py.orig	2011-06-11 15:48:52.000000000 +0000
 +++ setup.py
@@ -41,7 +41,36 @@ $NetBSD: patch-am,v 1.2 2011/09/10 11:23:12 obache Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -1315,6 +1319,14 @@ class PyBuildExt(build_ext):
+@@ -1054,13 +1058,15 @@ class PyBuildExt(build_ext):
+                             ndbm_libs = ['ndbm']
+                         else:
+                             ndbm_libs = []
+-                        print("building dbm using ndbm")
+-                        dbmext = Extension('_dbm', ['_dbmmodule.c'],
++                        if not self.compiler.find_library_file(lib_dirs,
++                                                                    'gdbm'):
++                            print("building dbm using ndbm")
++                            dbmext = Extension('_dbm', ['_dbmmodule.c'],
+                                            define_macros=[
+                                                ('HAVE_NDBM_H',None),
+                                                ],
+                                            libraries=ndbm_libs)
+-                        break
++                            break
+ 
+                 elif cand == "gdbm":
+                     if self.compiler.find_library_file(lib_dirs, 'gdbm'):
+@@ -1085,7 +1091,8 @@ class PyBuildExt(build_ext):
+                                     ],
+                                 libraries = gdbm_libs)
+                             break
+-                elif cand == "bdb":
++
++                if cand == "bdb" and dbmext is None:
+                     if db_incs is not None:
+                         print("building dbm using bdb")
+                         dbmext = Extension('_dbm', ['_dbmmodule.c'],
+@@ -1315,6 +1322,14 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
@@ -56,7 +85,7 @@ $NetBSD: patch-am,v 1.2 2011/09/10 11:23:12 obache Exp $
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -1831,8 +1843,8 @@ def main():
+@@ -1831,8 +1846,8 @@ def main():
            # called unless there's at least one extension module defined.
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 52e60055d7b..48a1f7e9f5e 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2011/09/17 11:32:02 obache Exp $
+# $NetBSD: Makefile,v 1.58 2011/10/18 21:59:18 sbd Exp $
 
 SVR4_PKGNAME=	csasl
 COMMENT=	Simple Authentication and Security Layer
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-.if exists(/usr/include/ndbm.h)
+.if exists(/usr/include/ndbm.h) && ${OPSYS} != "Linux"
 SASL_DBTYPE?=		ndbm
 .else
 SASL_DBTYPE?=		berkeley