From 91993cc40defebb177b182415732443cb1b58a2c Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Mon, 29 Nov 2010 06:29:13 +0000 Subject: [PATCH] - Update to 2.7.1 --- Mk/bsd.python.mk | 4 ++-- lang/python27/Makefile | 3 +-- lang/python27/distinfo | 5 ++--- .../files/patch-Lib-test-test_socket.py | 11 ---------- ...ng.py => patch-Lib-test-test_threading.py} | 12 +++++------ lang/python27/pkg-plist | 20 +++++++++++-------- 6 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 lang/python27/files/patch-Lib-test-test_socket.py rename lang/python27/files/{patch-Lib_test_test_threading.py => patch-Lib-test-test_threading.py} (55%) diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index ec7a50451ee3..7f1a3c483ecb 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -379,9 +379,9 @@ PYTHON_VER= 3.1 # Python-2.7 .elif ${PYTHON_VERSION} == "python2.7" -PYTHON_PORTVERSION?=2.7 +PYTHON_PORTVERSION?=2.7.1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python27 -PYTHON_REL= 270 +PYTHON_REL= 271 PYTHON_SUFFIX= 27 PYTHON_VER= 2.7 diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 423c8ebeec1d..04c901d68c1a 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python27 -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python27/distinfo b/lang/python27/distinfo index d75d6f64e3c2..28533fc7f80d 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,3 +1,2 @@ -MD5 (python/Python-2.7.tgz) = 35f56b092ecf39a6bd59d64f142aae0f -SHA256 (python/Python-2.7.tgz) = 5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5 -SIZE (python/Python-2.7.tgz) = 14026384 +SHA256 (python/Python-2.7.1.tgz) = ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8 +SIZE (python/Python-2.7.1.tgz) = 14058131 diff --git a/lang/python27/files/patch-Lib-test-test_socket.py b/lang/python27/files/patch-Lib-test-test_socket.py deleted file mode 100644 index 8c1ada8b2da6..000000000000 --- a/lang/python27/files/patch-Lib-test-test_socket.py +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/test/test_socket.py.orig 2010-08-14 16:51:08.542899328 +0800 -+++ Lib/test/test_socket.py 2010-08-14 16:53:25.902184941 +0800 -@@ -334,7 +334,7 @@ - # I've ordered this by protocols that have both a tcp and udp - # protocol, at least for modern Linuxes. - if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -- 'freebsd7', 'freebsd8', 'darwin'): -+ 'freebsd7', 'freebsd8', 'freebsd9', 'darwin'): - # avoid the 'echo' service on this platform, as there is an - # assumption breaking non-standard port/protocol entry - services = ('daytime', 'qotd', 'domain') diff --git a/lang/python27/files/patch-Lib_test_test_threading.py b/lang/python27/files/patch-Lib-test-test_threading.py similarity index 55% rename from lang/python27/files/patch-Lib_test_test_threading.py rename to lang/python27/files/patch-Lib-test-test_threading.py index c7dec6dd9b87..e6e0647806c7 100644 --- a/lang/python27/files/patch-Lib_test_test_threading.py +++ b/lang/python27/files/patch-Lib-test-test_threading.py @@ -1,11 +1,11 @@ ---- Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 -+++ Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 -@@ -382,7 +382,7 @@ +--- Lib/test/test_threading.py.orig 2010-11-29 08:22:00.000000000 +0800 ++++ Lib/test/test_threading.py 2010-11-29 08:25:21.000000000 +0800 +@@ -476,7 +476,7 @@ return # Skip platforms with known problems forking from a worker thread. # See http://bugs.python.org/issue3863. -- if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'): -+ if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'): +- if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', ++ if sys.platform in ('freebsd6', 'freebsd7', 'freebsd8', 'freebsd9','netbsd5', + 'os2emx'): print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' ' due to known OS bugs on'), sys.platform - return diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index edc3fa751a5a..7533558670ae 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -735,10 +735,12 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/json/tool.py %%PYTHON_LIBDIR%%/keyword.py %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt -%%PYTHON_LIBDIR%%/lib2to3/Grammar2.7.0.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/Grammar2.7.1.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.7.0.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.7.1.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/__init__.py +%%PYTHON_LIBDIR%%/lib2to3/btm_matcher.py +%%PYTHON_LIBDIR%%/lib2to3/btm_utils.py %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py %%PYTHON_LIBDIR%%/lib2to3/fixes/__init__.py @@ -833,7 +835,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/tests/test_pytree.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_refactor.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_util.py -%%PYTHON_LIBDIR%%/lib-dynload/Python-%%PYVER%%-py%%PYVER%%.egg-info +%%PYTHON_LIBDIR%%/lib-dynload/Python-2.7.1-py%%PYVER%%.egg-info %%PYTHON_LIBDIR%%/lib-dynload/_bisect.so %%PYTHON_LIBDIR%%/lib-dynload/_codecs_cn.so %%PYTHON_LIBDIR%%/lib-dynload/_codecs_hk.so @@ -865,7 +867,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/_ssl.so %%PYTHON_LIBDIR%%/lib-dynload/_struct.so %%PYTHON_LIBDIR%%/lib-dynload/_testcapi.so -%%PYTHON_LIBDIR%%/lib-dynload/_weakref.so %%PYTHON_LIBDIR%%/lib-dynload/array.so %%PYTHON_LIBDIR%%/lib-dynload/audioop.so %%PYTHON_LIBDIR%%/lib-dynload/binascii.so @@ -1078,6 +1079,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py %%PYTHON_LIBDIR%%/test/cmath_testcases.txt %%PYTHON_LIBDIR%%/test/curses_tests.py +%%PYTHON_LIBDIR%%/test/data/README %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest @@ -1529,7 +1531,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_pprint.py %%PYTHON_LIBDIR%%/test/test_print.py %%PYTHON_LIBDIR%%/test/test_profile.py -%%PYTHON_LIBDIR%%/test/test_profilehooks.py %%PYTHON_LIBDIR%%/test/test_property.py %%PYTHON_LIBDIR%%/test/test_pstats.py %%PYTHON_LIBDIR%%/test/test_pty.py @@ -1547,6 +1548,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_resource.py %%PYTHON_LIBDIR%%/test/test_rfc822.py %%PYTHON_LIBDIR%%/test/test_richcmp.py +%%PYTHON_LIBDIR%%/test/test_rlcompleter.py %%PYTHON_LIBDIR%%/test/test_robotparser.py %%PYTHON_LIBDIR%%/test/test_runpy.py %%PYTHON_LIBDIR%%/test/test_sax.py @@ -1591,6 +1593,8 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_syntax.py %%PYTHON_LIBDIR%%/test/test_sys.py %%PYTHON_LIBDIR%%/test/test_sysconfig.py +%%PYTHON_LIBDIR%%/test/test_sys_setprofile.py +%%PYTHON_LIBDIR%%/test/test_sys_settrace.py %%PYTHON_LIBDIR%%/test/test_tarfile.py %%PYTHON_LIBDIR%%/test/test_tcl.py %%PYTHON_LIBDIR%%/test/test_telnetlib.py @@ -1669,6 +1673,8 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/threaded_import_hangers.py %%PYTHON_LIBDIR%%/test/time_hashlib.py %%PYTHON_LIBDIR%%/test/tokenize_tests.txt +%%PYTHON_LIBDIR%%/test/tracedmodules/__init__.py +%%PYTHON_LIBDIR%%/test/tracedmodules/testmod.py %%PYTHON_LIBDIR%%/test/warning_tests.py %%PYTHON_LIBDIR%%/test/wrongcert.pem %%PYTHON_LIBDIR%%/test/xmltests.py @@ -1790,8 +1796,6 @@ lib/libpython2.7.a %%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/demo.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/importexc.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/embed/loop.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imputil/importers.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imputil/knee.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/md5test/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/md5test/foo %%PORTEXAMPLES%%%%EXAMPLESDIR%%/md5test/md5driver.py @@ -2310,7 +2314,6 @@ lib/libpython2.7.a %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/newmetaclasses %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/metaclasses %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/md5test -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/imputil %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/embed %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/curses %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/comparisons @@ -2327,6 +2330,7 @@ lib/libpython2.7.a @dirrm %%PYTHON_LIBDIR%%/unittest @dirrm %%PYTHON_LIBDIR%%/test/data @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata +@dirrm %%PYTHON_LIBDIR%%/test/tracedmodules @dirrm %%PYTHON_LIBDIR%%/test/xmltestdata @dirrm %%PYTHON_LIBDIR%%/test @dirrm %%PYTHON_LIBDIR%%/sqlite3/test