Introduce two new versions of Python: 2.6 and 3.0rc1 (finally!)

Python 2.6 will be the next default python version when enough
testings of consumer ports are done.  The new "2to3" program is
renamed to 2to3-2.6 and 2to3-3.0 for each version, respectively.

Repo-copied by:	marcus

1 files changed, 15 insertions, 23 deletions

diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
index 35e7763f270c..fee5a1bc299a 100644
--- a/lang/python32/files/patch-setup.py
+++ b/lang/python32/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2008-02-29 22:57:02.000000000 +0900
-+++ setup.py	2008-02-29 23:01:47.000000000 +0900
-@@ -15,7 +15,7 @@
+--- setup.py.orig	2008-09-30 09:15:45.000000000 +0900
++++ setup.py	2008-10-09 20:34:35.000000000 +0900
+@@ -17,7 +17,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -9,7 +9,7 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -489,7 +489,7 @@
+@@ -575,7 +575,7 @@
  
              readline_libs = ['readline']
              if self.compiler.find_library_file(lib_dirs,
@@ -18,7 +18,7 @@
                  readline_libs.append('ncursesw')
              elif self.compiler.find_library_file(lib_dirs,
                                                   'ncurses'):
-@@ -501,7 +501,7 @@
+@@ -587,7 +587,7 @@
                                                 'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
@@ -26,26 +26,17 @@
 +                                   library_dirs=['/usr/lib', '/usr/lib/termcap'],
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
-         if platform not in ['mac']:
-@@ -591,6 +591,8 @@
+         else:
+@@ -687,6 +687,8 @@
              # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
              exts.append( Extension('_sha256', ['sha256module.c']) )
              exts.append( Extension('_sha512', ['sha512module.c']) )
 +        else:
 +            open('.without_own_sha', 'w')
  
- 
          # Modules that provide persistent dictionary-like semantics.  You will
-@@ -857,7 +859,7 @@
-         # 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:
-+        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:
-@@ -922,7 +930,7 @@
+         # probably want to arrange for at least one of them to be available on
+@@ -1066,7 +1068,7 @@
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
          panel_library = 'panel'
@@ -54,7 +45,7 @@
              curses_libs = ['ncursesw']
              # Bug 1464056: If _curses.so links with ncursesw,
              # _curses_panel.so must link with panelw.
-@@ -932,6 +940,7 @@
+@@ -1076,6 +1078,7 @@
          elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
              exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -62,19 +53,20 @@
                                     libraries = curses_libs) )
          elif (self.compiler.find_library_file(lib_dirs, 'curses')
                and platform != 'darwin'):
-@@ -951,6 +960,7 @@
+@@ -1097,6 +1100,7 @@
          if (module_enabled(exts, '_curses') and
              self.compiler.find_library_file(lib_dirs, panel_library)):
              exts.append( Extension('_curses_panel', ['_curses_panel.c'],
 +                                   library_dirs = ['/usr/lib'],
                                     libraries = [panel_library] + curses_libs) )
- 
- 
-@@ -1535,8 +1545,7 @@
+         else:
+             missing.append('_curses_panel')
+@@ -1869,9 +1873,7 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +          scripts = []
          )