aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2009-06-09 06:30:55 +0800
committermiwi <miwi@FreeBSD.org>2009-06-09 06:30:55 +0800
commitad6dcb178b410931b8a584938b44fc4da53756f8 (patch)
tree8ce0d77d48a49a1635170171ab0c9ebe5244ee5c /lang
parente4a324dde12b05e8afc0511401cb97ac0ae57582 (diff)
downloadfreebsd-ports-gnome-ad6dcb178b410931b8a584938b44fc4da53756f8.tar.gz
freebsd-ports-gnome-ad6dcb178b410931b8a584938b44fc4da53756f8.tar.zst
freebsd-ports-gnome-ad6dcb178b410931b8a584938b44fc4da53756f8.zip
- Update lang/python26 and make Python 2.6.2 to the default Python version
Tested by: 3 pointyhat runs Thanks to: pav, gahr, lwhsu, mva, amdmi3
Diffstat (limited to 'lang')
-rw-r--r--lang/python-doc-html/Makefile22
-rw-r--r--lang/python-doc-html/distinfo18
-rw-r--r--lang/python/distinfo3
-rw-r--r--lang/python23/Makefile1
-rw-r--r--lang/python24/Makefile1
-rw-r--r--lang/python25/Makefile1
-rw-r--r--lang/python26/Makefile4
-rw-r--r--lang/python26/distinfo6
-rw-r--r--lang/python26/files/patch-Python2.6-Lib_local.py11
-rw-r--r--lang/python26/pkg-plist24
-rw-r--r--lang/python27/Makefile4
-rw-r--r--lang/python27/distinfo6
-rw-r--r--lang/python27/files/patch-Python2.6-Lib_local.py11
-rw-r--r--lang/python27/pkg-plist24
14 files changed, 95 insertions, 41 deletions
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index b3ca245a668f..3479a7c4f285 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -30,24 +30,24 @@ DOCFORMAT?= html
.if ${PYTHON_REL} < 260
.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "postscript-a4" && ${DOCFORMAT} != "postscript-letter"
-.BEGIN:
- @${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
- @${ECHO} "Possible values are: html, pdf-a4, pdf-letter,"
- @${ECHO} "postscript-a4, postscript-letter."
- @${FALSE}
+IGNORE= invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: html, pdf-a4, pdf-letter, postscript-a4, postscript-letter
.endif
.else # ${PYTHON_REL} >= 260
-.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter"
-.BEGIN:
- @${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
- @${ECHO} "Possible values are: html, pdf-a4, pdf-letter."
- @${FALSE}
+.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
+IGNORE= invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
.endif
+.if ${PYTHON_REL} < 260
DISTNAME= python-docs-${DOCFORMAT}
+.else
+DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT}
+.endif
DIST_SUBDIR= python${PYTHON_REL}
+
.if ${DOCFORMAT} == "html"
WRKSRC= ${WRKDIR}/${DISTNAME}
+.elif ${DOCFORMAT} == "text"
+WRKSRC= ${WRKDIR}/${DISTNAME}
.else
WRKSRC= ${WRKDIR}/docs-pdf
.endif # ${DOCSFORMAT} == "html"
@@ -64,6 +64,6 @@ pre-install:
do-install:
@${MKDIR} ${DOCDIR}
- @${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf -
+ @${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf -
.include <bsd.port.post.mk>
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index c3130e2004c5..131598080ca1 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -117,9 +117,15 @@ MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf
MD5 (python260/python-docs-html.tar.bz2) = cfcd4b9b00ba1e7496b5d823692370a4
MD5 (python260/python-docs-pdf-a4.tar.bz2) = d5e1fd4e178887d2b42a619da15bfcbd
MD5 (python260/python-docs-pdf-letter.tar.bz2) = 7b7ee0c4fe014eaa14862a1a4c71701e
+MD5 (python260/python-docs-text.tar.bz2) = e2d4dea9a16b150327f5e80413dbc41e
MD5 (python261/python-docs-html.tar.bz2) = 269233817c4275f32c4163fa5883514b
MD5 (python261/python-docs-pdf-a4.tar.bz2) = 7b5359211bf6fc986b0b6ed42c8a15e5
MD5 (python261/python-docs-pdf-letter.tar.bz2) = 3519a319ab0b14df186991ac101b246c
+MD5 (python261/python-docs-text.tar.bz2) = 0786ef8140a2a0f4a22aef2fa7e53ad1
+MD5 (python262/python-2.6.2-docs-html.tar.bz2) = 15a2dac727692e4ff8fe92958d4e633c
+MD5 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 42a2cccfea5b8623ddd210a95fa5f6fa
+MD5 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = b3b522bbd2d5c3330814fabc66c76f75
+MD5 (python262/python-2.6.2-docs-text.tar.bz2) = 86630b32c2df6af25d9cb03678e2d8d1
SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e
SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b
SHA256 (python/html-2.1.1.tar.bz2) = 4694db0306f86b76a1a9fd92c20abf896950c3334e6ca736bb37e6cdb624fb96
@@ -239,9 +245,15 @@ SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d4
SHA256 (python260/python-docs-html.tar.bz2) = e9c39e51fc19c6ec367f41cd47c0831bc1e4f4c6d615dccfd37337cd7843ae0a
SHA256 (python260/python-docs-pdf-a4.tar.bz2) = efddc99e33933c6ca898551db9252592fd0a3f18904f53a5b0c0d41d4de393a4
SHA256 (python260/python-docs-pdf-letter.tar.bz2) = a3bc9b18b2a77fdd73c2779632324e6c83e5c56472dfd80ba60714073b963887
+SHA256 (python260/python-docs-text.tar.bz2) = 72607230bbb1e4cabb171a469031abcc8251384324d22e1c077008505f77983b
SHA256 (python261/python-docs-html.tar.bz2) = 941015c02b15a9e94f228f4c9df745a00295d6a3e05362ed4b39f45f771756bc
SHA256 (python261/python-docs-pdf-a4.tar.bz2) = dc7c505509a26e03f276b8b5602fe488a37a02529ccc1cc75305fc611934883d
SHA256 (python261/python-docs-pdf-letter.tar.bz2) = f61492f6064efadc06c1fcbb2e8c96036fc6c41d892720bc40b28d1bf271eb19
+SHA256 (python261/python-docs-text.tar.bz2) = ada6830413c1aca87d6c1b87c1aa2704f80b49b5ebfe28a499ec84ec661ea4f7
+SHA256 (python262/python-2.6.2-docs-html.tar.bz2) = 63f844a24155536eaeb2cede72bba5a4b4a404d790e52e210e374360840817aa
+SHA256 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = a40d6ffb0ffbe9f3ace1d28559a96beb19218f2e5fa366c66dd42520b18bdc27
+SHA256 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 20409bd1e33930be17b1a0d7fb5e098641be10c252b68bcac3205efa5aa21ef2
+SHA256 (python262/python-2.6.2-docs-text.tar.bz2) = f7d8c6aaece010bfaf374322cc782816fffe232f7fb440f34f585adfd6e94b04
SIZE (python/html-2.0.1.tar.bz2) = 704567
SIZE (python/html-2.0.tar.bz2) = 699404
SIZE (python/html-2.1.1.tar.bz2) = 792096
@@ -360,6 +372,12 @@ SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655
SIZE (python260/python-docs-html.tar.bz2) = 3445776
SIZE (python260/python-docs-pdf-a4.tar.bz2) = 8804548
SIZE (python260/python-docs-pdf-letter.tar.bz2) = 8847332
+SIZE (python260/python-docs-text.tar.bz2) = 1212751
SIZE (python261/python-docs-html.tar.bz2) = 3669921
SIZE (python261/python-docs-pdf-a4.tar.bz2) = 8599690
SIZE (python261/python-docs-pdf-letter.tar.bz2) = 8644103
+SIZE (python261/python-docs-text.tar.bz2) = 1275822
+SIZE (python262/python-2.6.2-docs-html.tar.bz2) = 3660453
+SIZE (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 8589380
+SIZE (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 8626189
+SIZE (python262/python-2.6.2-docs-text.tar.bz2) = 1297095
diff --git a/lang/python/distinfo b/lang/python/distinfo
index 3ee527e0090f..1289b492d8d2 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -26,6 +26,7 @@ MD5 (python/Python-2.5.4.tgz) = ad47b23778f64edadaaa8b5534986eed
MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95
MD5 (python/Python-2.6.tgz) = d16d29a77db2cd3af882a591f431a403
MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
+MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d
MD5 (python/Python-3.0.tgz) = ac1d8aa55bd6d04232cd96abfa445ac4
MD5 (python/Python-3.0.1.tgz) = 220b73f0a1a20c4b1cdf9f9db4cd52fe
SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f
@@ -56,6 +57,7 @@ SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee92322
SHA256 (python/Python-2.6.tgz) = 7c2f21a968a737a59ed0729f4b1dc154dc3aa183c20be96055186fe43c6742d0
SHA256 (python/Python-2.5.4.tgz) = 3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6
SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
+SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86
SHA256 (python/Python-3.0.tgz) = 4d5d6ab2f893144a382ae1ea1de88a7825eb98111e26cfde627b9f3d9fd462b4
SHA256 (python/Python-3.0.1.tgz) = 7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de
SIZE (python/Python-2.1.1.tgz) = 6187808
@@ -85,6 +87,7 @@ SIZE (python/Python-2.5.2.tgz) = 11583114
SIZE (python/Python-2.5.tgz) = 11019675
SIZE (python/Python-2.6.tgz) = 13023860
SIZE (python/Python-2.6.1.tgz) = 13046455
+SIZE (python/Python-2.6.2.tgz) = 13281177
SIZE (python/Python-2.5.4.tgz) = 11604497
SIZE (python/Python-3.0.tgz) = 11191348
SIZE (python/Python-3.0.1.tgz) = 11258272
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index b01cee877452..4212063fe6e0 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}"
MAKE_ENV= VPATH="${WRKSRC}"
USE_LDCONFIG= yes
INSTALL_TARGET= altinstall
+MAKE_JOBS_SAFE= yes
MAN1= ${PYTHON_VERSION}.1
USE_PYTHON= yes
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 1fc6ef5ef260..80c45a90a5a0 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}"
MAKE_ENV= VPATH="${WRKSRC}"
USE_LDCONFIG= yes
INSTALL_TARGET= altinstall
+MAKE_JOBS_SAFE= yes
MAN1= ${PYTHON_VERSION}.1
USE_PYTHON= yes
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index bba457978abf..4d17a756badd 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -24,6 +24,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
INSTALL_TARGET= altinstall
+MAKE_JOBS_SAFE= yes
MAN1= ${PYTHON_VERSION}.1
USE_PYTHON= yes
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index f1c4fd4179c2..f5af28376c72 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python26
-PORTVERSION= 2.6.1
-PORTREVISION= 2
+PORTVERSION= 2.6.2
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -23,6 +22,7 @@ CONFIGURE_SCRIPT= ../configure # must be relative
CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 9873696d2db4..508577e84313 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
-SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
-SIZE (python/Python-2.6.1.tgz) = 13046455
+MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d
+SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86
+SIZE (python/Python-2.6.2.tgz) = 13281177
diff --git a/lang/python26/files/patch-Python2.6-Lib_local.py b/lang/python26/files/patch-Python2.6-Lib_local.py
new file mode 100644
index 000000000000..63e722f38839
--- /dev/null
+++ b/lang/python26/files/patch-Python2.6-Lib_local.py
@@ -0,0 +1,11 @@
+--- Lib/locale.py.foo 2009-05-11 22:57:00.000000000 +0200
++++ Lib/locale.py 2009-05-11 22:57:23.000000000 +0200
+@@ -601,7 +601,7 @@
+ 'tactis': 'TACTIS',
+ 'euc_jp': 'eucJP',
+ 'euc_kr': 'eucKR',
+- 'utf_8': 'UTF8',
++ 'utf_8': 'UTF-8',
+ 'koi8_r': 'KOI8-R',
+ 'koi8_u': 'KOI8-U',
+ # XXX This list is still incomplete. If you know more
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index d671d39276de..0159a76637c5 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -342,12 +342,17 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/distutils/tests/test_build_ext.py
%%PYTHON_LIBDIR%%/distutils/tests/test_build_py.py
%%PYTHON_LIBDIR%%/distutils/tests/test_build_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_wininst.py
%%PYTHON_LIBDIR%%/distutils/tests/test_config.py
%%PYTHON_LIBDIR%%/distutils/tests/test_core.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_filelist.py
%%PYTHON_LIBDIR%%/distutils/tests/test_dist.py
%%PYTHON_LIBDIR%%/distutils/tests/test_install.py
%%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py
%%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_sdist.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_register.py
%%PYTHON_LIBDIR%%/distutils/tests/test_upload.py
%%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py
%%PYTHON_LIBDIR%%/distutils/text_file.py
@@ -685,9 +690,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/json/tool.py
%%PYTHON_LIBDIR%%/keyword.py
%%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.2.final.0.pickle
%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.2.final.0.pickle
%%PYTHON_LIBDIR%%/lib2to3/__init__.py
%%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
%%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -701,16 +706,13 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_has_key.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_idioms.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_isinstance.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_import.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports2.py
@@ -732,6 +734,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raw_input.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_renames.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_repr.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_reduce.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_standarderror.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_sys_exc.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_throw.py
@@ -758,7 +761,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/pytree.py
%%PYTHON_LIBDIR%%/lib2to3/refactor.py
%%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py
-%%PYTHON_LIBDIR%%/lib2to3/tests/benchmark.py
%%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py
%%PYTHON_LIBDIR%%/lib2to3/tests/support.py
%%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py
@@ -1002,8 +1004,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/cmath_testcases.txt
%%PYTHON_LIBDIR%%/test/curses_tests.py
%%PYTHON_LIBDIR%%/test/test_future5.py
-%%PYTHON_LIBDIR%%/test/test_future5.pyc
-%%PYTHON_LIBDIR%%/test/test_future5.pyo
%%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
%%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
%%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
@@ -1555,6 +1555,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_zipfile.py
%%PYTHON_LIBDIR%%/test/test_zipfile64.py
%%PYTHON_LIBDIR%%/test/test_zipimport.py
+%%PYTHON_LIBDIR%%/test/test_zipimport_support.py
+%%PYTHON_LIBDIR%%/test/zipdir.zip
%%PYTHON_LIBDIR%%/test/test_zlib.py
%%PYTHON_LIBDIR%%/test/testall.py
%%PYTHON_LIBDIR%%/test/testcodec.py
@@ -1625,6 +1627,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/xmllib.py
%%PYTHON_LIBDIR%%/xmlrpclib.py
%%PYTHON_LIBDIR%%/zipfile.py
+lib/libpython2.6.a
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh
@@ -2102,6 +2105,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pysource.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent-rst.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/setup.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/smtpd.py
@@ -2162,7 +2166,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen/bgen
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@unexec /bin/rm -fr %D/share/%%PYTHON_VERSION%%/Tools || true
+%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index f1c4fd4179c2..f5af28376c72 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= python26
-PORTVERSION= 2.6.1
-PORTREVISION= 2
+PORTVERSION= 2.6.2
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -23,6 +22,7 @@ CONFIGURE_SCRIPT= ../configure # must be relative
CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
INSTALL_TARGET= altinstall
MAN1= ${PYTHON_VERSION}.1
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 9873696d2db4..508577e84313 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4
-SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c
-SIZE (python/Python-2.6.1.tgz) = 13046455
+MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d
+SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86
+SIZE (python/Python-2.6.2.tgz) = 13281177
diff --git a/lang/python27/files/patch-Python2.6-Lib_local.py b/lang/python27/files/patch-Python2.6-Lib_local.py
new file mode 100644
index 000000000000..63e722f38839
--- /dev/null
+++ b/lang/python27/files/patch-Python2.6-Lib_local.py
@@ -0,0 +1,11 @@
+--- Lib/locale.py.foo 2009-05-11 22:57:00.000000000 +0200
++++ Lib/locale.py 2009-05-11 22:57:23.000000000 +0200
+@@ -601,7 +601,7 @@
+ 'tactis': 'TACTIS',
+ 'euc_jp': 'eucJP',
+ 'euc_kr': 'eucKR',
+- 'utf_8': 'UTF8',
++ 'utf_8': 'UTF-8',
+ 'koi8_r': 'KOI8-R',
+ 'koi8_u': 'KOI8-U',
+ # XXX This list is still incomplete. If you know more
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index d671d39276de..0159a76637c5 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -342,12 +342,17 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/distutils/tests/test_build_ext.py
%%PYTHON_LIBDIR%%/distutils/tests/test_build_py.py
%%PYTHON_LIBDIR%%/distutils/tests/test_build_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_wininst.py
%%PYTHON_LIBDIR%%/distutils/tests/test_config.py
%%PYTHON_LIBDIR%%/distutils/tests/test_core.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_filelist.py
%%PYTHON_LIBDIR%%/distutils/tests/test_dist.py
%%PYTHON_LIBDIR%%/distutils/tests/test_install.py
%%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py
%%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_sdist.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_register.py
%%PYTHON_LIBDIR%%/distutils/tests/test_upload.py
%%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py
%%PYTHON_LIBDIR%%/distutils/text_file.py
@@ -685,9 +690,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/json/tool.py
%%PYTHON_LIBDIR%%/keyword.py
%%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.2.final.0.pickle
%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.2.final.0.pickle
%%PYTHON_LIBDIR%%/lib2to3/__init__.py
%%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
%%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -701,16 +706,13 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo
-%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_has_key.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_idioms.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_isinstance.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_import.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports2.py
@@ -732,6 +734,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raw_input.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_renames.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_repr.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_reduce.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_standarderror.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_sys_exc.py
%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_throw.py
@@ -758,7 +761,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib2to3/pytree.py
%%PYTHON_LIBDIR%%/lib2to3/refactor.py
%%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py
-%%PYTHON_LIBDIR%%/lib2to3/tests/benchmark.py
%%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py
%%PYTHON_LIBDIR%%/lib2to3/tests/support.py
%%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py
@@ -1002,8 +1004,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/cmath_testcases.txt
%%PYTHON_LIBDIR%%/test/curses_tests.py
%%PYTHON_LIBDIR%%/test/test_future5.py
-%%PYTHON_LIBDIR%%/test/test_future5.pyc
-%%PYTHON_LIBDIR%%/test/test_future5.pyo
%%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
%%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
%%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
@@ -1555,6 +1555,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/test/test_zipfile.py
%%PYTHON_LIBDIR%%/test/test_zipfile64.py
%%PYTHON_LIBDIR%%/test/test_zipimport.py
+%%PYTHON_LIBDIR%%/test/test_zipimport_support.py
+%%PYTHON_LIBDIR%%/test/zipdir.zip
%%PYTHON_LIBDIR%%/test/test_zlib.py
%%PYTHON_LIBDIR%%/test/testall.py
%%PYTHON_LIBDIR%%/test/testcodec.py
@@ -1625,6 +1627,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/xmllib.py
%%PYTHON_LIBDIR%%/xmlrpclib.py
%%PYTHON_LIBDIR%%/zipfile.py
+lib/libpython2.6.a
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README
%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh
@@ -2102,6 +2105,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pysource.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent-rst.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/setup.py
%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/smtpd.py
@@ -2162,7 +2166,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen/bgen
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@unexec /bin/rm -fr %D/share/%%PYTHON_VERSION%%/Tools || true
+%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools
%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib
%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml