 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.3 2011/03/28 16:00:07 drochner Exp $
+$NetBSD: distinfo,v 1.4 2011/05/06 16:27:04 abs Exp $
 SHA1 (Python-2.7.1.tar.bz2) = fbe1894322ff91b80726e269c97454f4129fc2a3
 RMD160 (Python-2.7.1.tar.bz2) = 3ce59305f6cd3fb320a53771d0ea01ec0687005f
 Size (Python-2.7.1.tar.bz2) = 11722546 bytes
 SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
 SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
 SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
 SHA1 (patch-al) = 2c6a578b62dfba45b2ba01a6b004f1d8feee0fe2
-SHA1 (patch-am) = c0a72af7c9827a9107fb7d1862febd487b9b5c83
+SHA1 (patch-am) = 760ed52308b31043bbf28528adf2a99f2420d85b
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 2061473e5e672b4cc38d91c5d8f885cb361a35b3
 SHA1 (patch-au) = 700dc128833af755f3ea08c4db79c127453b12e6
 SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
 SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
 SHA1 (patch-ax) = b3a69107d3abbc8476ce79fb05aa8c9f293896a2
 SHA1 (patch-ca) = aa0ad5a9dff1cd7c1c456aa6371733727ac1425b
 SHA1 (patch-cb) = f8fa30bb9aae0ef02c187d1d6db176bac731381e

 @@ -1,35 +1,35 @@
-$NetBSD: patch-am,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-am,v 1.2 2011/05/06 16:27:04 abs 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	2010-06-27 12:36:16.000000000 +0000
+--- setup.py.orig	2010-10-31 16:40:21.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
 @@ -346,9 +346,15 @@ class PyBuildExt(build_ext):
          return sys.platform
 @@ -39,38 +39,38 @@ Build the 1.85 compat module all the tim
 -        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.
-@@ -681,9 +687,7 @@ class PyBuildExt(build_ext):
+@@ -692,9 +698,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):
-@@ -798,172 +802,6 @@ class PyBuildExt(build_ext):
+@@ -809,172 +813,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/)
 @@ -223,27 +223,27 @@ Build the 1.85 compat module all the tim
 -                                  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?
-@@ -1079,31 +917,12 @@ class PyBuildExt(build_ext):
+@@ -1090,31 +928,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)
 @@ -260,42 +260,53 @@ Build the 1.85 compat module all the tim
 -                    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:
-@@ -1162,14 +981,11 @@ class PyBuildExt(build_ext):
+@@ -1170,18 +989,14 @@ class PyBuildExt(build_ext):
-                     if db_incs is not None:
+                                 libraries = gdbm_libs)
-                         print "building dbm using bdb"
+                             break
-                         dbmext = Extension('dbm', ['dbmmodule.c'],
+                 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=[
+-                                           define_macros=[
-                                                ('HAVE_BERKDB_H', None),
+-                                               ('HAVE_BERKDB_H', None),
-                                                ('DB_DBM_HSEARCH', None),
+-                                               ('DB_DBM_HSEARCH', None),
-                                                ],
+-                                               ],
 -                                           libraries=dblibs)
-+                                           libraries=["db"])
+-                        break
-                         break
++		    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)
-@@ -2032,9 +1848,9 @@ def main():
+             else:
@@ -2043,9 +1858,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