diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-05-17 04:17:22 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-05-17 04:17:22 +0000 |
commit | 11bf569497858a71d84e85105a6248a789725bc8 (patch) | |
tree | 2d90e75b4dd432723e621b65ad4e2e51b8a4e421 /lang/python33 | |
parent | - Change option OCC (build with opencascade libraries) to default to on. (diff) |
- update to latest upstream versions:
. lang/python27: 2.7.3 -> 2.7.5
. lang/python32: 3.2.3 -> 3.2.4
. lang/python33: 3.3.0 -> 3.3.1
- update Mk/bsd.python.mk with new versions
- mark lang/python26 and lang/python31 as deprecated (set them to
upstream EoL dates)
- update docs (lang/python-doc-html)
- align databases/py-bsddb patch for python27 - most of it was applied
upstream. Raise BDB version to 4.3 atleast, according to
upstream requirements.
Many thanks to Martin (miwi) for his time on this update.
PR: 178506
Submitted by: rm (myself)
Exp-run by: portmgr (miwi)
- revert erroneous threads patch in lang/python26 and lang/python27,
that was added after ports/131080. It was rejected upstream, because it's
not actually a bug, but misuse.
Gabor Pali (pgj) in collaboration with Kubilay Kocak (koobs) did an
independent investigation regard the issue. See here for details:
http://lists.freebsd.org/pipermail/freebsd-python/2013-April/005376.html
PR: 153167
Submitted by: Duncan Findlay <duncan@duncf.ca>
Reported by: pgj/koobs (at python@ ML)
Exp-run by: portmgr (miwi)
Notes
Notes:
svn path=/head/; revision=318353
Diffstat (limited to 'lang/python33')
-rw-r--r-- | lang/python33/Makefile | 3 | ||||
-rw-r--r-- | lang/python33/distinfo | 4 | ||||
-rw-r--r-- | lang/python33/files/patch-Makefile.pre.in | 46 | ||||
-rw-r--r-- | lang/python33/files/patch-Modules-_ctypes-libffi-configure | 10 | ||||
-rw-r--r-- | lang/python33/files/patch-Modules-_decimal-libmpdec-mpdecimal.h | 21 | ||||
-rw-r--r-- | lang/python33/pkg-plist | 18 |
6 files changed, 72 insertions, 30 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 5fa6b212ab01..8cf4230b02a7 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= python33 -PORTVERSION= 3.3.0 -PORTREVISION= 2 +PORTVERSION= 3.3.1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python33/distinfo b/lang/python33/distinfo index d443e941434c..8a49599ad629 100644 --- a/lang/python33/distinfo +++ b/lang/python33/distinfo @@ -1,2 +1,2 @@ -SHA256 (python/Python-3.3.0.tar.xz) = 09994d2885a8ef61b4b2389527a9805a4a05e3e0f121dbc8e4222f9010f5bbd7 -SIZE (python/Python-3.3.0.tar.xz) = 11720732 +SHA256 (python/Python-3.3.1.tar.xz) = f8a7f0117c9a8263a52991cb86a55082888850b196d9dfad6d84bb0549e7c76a +SIZE (python/Python-3.3.1.tar.xz) = 11852964 diff --git a/lang/python33/files/patch-Makefile.pre.in b/lang/python33/files/patch-Makefile.pre.in new file mode 100644 index 000000000000..2e7654bbb0ab --- /dev/null +++ b/lang/python33/files/patch-Makefile.pre.in @@ -0,0 +1,46 @@ +--- ./Makefile.pre.in.orig 2013-04-06 11:41:48.000000000 +0400 ++++ ./Makefile.pre.in 2013-04-08 16:16:25.000000000 +0400 +@@ -306,21 +306,21 @@ + + ########################################################################## + # AST +-AST_H_DIR= Include ++AST_H_DIR= $(srcdir)/Include + AST_H= $(AST_H_DIR)/Python-ast.h +-AST_C_DIR= Python ++AST_C_DIR= $(srcdir)/Python + AST_C= $(AST_C_DIR)/Python-ast.c + AST_ASDL= $(srcdir)/Parser/Python.asdl + + ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py + # XXX Note that a build now requires Python exist before the build starts +-ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py ++ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py + + ########################################################################## + # Python + + OPCODETARGETS_H= \ +- Python/opcode_targets.h ++ $(srcdir)/Python/opcode_targets.h + + OPCODETARGETGEN= \ + $(srcdir)/Python/makeopcodetargets.py +@@ -742,7 +742,7 @@ + Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h + + $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES) +- $(OPCODETARGETGEN) $(OPCODETARGETS_H) ++# $(OPCODETARGETGEN) $(OPCODETARGETS_H) + + Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h + +@@ -753,7 +753,7 @@ + + Objects/typeobject.o: Objects/typeslots.inc + Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py +- $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc ++# $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc + + ############################################################################ + # Header files diff --git a/lang/python33/files/patch-Modules-_ctypes-libffi-configure b/lang/python33/files/patch-Modules-_ctypes-libffi-configure index 5bddeea3cee6..5f24678ab3cb 100644 --- a/lang/python33/files/patch-Modules-_ctypes-libffi-configure +++ b/lang/python33/files/patch-Modules-_ctypes-libffi-configure @@ -1,6 +1,6 @@ ---- ./Modules/_ctypes/libffi/configure.orig 2012-09-29 18:00:42.000000000 +1000 -+++ ./Modules/_ctypes/libffi/configure 2012-10-04 20:21:15.000000000 +1000 -@@ -6834,7 +6834,7 @@ +--- ./Modules/_ctypes/libffi/configure.orig 2013-04-06 11:41:49.000000000 +0400 ++++ ./Modules/_ctypes/libffi/configure 2013-04-08 12:50:54.000000000 +0400 +@@ -6889,7 +6889,7 @@ rm -rf conftest* ;; @@ -9,14 +9,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext -@@ -14322,10 +14322,10 @@ +@@ -14505,10 +14505,10 @@ $as_echo_n "(cached) " >&6 else - libffi_cv_as_x86_pcrel=yes + libffi_cv_as_x86_pcrel=no echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s -- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then +- if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then - libffi_cv_as_x86_pcrel=no + if $CC $CFLAGS -c conftest.s > /dev/null; then + libffi_cv_as_x86_pcrel=yes diff --git a/lang/python33/files/patch-Modules-_decimal-libmpdec-mpdecimal.h b/lang/python33/files/patch-Modules-_decimal-libmpdec-mpdecimal.h deleted file mode 100644 index 47d1f7b4d1c7..000000000000 --- a/lang/python33/files/patch-Modules-_decimal-libmpdec-mpdecimal.h +++ /dev/null @@ -1,21 +0,0 @@ - -# HG changeset patch -# User Stefan Krah <skrah@bytereef.org> -# Date 1356273741 -3600 -# Node ID f05d29353f0278b21295f44467d08bd57a9ae33f -# Parent e684b253fd9dd73495fcef89aad43ae9c42f975c -Issue #16753: Define __GNUC_STDC_INLINE__ to an integer (same as gcc). - -diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h ---- Modules/_decimal/libmpdec/mpdecimal.h -+++ Modules/_decimal/libmpdec/mpdecimal.h -@@ -63,7 +63,7 @@ extern "C" { - #include <inttypes.h> - #endif - #ifndef __GNUC_STDC_INLINE__ -- #define __GNUC_STDC_INLINE__ -+ #define __GNUC_STDC_INLINE__ 1 - #endif - #if defined(__GNUC__) && !defined(__INTEL_COMPILER) - #define UNUSED __attribute__((unused)) - diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist index 13432ad7b09d..c37e955938c2 100644 --- a/lang/python33/pkg-plist +++ b/lang/python33/pkg-plist @@ -2329,6 +2329,10 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/__pycache__/reperf.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest.cpython-33.pyo +%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_docstrings.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_docstrings.cpython-33.pyo +%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_doctests.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_doctests.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/script_helper.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/script_helper.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/seq_tests.cpython-33.pyc @@ -3049,6 +3053,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/__pycache__/test_weakref.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_weakset.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/test_weakset.cpython-33.pyo +%%PYTHON_LIBDIR%%/test/__pycache__/test_webbrowser.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/__pycache__/test_webbrowser.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_winreg.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/test_winreg.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_winsound.cpython-33.pyc @@ -3348,6 +3354,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_separators.cpython-33.pyo %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_speedups.cpython-33.pyc %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_speedups.cpython-33.pyo +%%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_tool.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_tool.cpython-33.pyo %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_unicode.cpython-33.pyc %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_unicode.cpython-33.pyo %%PYTHON_LIBDIR%%/test/json_tests/test_decode.py @@ -3364,6 +3372,7 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/json_tests/test_scanstring.py %%PYTHON_LIBDIR%%/test/json_tests/test_separators.py %%PYTHON_LIBDIR%%/test/json_tests/test_speedups.py +%%PYTHON_LIBDIR%%/test/json_tests/test_tool.py %%PYTHON_LIBDIR%%/test/json_tests/test_unicode.py %%PYTHON_LIBDIR%%/test/keycert.passwd.pem %%PYTHON_LIBDIR%%/test/keycert.pem @@ -3429,6 +3438,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/relimport.py %%PYTHON_LIBDIR%%/test/reperf.py %%PYTHON_LIBDIR%%/test/sample_doctest.py +%%PYTHON_LIBDIR%%/test/sample_doctest_no_docstrings.py +%%PYTHON_LIBDIR%%/test/sample_doctest_no_doctests.py %%PYTHON_LIBDIR%%/test/script_helper.py %%PYTHON_LIBDIR%%/test/seq_tests.py %%PYTHON_LIBDIR%%/test/sgml_input.html @@ -3630,6 +3641,7 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/test_email/test_email.py %%PYTHON_LIBDIR%%/test/test_email/test_generator.py %%PYTHON_LIBDIR%%/test/test_email/test_headerregistry.py +%%PYTHON_LIBDIR%%/test/test_email/test_inversion.py %%PYTHON_LIBDIR%%/test/test_email/test_message.py %%PYTHON_LIBDIR%%/test/test_email/test_parser.py %%PYTHON_LIBDIR%%/test/test_email/test_pickleable.py @@ -3645,6 +3657,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_email.cpython-33.pyc %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_generator.cpython-33.pyc %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_headerregistry.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_inversion.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_inversion.cpython-33.pyo %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_message.cpython-33.pyc %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_parser.cpython-33.pyc %%PYTHON_LIBDIR%%/test/test_email/__pycache__/test_pickleable.cpython-33.pyc @@ -4048,6 +4062,7 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/test/test_xml_etree_c.py %%PYTHON_LIBDIR%%/test/test_xmlrpc.py %%PYTHON_LIBDIR%%/test/test_xmlrpc_net.py +%%PYTHON_LIBDIR%%/test/test_webbrowser.py %%PYTHON_LIBDIR%%/test/test_zipfile.py %%PYTHON_LIBDIR%%/test/test_zipfile64.py %%PYTHON_LIBDIR%%/test/test_zipimport.py @@ -4142,12 +4157,15 @@ libdata/pkgconfig/python-%%PYVER%%.pc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_font.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-33.pyo +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-33.pyc +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_font.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_loadtk.py +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_misc.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_text.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_variables.py %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__init__.py |