 @@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.9 2009/07/24 14:50:33 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2009/09/09 05:37:51 dsainty Exp $
 SHA1 (Python-2.5.4.tar.bz2) = 0f2e819d6381f72f26c734e00a6780b3933ea404
 RMD160 (Python-2.5.4.tar.bz2) = 3a76c83464c3b1c38a60351ab054e33ac7195663
 Size (Python-2.5.4.tar.bz2) = 9821313 bytes
 SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
 SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
 SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f
 SHA1 (patch-ad) = eb4948ee5aaae93f8a193defac7638a37f65caed
 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) = 6247e3f85d555bae7850befbd7bfffbb233cecb3
-SHA1 (patch-am) = 8910340d0a54ac0a053d50199e0dd77162c3b613
+SHA1 (patch-am) = f444bb78a0ca8ea3fa3435e5946c8d9251cb5102
 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,57 +1,57 @@
-$NetBSD: patch-am,v 1.3 2009/07/24 14:50:33 schmonz Exp $
+$NetBSD: patch-am,v 1.4 2009/09/09 05:37:51 dsainty Exp $
 --- setup.py.orig	2008-10-16 14:58:19.000000000 -0400
 +++ setup.py
-@@ -15,7 +15,7 @@ from distutils.command.install import in
+@@ -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", "_elementtree", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "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):
+@@ -243,9 +243,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 specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -534,9 +540,7 @@ class PyBuildExt(build_ext):
+@@ -534,9 +540,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):
-@@ -609,269 +613,51 @@ class PyBuildExt(build_ext):
+@@ -609,269 +613,51 @@
          # 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 = [
 @@ -280,111 +280,108 @@ $NetBSD: patch-am,v 1.3 2009/07/24 14:50
 +                bsddb185_define_macros=[('HAVE_DB_185_H',1)]
 +                dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
              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",]))
 +                # 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
 -        # 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,6 +670,13 @@ class PyBuildExt(build_ext):
+@@ -884,11 +670,6 @@
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
                                         libraries = ndbm_libs ) )
-+            elif find_file("ndbm.h", db_incs, []) is not None:
+-            elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
-+                exts.append( Extension('dbm', ['dbmmodule.c'],
+-                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-+                                       library_dirs=dblib_dir,
+-                exts.append( Extension('dbm', ['dbmmodule.c'],
-+                                       runtime_library_dirs=dblib_dir,
+-                                       define_macros=[('HAVE_GDBM_NDBM_H',None)],
-+                                       include_dirs=db_incs,
+-                                       libraries = ['gdbm'] ) )
-+                                       define_macros=[('HAVE_NDBM_H',None)],
+             elif db_incs is not None:
 +                                       libraries=dblibs))
              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'],
-@@ -899,9 +692,9 @@ class PyBuildExt(build_ext):
+                                        library_dirs=dblib_dir,
@@ -899,9 +680,9 @@
                                         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 +1329,8 @@ def main():
+@@ -1536,8 +1317,8 @@
            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,18 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2009/09/08 10:06:35 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2009/09/09 05:37:51 dsainty Exp $
 DISTNAME=	Python-2.5.4
 PKGNAME=	python25-2.5.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/2.5.4/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 PKG_DESTDIR_SUPPORT=	user-destdir
 # Remember to update pkgsrc/lang/python/srcdist.mk when version changes
 CONFLICTS+=	python-[0-9]*