- Update to 3.2.0 and complete repocopy

PR:		ports/153829
Submitted by:	Wen Heping (myself)
Reviewed by:	miwi@

1 files changed, 40 insertions, 40 deletions

diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
index ee5430f79091..2159977b3779 100644
--- a/lang/python32/files/patch-setup.py
+++ b/lang/python32/files/patch-setup.py
@@ -1,42 +1,42 @@
---- setup.py.orig	2010-11-26 19:56:26.000000000 +0800
-+++ setup.py	2010-12-14 10:53:36.000000000 +0800
-@@ -17,7 +17,7 @@
- from distutils.spawn import find_executable
+--- setup.py.orig	2010-12-28 17:51:43.000000000 +0800
++++ setup.py	2011-02-21 21:08:22.000000000 +0800
+@@ -21,7 +21,7 @@
+ 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 = ["_sqlite3", "_tkinter", "_gdbm"]
  
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -578,7 +578,7 @@
-         #    curses_library = readline_termcap_library
-         # elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-         # (...)
--        if self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-+        if self.compiler.find_library_file(lib_dirs, 'XXXncursesw'):
+ # File which contains the directory for shared mods (for sys.path fixup
+ # when running from the build dir, see Modules/getpath.c)
+@@ -585,7 +585,7 @@
+         # use the same library for the readline and curses modules.
+         if 'curses' in readline_termcap_library:
+             curses_library = readline_termcap_library
+-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
++        elif self.compiler.find_library_file(lib_dirs, 'XXXncursesw'):
              curses_library = 'ncursesw'
          elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
              curses_library = 'ncurses'
-@@ -614,7 +614,7 @@
-                                                'termcap'):
+@@ -624,7 +624,7 @@
+                                                      'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
 -                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/lib', '/usr/lib/termcap'],
++                                   library_dirs=['/usr/lib','/usr/lib/termcap'],
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -708,6 +708,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']) )
+@@ -724,6 +724,8 @@
+                                    depends=['hashlib.h']) )
+             exts.append( Extension('_sha512', ['sha512module.c'],
+                                    depends=['hashlib.h']) )
 +        else:
 +            open('.without_own_sha', 'w')
  
-         if openssl_ver < 0x00907000:
+         if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
              # no openssl at all, use our own md5 and sha1
-@@ -1116,12 +1118,13 @@
+@@ -1139,12 +1141,13 @@
          # provided by the ncurses library.
          panel_library = 'panel'
          if curses_library.startswith('ncurses'):
@@ -47,41 +47,41 @@
                  panel_library = 'panelw'
              curses_libs = [curses_library]
              exts.append( Extension('_curses', ['_cursesmodule.c'],
-+				   library_dirs = ['/usr/lib'],
++                                  library_dirs = ['/usr/lib'], 
                                     libraries = curses_libs) )
          elif curses_library == 'curses' and platform != 'darwin':
                  # OSX has an old Berkeley curses, not good enough for
-@@ -1142,6 +1145,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) )
+@@ -1157,6 +1160,7 @@
+                 curses_libs = ['curses']
+ 
+             exts.append( Extension('_curses', ['_cursesmodule.c'],
++                                   library_dirs = ['/usr/lib'],
+                                    libraries = curses_libs) )
          else:
-             missing.append('_curses_panel')
-@@ -1278,7 +1282,7 @@
+             missing.append('_curses')
+@@ -1309,7 +1313,7 @@
              macros = dict()
              libraries = []
  
 -        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
-+        elif platform in ('freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
++        elif platform in ('freebsd7', 'freebsd8', 'freebsd9'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
              macros = dict()
-@@ -1321,8 +1325,7 @@
+@@ -1352,8 +1356,7 @@
          # End multiprocessing
  
          # Platform-specific libraries
--        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                        'freebsd7', 'freebsd8'):
-+        if platform in ('linux2', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+-        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+-                        'freebsd7', 'freebsd8')
++        if (platform in ('freebsd7', 'freebsd8', 'freebsd9')
+             or platform.startswith("gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
-             missing.append('ossaudiodev')
-@@ -1808,8 +1811,7 @@
-           # called unless there's at least one extension module defined.
-           ext_modules=[Extension('_struct', ['_struct.c'])],
- 
+@@ -1868,8 +1871,7 @@
+           # If you change the scripts installed here, you also need to
+           # check the PyBuildScripts command above, and change the links
+           # created by the bininstall target in Makefile.pre.in
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 -                     "Tools/scripts/2to3"]
 +          scripts = []