diff options
43 files changed, 302 insertions, 1121 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 5758fb06e9a9..8f18d487df1f 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -202,7 +202,7 @@ PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION} # Python-2.4 .if ${PYTHON_VERSION} == "python2.4" -PYTHON_PORTVERSION?=2.4.a2 +PYTHON_PORTVERSION?=2.4.a3 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel PYTHON_REL= 240 PYTHON_SUFFIX= 24 diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python-devel/files/patch-configure b/lang/python-devel/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python-devel/files/patch-configure +++ b/lang/python-devel/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python-devel/files/patch-setup.py +++ b/lang/python-devel/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python25/Makefile b/lang/python25/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python25/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python25/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python25/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python25/files/patch-configure b/lang/python25/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python25/files/patch-configure +++ b/lang/python25/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python26/Makefile b/lang/python26/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python26/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python26/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python26/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python26/files/patch-configure b/lang/python26/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python26/files/patch-configure +++ b/lang/python26/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python27/Makefile b/lang/python27/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 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 1187d64a2234..f909fba40f79 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python27/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python27/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python27/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python27/files/patch-configure b/lang/python27/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python27/files/patch-configure +++ b/lang/python27/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python30/Makefile b/lang/python30/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python30/distinfo b/lang/python30/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python30/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python30/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python30/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python30/files/patch-configure b/lang/python30/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python30/files/patch-configure +++ b/lang/python30/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python30/files/patch-setup.py +++ b/lang/python30/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python31/Makefile b/lang/python31/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python31/distinfo b/lang/python31/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python31/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python31/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python31/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python31/files/patch-configure +++ b/lang/python31/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py diff --git a/lang/python32/Makefile b/lang/python32/Makefile index aa043aa2bfc6..1878b8537232 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python -PORTVERSION= 2.4.a2 -PORTREVISION= 1 +PORTVERSION= 2.4.a3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python32/distinfo b/lang/python32/distinfo index 1187d64a2234..f909fba40f79 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,2 +1,2 @@ -MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860 -SIZE (python/Python-2.4a2.tgz) = 8999009 +MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d +SIZE (python/Python-2.4a3.tgz) = 9114590 diff --git a/lang/python32/files/patch-Modules::cjkcodecs::_codecs_iso2022.c b/lang/python32/files/patch-Modules::cjkcodecs::_codecs_iso2022.c deleted file mode 100644 index 3b535c80e42e..000000000000 --- a/lang/python32/files/patch-Modules::cjkcodecs::_codecs_iso2022.c +++ /dev/null @@ -1,123 +0,0 @@ ---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004 -+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004 -@@ -2,7 +2,7 @@ - * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings. - * - * Written by Hye-Shik Chang <perky@FreeBSD.org> -- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $ -+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $ - */ - - #define USING_IMPORTED_MAPS -@@ -117,7 +117,7 @@ - - struct iso2022_config { - int flags; -- const struct iso2022_designation designations[]; /* non-ascii desigs */ -+ const struct iso2022_designation *designations; /* non-ascii desigs */ - }; - - /*-*- iso-2022 codec implementation -*-*/ -@@ -197,7 +197,9 @@ - length = 2; - #if Py_UNICODE_SIZE == 2 - if (length == 2) { -- ucs4_t u4in[2] = {IN1, IN2}; -+ ucs4_t u4in[2]; -+ u4in[0] = (ucs4_t)IN1; -+ u4in[1] = (ucs4_t)IN2; - encoded = dsg->encoder(u4in, &length); - } else - encoded = dsg->encoder(&c, &length); -@@ -420,7 +422,7 @@ - DECODER(iso2022) - { - const struct iso2022_designation *dsgcache = NULL; -- -+ - while (inleft > 0) { - unsigned char c = IN1; - int err; -@@ -1047,50 +1049,52 @@ - #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \ - NULL, dummy_decoder, dummy_encoder } - #define REGISTRY_SENTINEL { 0, } -+#define CONFIGDEF(var, attrs) \ -+ static const struct iso2022_config iso2022_##var##_config = { \ -+ attrs, iso2022_##var##_designations \ -+ }; - --static const struct iso2022_config iso2022_kr_config = { -- 0, -- { REGISTRY_KSX1001, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_kr_designations[] = { -+ REGISTRY_KSX1001, REGISTRY_SENTINEL - }; -+CONFIGDEF(kr, 0) - --static const struct iso2022_config iso2022_jp_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_SENTINEL - }; -+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_1_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_1_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001, -+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O, -+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_2004_config = { -- NO_SHIFT | USE_G2 | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_2004_designations[] = { -+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_3_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, -- REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_3_designations[] = { -+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208, -+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT) - --static const struct iso2022_config iso2022_jp_ext_config = { -- NO_SHIFT | USE_JISX0208_EXT, -- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL }, -+static const struct iso2022_designation iso2022_jp_ext_designations[] = { -+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R, -+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL - }; -+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT) - - - BEGIN_MAPPINGS_LIST diff --git a/lang/python32/files/patch-configure b/lang/python32/files/patch-configure index 6ee47894e12f..9ed971ab4be7 100644 --- a/lang/python32/files/patch-configure +++ b/lang/python32/files/patch-configure @@ -1,7 +1,7 @@ --- configure.orig Sat Oct 4 13:27:50 2003 +++ configure Sat Oct 4 13:29:05 2003 @@ -1321,7 +1321,7 @@ - VERSION=2.3 + VERSION=2.4 -SOVERSION=1.0 @@ -9,7 +9,7 @@ # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ +@@ -3396,6 +3396,12 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index acb3015726b9..a94599c261d9 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Jul 23 11:50:10 2004 -+++ setup.py Sat Aug 21 09:04:58 2004 +--- setup.py.orig Tue Aug 31 10:37:25 2004 ++++ setup.py Fri Sep 3 10:42:53 2004 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -9,16 +9,7 @@ def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -782,7 +782,7 @@ - # Linux-specific modules - exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) - -- if platform in ('linux2', 'freebsd4', 'freebsd5'): -+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - - if platform == 'sunos5': -@@ -1164,8 +1164,7 @@ +@@ -1144,8 +1144,7 @@ ext_modules=[Extension('struct', ['structmodule.c'])], # Scripts to install diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index b71e3a887071..de6239d824f6 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -120,9 +120,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo lib/%%PYTHON_VERSION%%/StringIO.py lib/%%PYTHON_VERSION%%/StringIO.pyc lib/%%PYTHON_VERSION%%/StringIO.pyo -lib/%%PYTHON_VERSION%%/TERMIOS.py -lib/%%PYTHON_VERSION%%/TERMIOS.pyc -lib/%%PYTHON_VERSION%%/TERMIOS.pyo lib/%%PYTHON_VERSION%%/UserDict.py lib/%%PYTHON_VERSION%%/UserDict.pyc lib/%%PYTHON_VERSION%%/UserDict.pyo @@ -835,6 +832,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo @@ -844,6 +844,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc +lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo @@ -931,6 +934,9 @@ lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo lib/%%PYTHON_VERSION%%/encodings/string_escape.py lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/tis_620.py +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc +lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo lib/%%PYTHON_VERSION%%/encodings/undefined.py lib/%%PYTHON_VERSION%%/encodings/undefined.pyc lib/%%PYTHON_VERSION%%/encodings/undefined.pyo @@ -1274,7 +1280,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so -lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so lib/%%PYTHON_VERSION%%/lib-dynload/select.so lib/%%PYTHON_VERSION%%/lib-dynload/sha.so lib/%%PYTHON_VERSION%%/lib-dynload/strop.so @@ -1284,7 +1289,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so lib/%%PYTHON_VERSION%%/lib-dynload/time.so lib/%%PYTHON_VERSION%%/lib-dynload/timing.so lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so -lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so lib/%%PYTHON_VERSION%%/lib-old/Para.py lib/%%PYTHON_VERSION%%/lib-old/Para.pyc @@ -1691,11 +1695,12 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest +lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/integer.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest @@ -1715,7 +1720,9 @@ lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest -lib/%%PYTHON_VERSION%%/test/decimaltestdata/trim.decTest +lib/%%PYTHON_VERSION%%/test/doctest_aliases.py +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc +lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo lib/%%PYTHON_VERSION%%/test/double_const.py lib/%%PYTHON_VERSION%%/test/double_const.pyc lib/%%PYTHON_VERSION%%/test/double_const.pyo @@ -1761,7 +1768,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_resource lib/%%PYTHON_VERSION%%/test/output/test_rgbimg -lib/%%PYTHON_VERSION%%/test/output/test_rotor lib/%%PYTHON_VERSION%%/test/output/test_scope lib/%%PYTHON_VERSION%%/test/output/test_signal lib/%%PYTHON_VERSION%%/test/output/test_thread @@ -1769,7 +1775,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types lib/%%PYTHON_VERSION%%/test/output/test_winreg -lib/%%PYTHON_VERSION%%/test/output/test_xreadline lib/%%PYTHON_VERSION%%/test/output/xmltests lib/%%PYTHON_VERSION%%/test/pickletester.py lib/%%PYTHON_VERSION%%/test/pickletester.pyc @@ -1795,6 +1800,9 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo lib/%%PYTHON_VERSION%%/test/reperf.py lib/%%PYTHON_VERSION%%/test/reperf.pyc lib/%%PYTHON_VERSION%%/test/reperf.pyo +lib/%%PYTHON_VERSION%%/test/sample_doctest.py +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc +lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo lib/%%PYTHON_VERSION%%/test/seq_tests.py lib/%%PYTHON_VERSION%%/test/seq_tests.pyc lib/%%PYTHON_VERSION%%/test/seq_tests.pyo @@ -1971,6 +1979,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo lib/%%PYTHON_VERSION%%/test/test_compile.py lib/%%PYTHON_VERSION%%/test/test_compile.pyc lib/%%PYTHON_VERSION%%/test/test_compile.pyo +lib/%%PYTHON_VERSION%%/test/test_compiler.py +lib/%%PYTHON_VERSION%%/test/test_compiler.pyc +lib/%%PYTHON_VERSION%%/test/test_compiler.pyo lib/%%PYTHON_VERSION%%/test/test_complex.py lib/%%PYTHON_VERSION%%/test/test_complex.pyc lib/%%PYTHON_VERSION%%/test/test_complex.pyo @@ -2025,6 +2036,7 @@ lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo lib/%%PYTHON_VERSION%%/test/test_difflib.py lib/%%PYTHON_VERSION%%/test/test_difflib.pyc lib/%%PYTHON_VERSION%%/test/test_difflib.pyo +lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html lib/%%PYTHON_VERSION%%/test/test_dircache.py lib/%%PYTHON_VERSION%%/test/test_dircache.pyc lib/%%PYTHON_VERSION%%/test/test_dircache.pyo @@ -2040,9 +2052,11 @@ lib/%%PYTHON_VERSION%%/test/test_dl.pyo lib/%%PYTHON_VERSION%%/test/test_doctest.py lib/%%PYTHON_VERSION%%/test/test_doctest.pyc lib/%%PYTHON_VERSION%%/test/test_doctest.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest.txt lib/%%PYTHON_VERSION%%/test/test_doctest2.py lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo +lib/%%PYTHON_VERSION%%/test/test_doctest2.txt lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo @@ -2280,9 +2294,6 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo lib/%%PYTHON_VERSION%%/test/test_module.py lib/%%PYTHON_VERSION%%/test/test_module.pyc lib/%%PYTHON_VERSION%%/test/test_module.pyo -lib/%%PYTHON_VERSION%%/test/test_mpz.py -lib/%%PYTHON_VERSION%%/test/test_mpz.pyc -lib/%%PYTHON_VERSION%%/test/test_mpz.pyo lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo @@ -2334,6 +2345,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_parser.py lib/%%PYTHON_VERSION%%/test/test_parser.pyc lib/%%PYTHON_VERSION%%/test/test_parser.pyo +lib/%%PYTHON_VERSION%%/test/test_peepholer.py +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc +lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo lib/%%PYTHON_VERSION%%/test/test_pep247.py lib/%%PYTHON_VERSION%%/test/test_pep247.pyc lib/%%PYTHON_VERSION%%/test/test_pep247.pyo @@ -2343,6 +2357,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo lib/%%PYTHON_VERSION%%/test/test_pep277.py lib/%%PYTHON_VERSION%%/test/test_pep277.pyc lib/%%PYTHON_VERSION%%/test/test_pep277.pyo +lib/%%PYTHON_VERSION%%/test/test_pep292.py +lib/%%PYTHON_VERSION%%/test/test_pep292.pyc +lib/%%PYTHON_VERSION%%/test/test_pep292.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo @@ -2430,9 +2447,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo lib/%%PYTHON_VERSION%%/test/test_robotparser.py lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo -lib/%%PYTHON_VERSION%%/test/test_rotor.py -lib/%%PYTHON_VERSION%%/test/test_rotor.pyc -lib/%%PYTHON_VERSION%%/test/test_rotor.pyo lib/%%PYTHON_VERSION%%/test/test_sax.py lib/%%PYTHON_VERSION%%/test/test_sax.pyc lib/%%PYTHON_VERSION%%/test/test_sax.pyo @@ -2604,6 +2618,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo lib/%%PYTHON_VERSION%%/test/test_unicodedata.py lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo +lib/%%PYTHON_VERSION%%/test/test_unittest.py +lib/%%PYTHON_VERSION%%/test/test_unittest.pyc +lib/%%PYTHON_VERSION%%/test/test_unittest.pyo lib/%%PYTHON_VERSION%%/test/test_univnewlines.py lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo @@ -2616,6 +2633,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo lib/%%PYTHON_VERSION%%/test/test_urllib2.py lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib2net.py +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo lib/%%PYTHON_VERSION%%/test/test_urllibnet.py lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo @@ -2664,9 +2684,6 @@ lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo lib/%%PYTHON_VERSION%%/test/test_xrange.py lib/%%PYTHON_VERSION%%/test/test_xrange.pyc lib/%%PYTHON_VERSION%%/test/test_xrange.pyo -lib/%%PYTHON_VERSION%%/test/test_xreadline.py -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc -lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo lib/%%PYTHON_VERSION%%/test/test_zipfile.py lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo @@ -2931,7 +2948,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py -%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py |