- Update to 3.2.0 and complete repocopy

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

Mk/bsd.python.mk

@@ -214,7 +214,7 @@ Python_Include_MAINTAINER=	python@FreeBSD.org
 #
 
 _PYTHON_PORTBRANCH=		2.6
-_PYTHON_ALLBRANCHES=		2.6 2.5 2.4 2.7 3.1 # preferred first
+_PYTHON_ALLBRANCHES=		2.6 2.5 2.4 2.7 3.1 3.2# preferred first
 _ZOPE_PORTBRANCH=		2.7
 _ZOPE_ALLBRANCHES=		2.7 2.8 2.9 2.10 3.2
 
@@ -369,8 +369,16 @@ PYTHON_PORTVERSION=	${PYTHON_DEFAULT_PORTVERSION}
 # Propagate the chosen python version to submakes.
 .MAKEFLAGS:	PYTHON_VERSION=python${_PYTHON_VERSION}
 
+# Python-3.2
+.if ${PYTHON_VERSION} == "python3.2"
+PYTHON_PORTVERSION?=3.2
+PYTHON_PORTSDIR=	${PORTSDIR}/lang/python32
+PYTHON_REL=			320
+PYTHON_SUFFIX=		32
+PYTHON_VER=			3.2
+
 # Python-3.1
-.if ${PYTHON_VERSION} == "python3.1"
+.elif ${PYTHON_VERSION} == "python3.1"
 PYTHON_PORTVERSION?=3.1.3
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python31
 PYTHON_REL=			313
@@ -428,6 +436,7 @@ check-makevars::
 	@${ECHO} "  python2.6 (default)"
 	@${ECHO} "  python2.7"
 	@${ECHO} "  python3.1"
+	@${ECHO} "  python3.2"
 	@${FALSE}
 .endif
 

lang/python32/Makefile

@@ -4,8 +4,8 @@
 #
 # $FreeBSD$
 
-PORTNAME=	python31
+PORTNAME=	python32
-PORTVERSION=	3.1.3
+PORTVERSION=	3.2.0
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -27,12 +27,12 @@ INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python3.1
+PYTHON_VERSION=	python3.2
 PYTHON_NO_DEPENDS=	yes
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
-PLIST=		${WRKDIR}/PLIST
+#PLIST=		${WRKDIR}/PLIST
-PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
+#PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		PYVER_WITHPAT=${PORTVERSION:S/.rc/rc/}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
@@ -110,6 +110,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--with-fpectl
 .endif
 
+pre-fetch:
+	@${ECHO_MSG} "
+	@${ECHO_MSG} "This is the first release of python-3.2,               "
+	@${ECHO_MSG} "We suggest do not use in production environment because"
+	@${ECHO_MSG} "there are some bugs what we have to figure out.        "
+	@${ECHO_MSG} "
+	@sleep 5
+
 pre-patch:
 	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
 		${PATCH_WRKSRC}/Lib/plat-freebsd9
@@ -144,8 +152,8 @@ pre-patch:
 post-configure:
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
 	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
-	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
+	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(LDVERSION).so,' \
-		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
+		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(LDVERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
 		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
@@ -154,8 +162,8 @@ post-configure:
 
 pre-build:
 	cd ${SHARED_WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
+	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}mu.so python; \
-	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
+	${LN} -f lib${PYTHON_VERSION}mu.so lib${PYTHON_VERSION}mu.so.1; \
 	${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/}
 
 pre-su-install:
@@ -168,11 +176,6 @@ pre-su-install:
 .endfor
 
 pre-install:
-	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
-	/LIBDIR.*\.py$$/ && \
-	!/bad_coding|badsyntax|site-packages|py2_test_grammar|crlf|different_encoding|tests\/data/ \
-	{ print $$0 "o"; print $$0 "c"; }' > ${PLIST}
-
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
 		${GREP} -v 'lib-dynload/_sha' ${PLIST} > ${PLIST}.tmp && \
@@ -184,11 +187,11 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin
 
 	@# shared version of executable and library
-	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
+	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}mu.so.1 \
 		${PREFIX}/lib
-	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
+	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}mu.so.1 \
 		lib${PYTHON_VERSION}.so
-	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config
+	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}mu.so ${PYTHONPREFIX_LIBDIR}/config
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
@@ -215,11 +218,6 @@ post-install:
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
 		(cd ${DATADIR}; ${TAR} -xf -)
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
-		(cd ${EXAMPLESDIR}; ${TAR} -xf -)
-.endif
 
 	@${CAT} ${PKGMESSAGE}
 

lang/python32/distinfo

@@ -1,2 +1,2 @@
-SHA256 (python/Python-3.1.3.tgz) = 6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd
+SHA256 (python/Python-3.2.tgz) = 27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9
-SIZE (python/Python-3.1.3.tgz) = 11769584
+SIZE (python/Python-3.2.tgz) = 12673043

lang/python32/files/patch-Modules-_ctypes-libffi-configure

@@ -1,11 +1,11 @@
---- Modules/_ctypes/libffi/configure.orig	2008-05-24 00:06:50.000000000 +0900
+--- Modules/_ctypes/libffi/configure.orig	2011-02-05 04:03:34.000000000 +0000
-+++ Modules/_ctypes/libffi/configure	2008-10-09 20:24:02.000000000 +0900
++++ Modules/_ctypes/libffi/configure	2011-02-05 04:04:43.000000000 +0000
-@@ -4725,7 +4725,7 @@
+@@ -6289,7 +6289,7 @@
    rm -rf conftest*
    ;;
  
 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|sparc*-*linux*)
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext

lang/python32/files/patch-setup.py

@@ -1,42 +1,42 @@
---- setup.py.orig	2010-11-26 19:56:26.000000000 +0800
+--- setup.py.orig	2010-12-28 17:51:43.000000000 +0800
-+++ setup.py	2010-12-14 10:53:36.000000000 +0800
++++ setup.py	2011-02-21 21:08:22.000000000 +0800
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
- from distutils.spawn import find_executable
+ 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):
+ # File which contains the directory for shared mods (for sys.path fixup
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+ # when running from the build dir, see Modules/getpath.c)
-@@ -578,7 +578,7 @@
+@@ -585,7 +585,7 @@
-         #    curses_library = readline_termcap_library
+         # use the same library for the readline and curses modules.
-         # elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
+         if 'curses' in readline_termcap_library:
-         # (...)
+             curses_library = readline_termcap_library
--        if self.compiler.find_library_file(lib_dirs, 'ncursesw'):
+-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
-+        if self.compiler.find_library_file(lib_dirs, 'XXXncursesw'):
++        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 @@
+@@ -624,7 +624,7 @@
-                                                'termcap'):
+                                                      '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 @@
+@@ -724,6 +724,8 @@
-             # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
+                                    depends=['hashlib.h']) )
-             exts.append( Extension('_sha256', ['sha256module.c']) )
+             exts.append( Extension('_sha512', ['sha512module.c'],
-             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 @@
+@@ -1157,6 +1160,7 @@
-         if (module_enabled(exts, '_curses') and
+                 curses_libs = ['curses']
-             self.compiler.find_library_file(lib_dirs, panel_library)):
+ 
-             exts.append( Extension('_curses_panel', ['_curses_panel.c'],
+             exts.append( Extension('_curses', ['_cursesmodule.c'],
-+				   library_dirs = ['/usr/lib'],
++                                   library_dirs = ['/usr/lib'],
-                                    libraries = [panel_library] + curses_libs) )
+                                    libraries = curses_libs) )
          else:
-             missing.append('_curses_panel')
+             missing.append('_curses')
-@@ -1278,7 +1282,7 @@
+@@ -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',
+-        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                        'freebsd7', 'freebsd8'):
+-                        'freebsd7', 'freebsd8')
-+        if platform in ('linux2', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
++        if (platform in ('freebsd7', 'freebsd8', 'freebsd9')
+             or platform.startswith("gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
-             missing.append('ossaudiodev')
+@@ -1868,8 +1871,7 @@
-@@ -1808,8 +1811,7 @@
+           # If you change the scripts installed here, you also need to
-           # called unless there's at least one extension module defined.
+           # check the PyBuildScripts command above, and change the links
-           ext_modules=[Extension('_struct', ['_struct.c'])],
+           # created by the bininstall target in Makefile.pre.in
- 
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 -                     "Tools/scripts/2to3"]
 +          scripts = []