lang/python26/patches/patch-am

   1 $NetBSD: patch-am,v 1.5 2009/07/18 10:41:33 wiz Exp $
   2
   3 --- setup.py.orig       2009-03-31 18:20:48.000000000 +0000
   4 +++ setup.py
   5 @@ -17,7 +17,7 @@ from distutils.command.install import in
   6  from distutils.command.install_lib import install_lib
   7
   8  # This global variable is used to hold the list of modules to be disabled.
   9 -disabled_module_list = []
  10 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "readline"]
  11
  12  def add_dir_to_list(dirlist, dir):
  13      """Add the directory 'dir' to the list 'dirlist' (at the front) if
  14 @@ -309,9 +309,15 @@ class PyBuildExt(build_ext):
  15          return sys.platform
  16
  17      def detect_modules(self):
  18 -        # Ensure that /usr/local is always used
  19 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  20 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  21 +        # Add the buildlink directories for pkgsrc
  22 +        if os.environ.has_key('BUILDLINK_DIR'):
  23 +            dir = os.environ['BUILDLINK_DIR']
  24 +            libdir = dir + '/lib'
  25 +            incdir = dir + '/include'
  26 +            if libdir not in self.compiler.library_dirs:
  27 +                self.compiler.library_dirs.insert(0, libdir)
  28 +            if incdir not in self.compiler.include_dirs:
  29 +                self.compiler.include_dirs.insert(0, incdir)
  30
  31          # Add paths specified in the environment variables LDFLAGS and
  32          # CPPFLAGS for header and library files.
  33 @@ -626,9 +632,7 @@ class PyBuildExt(build_ext):
  34              if krb5_h:
  35                  ssl_incs += krb5_h
  36          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
  37 -                                     ['/usr/local/ssl/lib',
  38 -                                      '/usr/contrib/ssl/lib/'
  39 -                                     ] )
  40 +                                     [] )
  41
  42          if (ssl_incs is not None and
  43              ssl_libs is not None):
  44 @@ -1300,6 +1304,14 @@ class PyBuildExt(build_ext):
  45                  )
  46              libraries = []
  47
  48 +       elif platform.startswith('dragonfly'):
  49 +           macros = dict(
  50 +               HAVE_SEM_OPEN=0,
  51 +               HAVE_SEM_TIMEDWAIT=0,
  52 +               HAVE_FD_TRANSFER=1,
  53 +               )
  54 +           libraries = []
  55 +
  56          else:                                   # Linux and other unices
  57              macros = dict(
  58                  HAVE_SEM_OPEN=1,
  59 @@ -1891,9 +1903,9 @@ def main():
  60            ext_modules=[Extension('_struct', ['_struct.c'])],
  61
  62            # Scripts to install
  63 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
  64 +          scripts = ['Tools/scripts/pydoc2.6',
  65                       'Tools/scripts/2to3',
  66 -                     'Lib/smtpd.py']
  67 +                     'Lib/smtpd2.6.py']
  68          )
  69
  70  # --install-platlib