 @@ -1,292 +1,304 @@
-$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
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "gdbm", "pyexpat", "readline"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 @@ -239,9 +239,15 @@
          return sys.platform
      def detect_modules(self):
 -        # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        # Add the buildlink directories for pkgsrc
 +        if os.environ.has_key('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
          # Add paths to popular package managers on OS X/darwin
          if sys.platform == "darwin":
 @@ -485,9 +491,7 @@
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
 -                             ['/usr/local/ssl/include',
 -                              '/usr/contrib/ssl/include/'
 -                             ]
 +                             []
+                              )
          if ssl_incs is not None:
              krb5_h = find_file('krb5.h', inc_dirs,
 @@ -495,9 +499,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
 @@ -515,168 +517,51 @@
          # similar functionality (but slower of course) implemented in Python.
          # Sleepycat Berkeley DB interface.  http://www.sleepycat.com
 -        #
 -        # This requires the Sleepycat DB code. The earliest supported version
 -        # of that library is 3.2, the latest supported version is 4.4.  A list
 -        # of available releases can be found at
 -        #
 -        # http://www.sleepycat.com/update/index.html
+-
 -        max_db_ver = (4, 4)
 -        min_db_ver = (3, 2)
 -        db_setup_debug = False   # verbose debug prints from this script?
+-
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/sw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            '/sw/include/db3',
 -        ]
 -        # 4.x minor number specific paths
 -        for x in (0,1,2,3,4):
 -            db_inc_paths.append('/usr/include/db4%d' % x)
 -            db_inc_paths.append('/usr/include/db4.%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db4%d' % x)
 -            db_inc_paths.append('/pkg/db-4.%d/include' % x)
 -            db_inc_paths.append('/opt/db-4.%d/include' % x)
 -        # 3.x minor number specific paths
 -        for x in (2,3):
 -            db_inc_paths.append('/usr/include/db3%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db3%d' % x)
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
 -        # the user has added that prefix into inc_dirs.
 -        std_variants = []
 -        for dn in inc_dirs:
 -            std_variants.append(os.path.join(dn, 'db3'))
 -            std_variants.append(os.path.join(dn, 'db4'))
 -            for x in (0,1,2,3,4):
 -                std_variants.append(os.path.join(dn, "db4%d"%x))
 -                std_variants.append(os.path.join(dn, "db4.%d"%x))
 -            for x in (2,3):
 -                std_variants.append(os.path.join(dn, "db3%d"%x))
 -                std_variants.append(os.path.join(dn, "db3.%d"%x))
+-
 -        db_inc_paths = std_variants + db_inc_paths
+-
 -        db_ver_inc_map = {}
+-
 -        class db_found(Exception): pass
 +        class Notfound(Exception): pass
          try:
              # See whether there is a Sleepycat header in the standard
              # search path.
 -            for d in inc_dirs + db_inc_paths:
 -                f = os.path.join(d, "db.h")
 -                if db_setup_debug: print "db: looking for db.h in", f
 -                if os.path.exists(f):
 -                    f = open(f).read()
 -                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
 -                    if m:
 -                        db_major = int(m.group(1))
 -                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
 -                        db_minor = int(m.group(1))
 -                        db_ver = (db_major, db_minor)
+-
 -                        if ( (not db_ver_inc_map.has_key(db_ver)) and
 -                           (db_ver <= max_db_ver and db_ver >= min_db_ver) ):
 -                            # save the include directory with the db.h version
 -                            # (first occurrance only)
 -                            db_ver_inc_map[db_ver] = d
 -                            print "db.h: found", db_ver, "in", d
 -                        else:
 -                            # we already found a header for this library version
 -                            if db_setup_debug: print "db.h: ignoring", d
 -                    else:
 -                        # ignore this header, it didn't contain a version number
 -                        if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
+-
 -            db_found_vers = db_ver_inc_map.keys()
 -            db_found_vers.sort()
+-
 -            while db_found_vers:
 -                db_ver = db_found_vers.pop()
 -                db_incdir = db_ver_inc_map[db_ver]
+-
 -                # check lib directories parallel to the location of the header
 -                db_dirs_to_check = [
 -                    os.path.join(db_incdir, '..', 'lib64'),
 -                    os.path.join(db_incdir, '..', 'lib'),
 -                    os.path.join(db_incdir, '..', '..', 'lib64'),
 -                    os.path.join(db_incdir, '..', '..', 'lib'),
 -                ]
 -                db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+-
 -                # Look for a version specific db-X.Y before an ambiguoius dbX
 -                # XXX should we -ever- look for a dbX name?  Do any
 -                # systems really not name their library by version and
 -                # symlink to more general names?
 -                for dblib in (('db-%d.%d' % db_ver),
 -                              ('db%d%d' % db_ver),
 -                              ('db%d' % db_ver[0])):
 -                    dblib_file = self.compiler.find_library_file(
 -                                    db_dirs_to_check + lib_dirs, dblib )
 -                    if dblib_file:
 -                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
 -                        raise db_found
 -                    else:
 -                        if db_setup_debug: print "db lib: ", dblib, "not found"
+-
 -        except db_found:
 -            print "db lib: using", db_ver, dblib
 -            if db_setup_debug: print "db: lib dir", dblib_dir, "inc dir", db_incdir
 -            db_incs = [db_incdir]
 -            dblibs = [dblib]
 -            # We add the runtime_library_dirs argument because the
 -            # BerkeleyDB lib we're linking against often isn't in the
 -            # system dynamic library search path.  This is usually
 -            # correct and most trouble free, but may cause problems in
 -            # some unusual system configurations (e.g. the directory
 -            # is on an NFS server that goes away).
 -            exts.append(Extension('_bsddb', ['_bsddb.c'],
 -                                  library_dirs=dblib_dir,
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 +            bdb_type = os.environ['PY_BDB_TYPE']
 +            db_incs = [os.environ['PY_BDB_INCDIRS']]
              dblib_dir = None
 +            dblibs = None
+-
 -        # Look for Berkeley db 1.85.   Note that it is built as a different
 -        # module name so it can be included even when later versions are
 -        # available.  A very restrictive search is performed to avoid
 -        # accidentally building this module with a later version of the
 -        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
 -        # symbols into libc and place the include file in /usr/include.
 -        f = "/usr/include/db.h"
 -        if os.path.exists(f):
 -            data = open(f).read()
 -            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 -            if m is not None:
 -                # bingo - old version used hash file format version 2
 -                ### XXX this should be fixed to not be platform-dependent
 -                ### but I don't have direct access to an osf1 platform and
 -                ### seemed to be muffing the search somehow
 -                libraries = platform == "osf1" and ['db'] or None
 -                if libraries is not None:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 -                                          libraries=libraries))
 -                else:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
 +            # check if need to use the db_185.h compat header
 +            bsddb185_define_macros=[]
 +            if bdb_type == "db2" or  bdb_type == "db3" or bdb_type == "db4":
 +                bsddb185_define_macros=[('HAVE_DB_185_H',1)]
 +                dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
 +            else:
 +                # check if db_incs/db.h really is db 1.85
 +                f = "%s/db.h" % db_incs[0]
 +                if os.path.exists(f):
 +                    data = open(f).read()
 +                    m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 +                    if m is None:
 +                        # check for 1.85 compat header
 +                        if os.path.exists("%s/db_185.h" % db_incs[0]):
 +                            bsddb185_define_macros=[('HAVE_DB_185_H',1)]
 +                        else:
 +                            raise NotFound
 +            try:
 +                bltransform = os.environ['PY_BDB_TRANSFORM']
 +                m = re.search(r"l:db:(db.)\s*", bltransform)
 +                if m is not None and m.group(1) is not None:
 +                    dblibs = [m.group(1)]
 +            except:
 +                pass
++
 +            # build the bsddb185 extension module
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 +                                   library_dirs=dblib_dir,
 +                                   runtime_library_dirs=dblib_dir,
 +                                   include_dirs=db_incs,
 +                                   define_macros=bsddb185_define_macros,
 +                                   libraries=dblibs))
 +        except:
 +             db_incs = None
 +             dblibs = []
 +             dblib_dir = None
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -689,11 +574,13 @@
+@@ -686,16 +571,21 @@
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                     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:
++                elif db_incs is not None:
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
++                    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
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.4',
 +                     'Lib/smtpd2.4.py']
+         )
  # --install-platlib

 @@ -1,388 +1,397 @@
-$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
 @@ -15,7 +15,7 @@ from distutils.command.install import in
  from distutils.command.install_lib import install_lib
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 @@ -243,9 +243,15 @@ class PyBuildExt(build_ext):
          return sys.platform
      def detect_modules(self):
 -        # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        # Add the buildlink directories for pkgsrc
 +        if os.environ.has_key('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
 @@ -534,9 +540,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
 @@ -609,269 +613,51 @@ class PyBuildExt(build_ext):
          # a release.  Most open source OSes come with one or more
          # versions of BerkeleyDB already installed.
 -        max_db_ver = (4, 5)
 -        # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
 -        # we leave that version disabled by default as it has proven to be
 -        # quite a buggy library release on many platforms.
 -        min_db_ver = (3, 3)
 -        db_setup_debug = False   # verbose debug prints from this script?
+-
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/sw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            '/sw/include/db3',
 -        ]
 -        # 4.x minor number specific paths
 -        for x in range(max_db_ver[1]+1):
 -            db_inc_paths.append('/usr/include/db4%d' % x)
 -            db_inc_paths.append('/usr/include/db4.%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db4%d' % x)
 -            db_inc_paths.append('/pkg/db-4.%d/include' % x)
 -            db_inc_paths.append('/opt/db-4.%d/include' % x)
 -        # 3.x minor number specific paths
 -        for x in (3,):
 -            db_inc_paths.append('/usr/include/db3%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db3%d' % x)
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
 -        # the user has added that prefix into inc_dirs.
 -        std_variants = []
 -        for dn in inc_dirs:
 -            std_variants.append(os.path.join(dn, 'db3'))
 -            std_variants.append(os.path.join(dn, 'db4'))
 -            for x in range(max_db_ver[1]+1):
 -                std_variants.append(os.path.join(dn, "db4%d"%x))
 -                std_variants.append(os.path.join(dn, "db4.%d"%x))
 -            for x in (2,3):
 -                std_variants.append(os.path.join(dn, "db3%d"%x))
 -                std_variants.append(os.path.join(dn, "db3.%d"%x))
+-
 -        db_inc_paths = std_variants + db_inc_paths
+-
+-
 -        db_ver_inc_map = {}
+-
 -        class db_found(Exception): pass
 +        class Notfound(Exception): pass
          try:
              # See whether there is a Sleepycat header in the standard
              # search path.
 -            for d in inc_dirs + db_inc_paths:
 -                f = os.path.join(d, "db.h")
 -                if db_setup_debug: print "db: looking for db.h in", f
 -                if os.path.exists(f):
 -                    f = open(f).read()
 -                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
 -                    if m:
 -                        db_major = int(m.group(1))
 -                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
 -                        db_minor = int(m.group(1))
 -                        db_ver = (db_major, db_minor)
+-
 -                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
 -                        if db_ver == (4, 6):
 -                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
 -                            db_patch = int(m.group(1))
 -                            if db_patch < 21:
 -                                print "db.h:", db_ver, "patch", db_patch,
 -                                print "being ignored (4.6.x must be >= 4.6.21)"
 -                                continue
+-
 -                        if ( (not db_ver_inc_map.has_key(db_ver)) and
 -                           (db_ver <= max_db_ver and db_ver >= min_db_ver) ):
 -                            # save the include directory with the db.h version
 -                            # (first occurrance only)
 -                            db_ver_inc_map[db_ver] = d
 -                            print "db.h: found", db_ver, "in", d
 -                        else:
 -                            # we already found a header for this library version
 -                            if db_setup_debug: print "db.h: ignoring", d
 -                    else:
 -                        # ignore this header, it didn't contain a version number
 -                        if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
+-
 -            db_found_vers = db_ver_inc_map.keys()
 -            db_found_vers.sort()
+-
 -            while db_found_vers:
 -                db_ver = db_found_vers.pop()
 -                db_incdir = db_ver_inc_map[db_ver]
+-
 -                # check lib directories parallel to the location of the header
 -                db_dirs_to_check = [
 -                    os.path.join(db_incdir, '..', 'lib64'),
 -                    os.path.join(db_incdir, '..', 'lib'),
 -                    os.path.join(db_incdir, '..', '..', 'lib64'),
 -                    os.path.join(db_incdir, '..', '..', 'lib'),
 -                ]
 -                db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+-
 -                # Look for a version specific db-X.Y before an ambiguoius dbX
 -                # XXX should we -ever- look for a dbX name?  Do any
 -                # systems really not name their library by version and
 -                # symlink to more general names?
 -                for dblib in (('db-%d.%d' % db_ver),
 -                              ('db%d%d' % db_ver),
 -                              ('db%d' % db_ver[0])):
 -                    dblib_file = self.compiler.find_library_file(
 -                                    db_dirs_to_check + lib_dirs, dblib )
 -                    if dblib_file:
 -                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
 -                        raise db_found
 -                    else:
 -                        if db_setup_debug: print "db lib: ", dblib, "not found"
+-
 -        except db_found:
 -            print "db lib: using", db_ver, dblib
 -            if db_setup_debug: print "db: lib dir", dblib_dir, "inc dir", db_incdir
 -            db_incs = [db_incdir]
 -            dblibs = [dblib]
 -            # We add the runtime_library_dirs argument because the
 -            # BerkeleyDB lib we're linking against often isn't in the
 -            # system dynamic library search path.  This is usually
 -            # correct and most trouble free, but may cause problems in
 -            # some unusual system configurations (e.g. the directory
 -            # is on an NFS server that goes away).
 -            exts.append(Extension('_bsddb', ['_bsddb.c'],
 -                                  library_dirs=dblib_dir,
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 +            bdb_type = os.environ['PY_BDB_TYPE']
 +            db_incs = [os.environ['PY_BDB_INCDIRS']]
              dblib_dir = None
 +            dblibs = None
 -        # The sqlite interface
 -        sqlite_setup_debug = False # verbose debug prints from this script?
+-
 -        # We hunt for #define SQLITE_VERSION "n.n.n"
 -        # We need to find >= sqlite version 3.0.8
 -        sqlite_incdir = sqlite_libdir = None
 -        sqlite_inc_paths = [ '/usr/include',
 -                             '/usr/include/sqlite',
 -                             '/usr/include/sqlite3',
 -                             '/usr/local/include',
 -                             '/usr/local/include/sqlite',
 -                             '/usr/local/include/sqlite3',
 -                           ]
 -        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
 -        MIN_SQLITE_VERSION = ".".join([str(x)
 -                                    for x in MIN_SQLITE_VERSION_NUMBER])
+-
 -        # Scan the default include directories before the SQLite specific
 -        # ones. This allows one to override the copy of sqlite on OSX,
 -        # where /usr/include contains an old version of sqlite.
 -        for d in inc_dirs + sqlite_inc_paths:
 -            f = os.path.join(d, "sqlite3.h")
 -            if os.path.exists(f):
 -                if sqlite_setup_debug: print "sqlite: found %s"%f
 -                incf = open(f).read()
 -                m = re.search(
 -                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
 -                if m:
 -                    sqlite_version = m.group(1)
 -                    sqlite_version_tuple = tuple([int(x)
 -                                        for x in sqlite_version.split(".")])
 -                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
 -                        # we win!
 -                        print "%s/sqlite3.h: version %s"%(d, sqlite_version)
 -                        sqlite_incdir = d
 -                        break
 -                    else:
 -                        if sqlite_setup_debug:
 -                            print "%s: version %r is too old, need >= %r"%(d,
 -                                        sqlite_version, MIN_SQLITE_VERSION)
 -                elif sqlite_setup_debug:
 -                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
+-
 -        if sqlite_incdir:
 -            sqlite_dirs_to_check = [
 -                os.path.join(sqlite_incdir, '..', 'lib64'),
 -                os.path.join(sqlite_incdir, '..', 'lib'),
 -                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
 -                os.path.join(sqlite_incdir, '..', '..', 'lib'),
 -            ]
 -            sqlite_libfile = self.compiler.find_library_file(
 -                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
 -            sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
+-
 -        if sqlite_incdir and sqlite_libdir:
 -            sqlite_srcs = ['_sqlite/cache.c',
 -                '_sqlite/connection.c',
 -                '_sqlite/cursor.c',
 -                '_sqlite/microprotocols.c',
 -                '_sqlite/module.c',
 -                '_sqlite/prepare_protocol.c',
 -                '_sqlite/row.c',
 -                '_sqlite/statement.c',
 -                '_sqlite/util.c', ]
+-
 -            sqlite_defines = []
 -            if sys.platform != "win32":
 -                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
 +            # check if need to use the db_185.h compat header
 +            bsddb185_define_macros=[]
 +            if bdb_type == "db2" or  bdb_type == "db3" or bdb_type == "db4":
 +                bsddb185_define_macros=[('HAVE_DB_185_H',1)]
 +                dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
              else:
 -                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
+-
+-
 -            if sys.platform == 'darwin':
 -                # In every directory on the search path search for a dynamic
 -                # library and then a static library, instead of first looking
 -                # for dynamic libraries on the entiry path.
 -                # This way a staticly linked custom sqlite gets picked up
 -                # before the dynamic library in /usr/lib.
 -                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
 -            else:
 -                sqlite_extra_link_args = ()
+-
 -            exts.append(Extension('_sqlite3', sqlite_srcs,
 -                                  define_macros=sqlite_defines,
 -                                  include_dirs=["Modules/_sqlite",
 -                                                sqlite_incdir],
 -                                  library_dirs=sqlite_libdir,
 -                                  runtime_library_dirs=sqlite_libdir,
 -                                  extra_link_args=sqlite_extra_link_args,
 -                                  libraries=["sqlite3",]))
+-
 -        # Look for Berkeley db 1.85.   Note that it is built as a different
 -        # module name so it can be included even when later versions are
 -        # available.  A very restrictive search is performed to avoid
 -        # accidentally building this module with a later version of the
 -        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
 -        # symbols into libc and place the include file in /usr/include.
 -        #
 -        # If the better bsddb library can be built (db_incs is defined)
 -        # we do not build this one.  Otherwise this build will pick up
 -        # the more recent berkeleydb's db.h file first in the include path
 -        # when attempting to compile and it will fail.
 -        f = "/usr/include/db.h"
 -        if os.path.exists(f) and not db_incs:
 -            data = open(f).read()
 -            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 -            if m is not None:
 -                # bingo - old version used hash file format version 2
 -                ### XXX this should be fixed to not be platform-dependent
 -                ### but I don't have direct access to an osf1 platform and
 -                ### seemed to be muffing the search somehow
 -                libraries = platform == "osf1" and ['db'] or None
 -                if libraries is not None:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 -                                          libraries=libraries))
 -                else:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
 +                # check if db_incs/db.h really is db 1.85
 +                f = "%s/db.h" % db_incs[0]
 +                if os.path.exists(f):
 +                    data = open(f).read()
 +                    m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 +                    if m is None:
 +                        # check for 1.85 compat header
 +                        if os.path.exists("%s/db_185.h" % db_incs[0]):
 +                            bsddb185_define_macros=[('HAVE_DB_185_H',1)]
 +                        else:
 +                            raise NotFound
 +            try:
 +                bltransform = os.environ['PY_BDB_TRANSFORM']
 +                m = re.search(r"l:db:(db.)\s*", bltransform)
 +                if m is not None and m.group(1) is not None:
 +                    dblibs = [m.group(1)]
 +            except:
 +                pass
++
 +            # build the bsddb185 extension module
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 +                                   library_dirs=dblib_dir,
 +                                   runtime_library_dirs=dblib_dir,
 +                                   include_dirs=db_incs,
 +                                   define_macros=bsddb185_define_macros,
 +                                   libraries=dblibs))
 +        except:
 +             db_incs = None
 +             dblibs = []
 +             dblib_dir = None
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -884,11 +670,6 @@ class PyBuildExt(build_ext):
+@@ -881,15 +667,13 @@ class PyBuildExt(build_ext):
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                     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):
 -                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:
 -        if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
 -            exts.append( Extension('gdbm', ['gdbmmodule.c'],
 -                                   libraries = ['gdbm'] ) )
 +        #if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
 +        #    exts.append( Extension('gdbm', ['gdbmmodule.c'],
 +        #                           libraries = ['gdbm'] ) )
          # 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
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.5',
 +                     'Lib/smtpd2.5.py']
+         )
  # --install-platlib

 @@ -1,354 +1,361 @@
-$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
 curses
 curses_panel
 elementtree
 sqlite3
 tkinter
 gdbm
 pyexpat
 readline
 {linux,oss,sun}audiodev
 spwd
 Those have separate packages where needed.
 Only check the BUILDLINK_DIR for libraries etc, do not pick up random
 headers and libraries from the system.
 Build the 1.85 compat module all the time against the BDB version of choice.
 Add in Debian multiarch support (retrofitted from Python 2.7.2) to
 support building the "nis" and "crypt" modules.
 --- setup.py	2010-07-18 00:31:09.000000000 +1200
 +++ setup.py	2011-09-23 01:51:17.757519638 +1200
 @@ -18,7 +18,7 @@
  from distutils.spawn import find_executable
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 @@ -354,10 +354,40 @@
                  return platform
          return sys.platform
 +    def add_multiarch_paths(self):
 +        # Debian/Ubuntu multiarch support.
 +        # https://wiki.ubuntu.com/MultiarchSpec
 +        if not find_executable('dpkg-architecture'):
 +            return
 +        tmpfile = os.path.join(self.build_temp, 'multiarch')
 +        if not os.path.exists(self.build_temp):
 +            os.makedirs(self.build_temp)
 +        ret = os.system(
 +            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
 +            tmpfile)
 +        try:
 +            if ret >> 8 == 0:
 +                with open(tmpfile) as fp:
 +                    multiarch_path_component = fp.readline().strip()
 +                add_dir_to_list(self.compiler.library_dirs,
 +                                '/usr/lib/' + multiarch_path_component)
 +                add_dir_to_list(self.compiler.include_dirs,
 +                                '/usr/include/' + multiarch_path_component)
 +        finally:
 +            os.unlink(tmpfile)
++
      def detect_modules(self):
 -        # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        # Add the buildlink directories for pkgsrc
 +        if os.environ.has_key('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
++
 +        self.add_multiarch_paths()
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
 @@ -703,9 +733,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
 @@ -815,172 +843,6 @@
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            # Fink defaults (http://fink.sourceforge.net/)
 -            '/sw/include/db4',
 -            '/sw/include/db3',
 -        ]
 -        # 4.x minor number specific paths
 -        for x in gen_db_minor_ver_nums(4):
 -            db_inc_paths.append('/usr/include/db4%d' % x)
 -            db_inc_paths.append('/usr/include/db4.%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db4%d' % x)
 -            db_inc_paths.append('/pkg/db-4.%d/include' % x)
 -            db_inc_paths.append('/opt/db-4.%d/include' % x)
 -            # MacPorts default (http://www.macports.org/)
 -            db_inc_paths.append('/opt/local/include/db4%d' % x)
 -        # 3.x minor number specific paths
 -        for x in gen_db_minor_ver_nums(3):
 -            db_inc_paths.append('/usr/include/db3%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db3%d' % x)
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
 -        # the user has added that prefix into inc_dirs.
 -        std_variants = []
 -        for dn in inc_dirs:
 -            std_variants.append(os.path.join(dn, 'db3'))
 -            std_variants.append(os.path.join(dn, 'db4'))
 -            for x in gen_db_minor_ver_nums(4):
 -                std_variants.append(os.path.join(dn, "db4%d"%x))
 -                std_variants.append(os.path.join(dn, "db4.%d"%x))
 -            for x in gen_db_minor_ver_nums(3):
 -                std_variants.append(os.path.join(dn, "db3%d"%x))
 -                std_variants.append(os.path.join(dn, "db3.%d"%x))
+-
 -        db_inc_paths = std_variants + db_inc_paths
 -        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
+-
 -        db_ver_inc_map = {}
+-
 -        if sys.platform == 'darwin':
 -            sysroot = macosx_sdk_root()
+-
 -        class db_found(Exception): pass
 -        try:
 -            # See whether there is a Sleepycat header in the standard
 -            # search path.
 -            for d in inc_dirs + db_inc_paths:
 -                f = os.path.join(d, "db.h")
+-
 -                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
 -                    f = os.path.join(sysroot, d[1:], "db.h")
+-
 -                if db_setup_debug: print "db: looking for db.h in", f
 -                if os.path.exists(f):
 -                    f = open(f).read()
 -                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
 -                    if m:
 -                        db_major = int(m.group(1))
 -                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
 -                        db_minor = int(m.group(1))
 -                        db_ver = (db_major, db_minor)
+-
 -                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
 -                        if db_ver == (4, 6):
 -                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
 -                            db_patch = int(m.group(1))
 -                            if db_patch < 21:
 -                                print "db.h:", db_ver, "patch", db_patch,
 -                                print "being ignored (4.6.x must be >= 4.6.21)"
 -                                continue
+-
 -                        if ( (db_ver not in db_ver_inc_map) and
 -                            allow_db_ver(db_ver) ):
 -                            # save the include directory with the db.h version
 -                            # (first occurrence only)
 -                            db_ver_inc_map[db_ver] = d
 -                            if db_setup_debug:
 -                                print "db.h: found", db_ver, "in", d
 -                        else:
 -                            # we already found a header for this library version
 -                            if db_setup_debug: print "db.h: ignoring", d
 -                    else:
 -                        # ignore this header, it didn't contain a version number
 -                        if db_setup_debug:
 -                            print "db.h: no version number version in", d
+-
 -            db_found_vers = db_ver_inc_map.keys()
 -            db_found_vers.sort()
+-
 -            while db_found_vers:
 -                db_ver = db_found_vers.pop()
 -                db_incdir = db_ver_inc_map[db_ver]
+-
 -                # check lib directories parallel to the location of the header
 -                db_dirs_to_check = [
 -                    db_incdir.replace("include", 'lib64'),
 -                    db_incdir.replace("include", 'lib'),
 -                ]
+-
 -                if sys.platform != 'darwin':
 -                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+-
 -                else:
 -                    # Same as other branch, but takes OSX SDK into account
 -                    tmp = []
 -                    for dn in db_dirs_to_check:
 -                        if is_macosx_sdk_path(dn):
 -                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
 -                                tmp.append(dn)
 -                        else:
 -                            if os.path.isdir(dn):
 -                                tmp.append(dn)
 -                    db_dirs_to_check = tmp
+-
 -                # Look for a version specific db-X.Y before an ambiguoius dbX
 -                # XXX should we -ever- look for a dbX name?  Do any
 -                # systems really not name their library by version and
 -                # symlink to more general names?
 -                for dblib in (('db-%d.%d' % db_ver),
 -                              ('db%d%d' % db_ver),
 -                              ('db%d' % db_ver[0])):
 -                    dblib_file = self.compiler.find_library_file(
 -                                    db_dirs_to_check + lib_dirs, dblib )
 -                    if dblib_file:
 -                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
 -                        raise db_found
 -                    else:
 -                        if db_setup_debug: print "db lib: ", dblib, "not found"
+-
 -        except db_found:
 -            if db_setup_debug:
 -                print "bsddb using BerkeleyDB lib:", db_ver, dblib
 -                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
 -            db_incs = [db_incdir]
 -            dblibs = [dblib]
 -            # We add the runtime_library_dirs argument because the
 -            # BerkeleyDB lib we're linking against often isn't in the
 -            # system dynamic library search path.  This is usually
 -            # correct and most trouble free, but may cause problems in
 -            # some unusual system configurations (e.g. the directory
 -            # is on an NFS server that goes away).
 -            exts.append(Extension('_bsddb', ['_bsddb.c'],
 -                                  depends = ['bsddb.h'],
 -                                  library_dirs=dblib_dir,
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 -            dblib_dir = None
 -            missing.append('_bsddb')
+-
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
 @@ -1094,31 +956,12 @@
          # we do not build this one.  Otherwise this build will pick up
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
 -        f = "/usr/include/db.h"
+-
 -        if sys.platform == 'darwin':
 -            if is_macosx_sdk_path(f):
 -                sysroot = macosx_sdk_root()
 -                f = os.path.join(sysroot, f[1:])
+-
 -        if os.path.exists(f) and not db_incs:
 -            data = open(f).read()
 -            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 -            if m is not None:
 -                # bingo - old version used hash file format version 2
 -                ### XXX this should be fixed to not be platform-dependent
 -                ### but I don't have direct access to an osf1 platform and
 -                ### seemed to be muffing the search somehow
 -                libraries = platform == "osf1" and ['db'] or None
 -                if libraries is not None:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 -                                          libraries=libraries))
 -                else:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
 -            else:
 -                missing.append('bsddb185')
 +        libraries = os.getenv("PY_BDB_TYPE", "")
 +        if libraries:
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 +                                  libraries=["db"]))
          else:
 -            missing.append('bsddb185')
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c']))
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
-@@ -1131,7 +974,7 @@
+@@ -1128,10 +971,12 @@
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                     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'):
 +            elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'):
                  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,
 -                                       include_dirs=db_incs,
                                         define_macros=[('HAVE_BERKDB_H',None),
                                                        ('DB_DBM_HSEARCH',None)],
 -                                       libraries=dblibs))
 +                                       libraries=["db"]))
              else:
                  missing.append('dbm')
 @@ -1408,6 +1248,14 @@
+                 )
              libraries = []
 +	elif platform.startswith('dragonfly'):
 +	    macros = dict(
 +		HAVE_SEM_OPEN=0,
 +		HAVE_SEM_TIMEDWAIT=0,
 +		HAVE_FD_TRANSFER=1,
 +		)
 +	    libraries = []
++
          else:                                   # Linux and other unices
              macros = dict(
                  HAVE_SEM_OPEN=1,
 @@ -2026,9 +1874,9 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.6',
 +                     'Tools/scripts/2to3-2.6',
 +                     'Lib/smtpd2.6.py']
+         )
  # --install-platlib

 @@ -1,312 +1,334 @@
-$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
 curses
 curses_panel
 elementtree
 sqlite3
 tkinter
 gdbm
 pyexpat
 readline
 {linux,oss,sun}audiodev
 spwd
 Those have separate packages where needed.
 Only check the BUILDLINK_DIR for libraries etc, do not pick up random
 headers and libraries from the system.
 Build the 1.85 compat module all the time against the BDB version of choice.
 --- setup.py.orig	2011-06-11 15:46:28.000000000 +0000
 +++ setup.py
 @@ -21,7 +21,7 @@ from distutils.spawn import find_executa
  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline", "linuxaudiodev", "ossaudiodev", "spwd", "sunaudiodev"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 @@ -368,9 +368,15 @@ class PyBuildExt(build_ext):
              os.unlink(tmpfile)
      def detect_modules(self):
 -        # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        # Add the buildlink directories for pkgsrc
 +        if os.environ.has_key('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
          self.add_multiarch_paths()
          # Add paths specified in the environment variables LDFLAGS and
 @@ -715,9 +721,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          if (ssl_incs is not None and
              ssl_libs is not None):
 @@ -832,172 +836,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
 -        # construct a list of paths to look for the header file in on
 -        # top of the normal inc_dirs.
 -        db_inc_paths = [
 -            '/usr/include/db4',
 -            '/usr/local/include/db4',
 -            '/opt/sfw/include/db4',
 -            '/usr/include/db3',
 -            '/usr/local/include/db3',
 -            '/opt/sfw/include/db3',
 -            # Fink defaults (http://fink.sourceforge.net/)
 -            '/sw/include/db4',
 -            '/sw/include/db3',
 -        ]
 -        # 4.x minor number specific paths
 -        for x in gen_db_minor_ver_nums(4):
 -            db_inc_paths.append('/usr/include/db4%d' % x)
 -            db_inc_paths.append('/usr/include/db4.%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db4%d' % x)
 -            db_inc_paths.append('/pkg/db-4.%d/include' % x)
 -            db_inc_paths.append('/opt/db-4.%d/include' % x)
 -            # MacPorts default (http://www.macports.org/)
 -            db_inc_paths.append('/opt/local/include/db4%d' % x)
 -        # 3.x minor number specific paths
 -        for x in gen_db_minor_ver_nums(3):
 -            db_inc_paths.append('/usr/include/db3%d' % x)
 -            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
 -            db_inc_paths.append('/usr/local/include/db3%d' % x)
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
 -        # the user has added that prefix into inc_dirs.
 -        std_variants = []
 -        for dn in inc_dirs:
 -            std_variants.append(os.path.join(dn, 'db3'))
 -            std_variants.append(os.path.join(dn, 'db4'))
 -            for x in gen_db_minor_ver_nums(4):
 -                std_variants.append(os.path.join(dn, "db4%d"%x))
 -                std_variants.append(os.path.join(dn, "db4.%d"%x))
 -            for x in gen_db_minor_ver_nums(3):
 -                std_variants.append(os.path.join(dn, "db3%d"%x))
 -                std_variants.append(os.path.join(dn, "db3.%d"%x))
+-
 -        db_inc_paths = std_variants + db_inc_paths
 -        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
+-
 -        db_ver_inc_map = {}
+-
 -        if sys.platform == 'darwin':
 -            sysroot = macosx_sdk_root()
+-
 -        class db_found(Exception): pass
 -        try:
 -            # See whether there is a Sleepycat header in the standard
 -            # search path.
 -            for d in inc_dirs + db_inc_paths:
 -                f = os.path.join(d, "db.h")
+-
 -                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
 -                    f = os.path.join(sysroot, d[1:], "db.h")
+-
 -                if db_setup_debug: print "db: looking for db.h in", f
 -                if os.path.exists(f):
 -                    f = open(f).read()
 -                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
 -                    if m:
 -                        db_major = int(m.group(1))
 -                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
 -                        db_minor = int(m.group(1))
 -                        db_ver = (db_major, db_minor)
+-
 -                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
 -                        if db_ver == (4, 6):
 -                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
 -                            db_patch = int(m.group(1))
 -                            if db_patch < 21:
 -                                print "db.h:", db_ver, "patch", db_patch,
 -                                print "being ignored (4.6.x must be >= 4.6.21)"
 -                                continue
+-
 -                        if ( (db_ver not in db_ver_inc_map) and
 -                            allow_db_ver(db_ver) ):
 -                            # save the include directory with the db.h version
 -                            # (first occurrence only)
 -                            db_ver_inc_map[db_ver] = d
 -                            if db_setup_debug:
 -                                print "db.h: found", db_ver, "in", d
 -                        else:
 -                            # we already found a header for this library version
 -                            if db_setup_debug: print "db.h: ignoring", d
 -                    else:
 -                        # ignore this header, it didn't contain a version number
 -                        if db_setup_debug:
 -                            print "db.h: no version number version in", d
+-
 -            db_found_vers = db_ver_inc_map.keys()
 -            db_found_vers.sort()
+-
 -            while db_found_vers:
 -                db_ver = db_found_vers.pop()
 -                db_incdir = db_ver_inc_map[db_ver]
+-
 -                # check lib directories parallel to the location of the header
 -                db_dirs_to_check = [
 -                    db_incdir.replace("include", 'lib64'),
 -                    db_incdir.replace("include", 'lib'),
 -                ]
+-
 -                if sys.platform != 'darwin':
 -                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+-
 -                else:
 -                    # Same as other branch, but takes OSX SDK into account
 -                    tmp = []
 -                    for dn in db_dirs_to_check:
 -                        if is_macosx_sdk_path(dn):
 -                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
 -                                tmp.append(dn)
 -                        else:
 -                            if os.path.isdir(dn):
 -                                tmp.append(dn)
 -                    db_dirs_to_check = tmp
+-
 -                # Look for a version specific db-X.Y before an ambiguous dbX
 -                # XXX should we -ever- look for a dbX name?  Do any
 -                # systems really not name their library by version and
 -                # symlink to more general names?
 -                for dblib in (('db-%d.%d' % db_ver),
 -                              ('db%d%d' % db_ver),
 -                              ('db%d' % db_ver[0])):
 -                    dblib_file = self.compiler.find_library_file(
 -                                    db_dirs_to_check + lib_dirs, dblib )
 -                    if dblib_file:
 -                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
 -                        raise db_found
 -                    else:
 -                        if db_setup_debug: print "db lib: ", dblib, "not found"
+-
 -        except db_found:
 -            if db_setup_debug:
 -                print "bsddb using BerkeleyDB lib:", db_ver, dblib
 -                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
 -            db_incs = [db_incdir]
 -            dblibs = [dblib]
 -            # We add the runtime_library_dirs argument because the
 -            # BerkeleyDB lib we're linking against often isn't in the
 -            # system dynamic library search path.  This is usually
 -            # correct and most trouble free, but may cause problems in
 -            # some unusual system configurations (e.g. the directory
 -            # is on an NFS server that goes away).
 -            exts.append(Extension('_bsddb', ['_bsddb.c'],
 -                                  depends = ['bsddb.h'],
 -                                  library_dirs=dblib_dir,
 -                                  runtime_library_dirs=dblib_dir,
 -                                  include_dirs=db_incs,
 -                                  libraries=dblibs))
 -        else:
 -            if db_setup_debug: print "db: no appropriate library found"
 -            db_incs = None
 -            dblibs = []
 -            dblib_dir = None
 -            missing.append('_bsddb')
+-
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
 @@ -1113,31 +951,12 @@ class PyBuildExt(build_ext):
          # we do not build this one.  Otherwise this build will pick up
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
 -        f = "/usr/include/db.h"
+-
 -        if sys.platform == 'darwin':
 -            if is_macosx_sdk_path(f):
 -                sysroot = macosx_sdk_root()
 -                f = os.path.join(sysroot, f[1:])
+-
 -        if os.path.exists(f) and not db_incs:
 -            data = open(f).read()
 -            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
 -            if m is not None:
 -                # bingo - old version used hash file format version 2
 -                ### XXX this should be fixed to not be platform-dependent
 -                ### but I don't have direct access to an osf1 platform and
 -                ### seemed to be muffing the search somehow
 -                libraries = platform == "osf1" and ['db'] or None
 -                if libraries is not None:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 -                                          libraries=libraries))
 -                else:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
 -            else:
 -                missing.append('bsddb185')
 +        libraries = os.getenv("PY_BDB_TYPE", "")
 +        if libraries:
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 +                                   libraries=['db']))
          else:
 -            missing.append('bsddb185')
 +            exts.append(Extension('bsddb185', ['bsddbmodule.c']))
          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'],
 -                                           library_dirs=dblib_dir,
 -                                           runtime_library_dirs=dblib_dir,
 -                                           include_dirs=db_incs,
 -                                           define_macros=[
 -                                               ('HAVE_BERKDB_H', None),
 -                                               ('DB_DBM_HSEARCH', None),
 -                                               ],
 -                                           libraries=dblibs)
 -                        break
++
 +                if cand == "bdb" and dbmext is None:
 +		    print "building dbm using bdb"
 +		    dbmext = Extension('dbm', ['dbmmodule.c'],
 +				       define_macros=[
 +					   ('HAVE_BERKDB_H', None),
 +					   ('DB_DBM_HSEARCH', None),
 +					   ],
 +				       libraries=["db"])
 +		    break
              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
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 -                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.7',
 +                     'Tools/scripts/2to3-2.7',
 +                     'Lib/smtpd2.7.py']
+         )
  # --install-platlib

 @@ -1,24 +1,24 @@
-$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
 Size (Python-2.4.6.tar.bz2) = 8154677 bytes
 SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
 SHA1 (patch-ab) = 98b94620baf5d9d5e8681529297124c2d07a901b
 SHA1 (patch-ac) = 4a7a83c9a7bb26254d17907fe15f895276910364
 SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1
 SHA1 (patch-ae) = 7e00d719044fa0f205692392d9ebe87146715206
 SHA1 (patch-af) = f468e8c172fc5aaae1bf843898a30c00ec753537
 SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
 SHA1 (patch-ah) = 154b40eec926a6dcc968c635467807766d1cfaa3
 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
 SHA1 (patch-aq) = 3d13cd79d50b70302d1b6ee598759a51f0b98532
 SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f
 SHA1 (patch-at) = 9d66115cc561c99dcc3478678aa286c1c0c3df6b

 @@ -1,25 +1,25 @@
-$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
 Size (Python-2.5.6.tar.bz2) = 9821788 bytes
 SHA1 (patch-SA43463) = df776e171f1794bae52b6e98bc71ae63734b7693
 SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
 SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
 SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f
 SHA1 (patch-ad) = 9b401fc293ffb06ca1dd03526f6c38a8f28201ac
 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
 SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
 SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
 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
 SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
 SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373
 SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218
 SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156

 @@ -1,26 +1,26 @@
-$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
 Size (Python-2.6.7.tar.bz2) = 11084667 bytes
 SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
 SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
 SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
 SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
 SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
 SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
 SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
 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
 SHA1 (patch-au) = 38030fc45afc2a8f53a41f26b649e731642b9148
 SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
 SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
 SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
 SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
 SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858

 @@ -1,22 +1,22 @@
-$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
 Size (Python-2.7.2.tar.bz2) = 11754834 bytes
 SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
 SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
 SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
 SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
 SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
 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
 SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
 SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
 SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
 SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8

 @@ -1,15 +1,15 @@
-$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
 Size (Python-3.1.4.tar.bz2) = 9887870 bytes
 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
 SHA1 (patch-av) = dcbcd47a50b56d1fd8b5e5594b94a155c52d5e39
 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc

 @@ -1,86 +1,86 @@
-# $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
 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
 .endif
 BUILD_DEFS+=		SASL_DBTYPE
 .if ${SASL_DBTYPE} == "berkeley"
 BDB_ACCEPTED=		db3 db4
 .  include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ENV+=		with_bdb=${BDB_TYPE}
 .endif
 CONFIGURE_ARGS+=	--with-dblib=${SASL_DBTYPE:Q}
 CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 BUILD_DEFS+=		VARBASE
 # Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
 # password authentication.
+#
 SASLSOCKETDIR?=		${VARBASE}/run/saslauthd
 CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR:Q}
 BUILD_DEFS+=		SASLSOCKETDIR
 # let not to build & install saslauthd here.
 SUBST_CLASSES+=		saslauthd
 SUBST_STAGE.saslauthd=	pre-configure
 SUBST_FILES.saslauthd=	Makefile.in
 SUBST_SED.saslauthd=	-e 's|@SASLAUTHD_TRUE@|\#|g'
 SUBST_SED.saslauthd+=	-e 's|@SASLAUTHD_FALSE@||g'
 # Support using the Courier authdaemond (security/courier-authlib) for
 # plaintext password authentication.
+#
 AUTHDAEMONVAR?=		${VARBASE}/authdaemon
 CONFIGURE_ARGS+=	--with-authdaemond=${AUTHDAEMONVAR}/socket
 BUILD_DEFS+=		AUTHDAEMONVAR
 # Support using APOP against a POP server for plaintext password
 # authentication.
+#
 CONFIGURE_ARGS+=	--enable-checkapop
 .if exists(/dev/urandom)
 SASL_ENTROPY_SOURCE?=	/dev/urandom
 .endif
 .if defined(SASL_ENTROPY_SOURCE)
 CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE:Q}
 .endif
 BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 # Let not to build sample codes.
 CONFIGURE_ARGS+=	--disable-sample
 # CYRUS_USER		username of the Cyrus administrator
 # CYRUS_GROUP		group of the Cyrus administrator
+#
 CYRUS_USER?=		cyrus
 CYRUS_GROUP?=		mail
 FILES_SUBST+=		CYRUS_USER=${CYRUS_USER:Q}
 FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 PKG_GROUPS_VARS+=	CYRUS_GROUP
 PKG_USERS_VARS+=	CYRUS_USER
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}
 PKG_SHELL.${CYRUS_USER}=${SH}
 MESSAGE_SUBST+=		PLUGINDIR=${PLUGINDIR:Q}
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do		\
 		${INSTALL_DATA} $${file} ${DESTDIR}${DOCDIR};		\
 	done
 .include "../../mk/bsd.pkg.mk"