Index: Mk/bsd.python.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.python.mk,v
retrieving revision 1.119
diff -u -r1.119 bsd.python.mk
--- Mk/bsd.python.mk	12 May 2010 12:13:06 -0000	1.119
+++ Mk/bsd.python.mk	15 Aug 2010 09:11:25 -0000
@@ -214,7 +214,7 @@
 #
 
 _PYTHON_PORTBRANCH=		2.6
-_PYTHON_ALLBRANCHES=	2.6 2.5 2.4 3.1 # preferred first
+_PYTHON_ALLBRANCHES=		2.6 2.5 2.4 2.7 3.1 # preferred first
 _ZOPE_PORTBRANCH=		2.7
 _ZOPE_ALLBRANCHES=		2.7 2.8 2.9 2.10 3.2
 
@@ -377,6 +377,14 @@
 PYTHON_SUFFIX=		31
 PYTHON_VER=			3.1
 
+# Python-2.7
+.elif ${PYTHON_VERSION} == "python2.7"
+PYTHON_PORTVERSION?=2.7
+PYTHON_PORTSDIR=	${PORTSDIR}/lang/python27
+PYTHON_REL=			270
+PYTHON_SUFFIX=		27
+PYTHON_VER=			2.7
+
 # Python-2.6
 .elif ${PYTHON_VERSION} == "python2.6"
 PYTHON_PORTVERSION?=2.6.5
@@ -418,6 +426,7 @@
 	@${ECHO} "  python2.4"
 	@${ECHO} "  python2.5"
 	@${ECHO} "  python2.6 (default)"
+	@${ECHO} "  python2.7"
 	@${ECHO} "  python3.1"
 	@${FALSE}
 .endif
Index: lang/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/Makefile,v
retrieving revision 1.691
diff -u -r1.691 Makefile
--- lang/Makefile	13 Aug 2010 01:34:26 -0000	1.691
+++ lang/Makefile	15 Aug 2010 09:11:25 -0000
@@ -277,6 +277,7 @@
     SUBDIR += python24
     SUBDIR += python25
     SUBDIR += python26
+    SUBDIR += python27
     SUBDIR += python31
     SUBDIR += q
     SUBDIR += qore
Index: lang/python27/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/python27/Makefile,v
retrieving revision 1.167
diff -u -r1.167 Makefile
--- lang/python27/Makefile	15 Aug 2010 05:10:43 -0000	1.167
+++ lang/python27/Makefile	15 Aug 2010 09:11:25 -0000
@@ -4,8 +4,8 @@
 #
 # $FreeBSD: ports/lang/python27/Makefile,v 1.167 2010/08/15 05:10:43 lwhsu Exp $
 
-PORTNAME=	python26
-PORTVERSION=	2.6.5
+PORTNAME=	python27
+PORTVERSION=	2.7.0
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -27,7 +27,7 @@
 MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.6
+PYTHON_VERSION=	python2.7
 PYTHON_NO_DEPENDS=	yes
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
@@ -38,8 +38,7 @@
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
 
-PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 \
-		plat-freebsd7 plat-freebsd8 plat-freebsd9
+PLATFORMS=	plat-freebsd6 plat-freebsd7 plat-freebsd8 plat-freebsd9
 
 BIN_SCRIPTS=	2to3 idle pydoc smtpd.py
 BIN_FILES=	python python-shared python-config python-shared-config \
@@ -163,7 +162,8 @@
 		's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \
 		${PATCH_WRKSRC}/Lib/site.py
 	${REINPLACE_CMD} -e \
-		's|^	\(..ASDLGEN.*\)$$|	${TRUE}|g' \
+		's|^	\(..ASDLGEN.*\)$$|	${TRUE}|g; \
+		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${PATCH_WRKSRC}/Makefile.pre.in
 
 	${REINPLACE_CMD} -e \
@@ -215,7 +215,9 @@
 
 pre-install:
 	${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \
-	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	> ${PLIST}
+	/LIBDIR.*\.py$$/ && \
+	!/\/bad|tests\/data/ \
+	{ print $$0 "o"; print $$0 "c"; }'      > ${PLIST}
 
 	@# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed
 	([ -f ${WRKSRC}/.without_own_sha ] && \
Index: lang/python27/distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/python27/distinfo,v
retrieving revision 1.62
diff -u -r1.62 distinfo
--- lang/python27/distinfo	15 Aug 2010 05:10:43 -0000	1.62
+++ lang/python27/distinfo	15 Aug 2010 09:11:25 -0000
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.6.5.tgz) = cd04b5b9383b6c1fccdaa991af762cf4
-SHA256 (python/Python-2.6.5.tgz) = b331dafdce3361834fee783795d4f68ae7cf7d379e9137c2d8e8531cea615ede
-SIZE (python/Python-2.6.5.tgz) = 13209175
+MD5 (python/Python-2.7.tgz) = 35f56b092ecf39a6bd59d64f142aae0f
+SHA256 (python/Python-2.7.tgz) = 5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5
+SIZE (python/Python-2.7.tgz) = 14026384
Index: lang/python27/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/python27/pkg-plist,v
retrieving revision 1.81
diff -u -r1.81 pkg-plist
--- lang/python27/pkg-plist	15 Aug 2010 05:10:43 -0000	1.81
+++ lang/python27/pkg-plist	15 Aug 2010 09:11:25 -0000
@@ -1,3 +1,4 @@
+libdata/pkgconfig/python-2.7.pc
 %%IF_DEFAULT%%bin/2to3
 bin/2to3-%%PYVER%%
 %%IF_DEFAULT%%bin/idle
@@ -37,6 +38,7 @@
 %%PYTHON_INCLUDEDIR%%/datetime.h
 %%PYTHON_INCLUDEDIR%%/descrobject.h
 %%PYTHON_INCLUDEDIR%%/dictobject.h
+%%PYTHON_INCLUDEDIR%%/dtoa.h
 %%PYTHON_INCLUDEDIR%%/enumobject.h
 %%PYTHON_INCLUDEDIR%%/errcode.h
 %%PYTHON_INCLUDEDIR%%/eval.h
@@ -55,6 +57,7 @@
 %%PYTHON_INCLUDEDIR%%/longintrepr.h
 %%PYTHON_INCLUDEDIR%%/longobject.h
 %%PYTHON_INCLUDEDIR%%/marshal.h
+%%PYTHON_INCLUDEDIR%%/memoryobject.h
 %%PYTHON_INCLUDEDIR%%/metagrammar.h
 %%PYTHON_INCLUDEDIR%%/methodobject.h
 %%PYTHON_INCLUDEDIR%%/modsupport.h
@@ -70,7 +73,9 @@
 %%PYTHON_INCLUDEDIR%%/pgenheaders.h
 %%PYTHON_INCLUDEDIR%%/py_curses.h
 %%PYTHON_INCLUDEDIR%%/pyarena.h
+%%PYTHON_INCLUDEDIR%%/pycapsule.h
 %%PYTHON_INCLUDEDIR%%/pyconfig.h
+%%PYTHON_INCLUDEDIR%%/pyctype.h
 %%PYTHON_INCLUDEDIR%%/pydebug.h
 %%PYTHON_INCLUDEDIR%%/pyerrors.h
 %%PYTHON_INCLUDEDIR%%/pyexpat.h
@@ -126,11 +131,15 @@
 %%PYTHON_LIBDIR%%/__future__.py
 %%PYTHON_LIBDIR%%/__phello__.foo.py
 %%PYTHON_LIBDIR%%/_abcoll.py
+%%PYTHON_LIBDIR%%/_pyio.py
 %%PYTHON_LIBDIR%%/_strptime.py
 %%PYTHON_LIBDIR%%/_threading_local.py
+%%PYTHON_LIBDIR%%/_weakrefset.py
 %%PYTHON_LIBDIR%%/abc.py
 %%PYTHON_LIBDIR%%/aifc.py
+%%PYTHON_LIBDIR%%/antigravity.py
 %%PYTHON_LIBDIR%%/anydbm.py
+%%PYTHON_LIBDIR%%/argparse.py
 %%PYTHON_LIBDIR%%/ast.py
 %%PYTHON_LIBDIR%%/asynchat.py
 %%PYTHON_LIBDIR%%/asyncore.py
@@ -154,11 +163,14 @@
 %%PYTHON_LIBDIR%%/bsddb/test/test_compare.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_compat.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_cursor_pget_bug.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_db.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_dbenv.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbobj.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbshelve.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbtables.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_distributed_transactions.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_early_close.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_fileid.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_get_none.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_join.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_lock.py
@@ -301,6 +313,7 @@
 %%PYTHON_LIBDIR%%/distutils/command/build_ext.py
 %%PYTHON_LIBDIR%%/distutils/command/build_py.py
 %%PYTHON_LIBDIR%%/distutils/command/build_scripts.py
+%%PYTHON_LIBDIR%%/distutils/command/check.py
 %%PYTHON_LIBDIR%%/distutils/command/clean.py
 %%PYTHON_LIBDIR%%/distutils/command/command_template
 %%PYTHON_LIBDIR%%/distutils/command/config.py
@@ -334,32 +347,52 @@
 %%PYTHON_LIBDIR%%/distutils/log.py
 %%PYTHON_LIBDIR%%/distutils/msvc9compiler.py
 %%PYTHON_LIBDIR%%/distutils/msvccompiler.py
-%%PYTHON_LIBDIR%%/distutils/mwerkscompiler.py
 %%PYTHON_LIBDIR%%/distutils/spawn.py
 %%PYTHON_LIBDIR%%/distutils/sysconfig.py
+%%PYTHON_LIBDIR%%/distutils/tests/Setup.sample
 %%PYTHON_LIBDIR%%/distutils/tests/__init__.py
 %%PYTHON_LIBDIR%%/distutils/tests/setuptools_build_ext.py
 %%PYTHON_LIBDIR%%/distutils/tests/setuptools_extension.py
 %%PYTHON_LIBDIR%%/distutils/tests/support.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_archive_util.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_dumb.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_msi.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_rpm.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_build.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_build_clib.py
 %%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_ccompiler.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_check.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_clean.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_cmd.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_config.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_config_cmd.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_core.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_dep_util.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_dir_util.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_file_util.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_data.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_install_headers.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_install_lib.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_spawn.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_unixccompiler.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_text_file.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_upload.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_unixccompiler.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_util.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_version.py
 %%PYTHON_LIBDIR%%/distutils/text_file.py
 %%PYTHON_LIBDIR%%/distutils/unixccompiler.py
 %%PYTHON_LIBDIR%%/distutils/util.py
@@ -471,6 +504,7 @@
 %%PYTHON_LIBDIR%%/encodings/cp424.py
 %%PYTHON_LIBDIR%%/encodings/cp437.py
 %%PYTHON_LIBDIR%%/encodings/cp500.py
+%%PYTHON_LIBDIR%%/encodings/cp720.py
 %%PYTHON_LIBDIR%%/encodings/cp737.py
 %%PYTHON_LIBDIR%%/encodings/cp775.py
 %%PYTHON_LIBDIR%%/encodings/cp850.py
@@ -478,6 +512,7 @@
 %%PYTHON_LIBDIR%%/encodings/cp855.py
 %%PYTHON_LIBDIR%%/encodings/cp856.py
 %%PYTHON_LIBDIR%%/encodings/cp857.py
+%%PYTHON_LIBDIR%%/encodings/cp858.py
 %%PYTHON_LIBDIR%%/encodings/cp860.py
 %%PYTHON_LIBDIR%%/encodings/cp861.py
 %%PYTHON_LIBDIR%%/encodings/cp862.py
@@ -631,6 +666,7 @@
 %%PYTHON_LIBDIR%%/idlelib/RemoteDebugger.py
 %%PYTHON_LIBDIR%%/idlelib/RemoteObjectBrowser.py
 %%PYTHON_LIBDIR%%/idlelib/ReplaceDialog.py
+%%PYTHON_LIBDIR%%/idlelib/RstripExtension.py
 %%PYTHON_LIBDIR%%/idlelib/ScriptBinding.py
 %%PYTHON_LIBDIR%%/idlelib/ScrolledList.py
 %%PYTHON_LIBDIR%%/idlelib/SearchDialog.py
@@ -671,6 +707,7 @@
 %%PYTHON_LIBDIR%%/ihooks.py
 %%PYTHON_LIBDIR%%/imaplib.py
 %%PYTHON_LIBDIR%%/imghdr.py
+%%PYTHON_LIBDIR%%/importlib/__init__.py
 %%PYTHON_LIBDIR%%/imputil.py
 %%PYTHON_LIBDIR%%/inspect.py
 %%PYTHON_LIBDIR%%/io.py
@@ -679,6 +716,7 @@
 %%PYTHON_LIBDIR%%/json/encoder.py
 %%PYTHON_LIBDIR%%/json/scanner.py
 %%PYTHON_LIBDIR%%/json/tests/__init__.py
+%%PYTHON_LIBDIR%%/json/tests/test_check_circular.py
 %%PYTHON_LIBDIR%%/json/tests/test_decode.py
 %%PYTHON_LIBDIR%%/json/tests/test_default.py
 %%PYTHON_LIBDIR%%/json/tests/test_dump.py
@@ -697,9 +735,9 @@
 %%PYTHON_LIBDIR%%/json/tool.py
 %%PYTHON_LIBDIR%%/keyword.py
 %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.5.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.7.0.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
-%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.5.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.7.0.final.0.pickle
 %%PYTHON_LIBDIR%%/lib2to3/__init__.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
 %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
@@ -714,6 +752,7 @@
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exitfunc.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py
@@ -769,6 +808,22 @@
 %%PYTHON_LIBDIR%%/lib2to3/pytree.py
 %%PYTHON_LIBDIR%%/lib2to3/refactor.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/README
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/bom.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/crlf.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/different_encoding.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/bad_order.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_explicit.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_first.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_last.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_parrot.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/fix_preorder.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/no_fixer_cls.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/parrot_example.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/infinite_recursion.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/py2_test_grammar.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/data/py3_test_grammar.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/support.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py
@@ -778,9 +833,8 @@
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_pytree.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_refactor.py
 %%PYTHON_LIBDIR%%/lib2to3/tests/test_util.py
-%%PYTHON_LIBDIR%%/lib-dynload/Python-%%PYVER_WITHPAT%%-py%%PYVER%%.egg-info
+%%PYTHON_LIBDIR%%/lib-dynload/Python-%%PYVER%%-py%%PYVER%%.egg-info
 %%PYTHON_LIBDIR%%/lib-dynload/_bisect.so
-%%PYTHON_LIBDIR%%/lib-dynload/_bytesio.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_cn.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_hk.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_iso2022.so
@@ -791,14 +845,12 @@
 %%PYTHON_LIBDIR%%/lib-dynload/_csv.so
 %%PYTHON_LIBDIR%%/lib-dynload/_ctypes.so
 %%PYTHON_LIBDIR%%/lib-dynload/_ctypes_test.so
-%%PYTHON_LIBDIR%%/lib-dynload/_curses.so
-%%PYTHON_LIBDIR%%/lib-dynload/_curses_panel.so
 %%PYTHON_LIBDIR%%/lib-dynload/_elementtree.so
-%%PYTHON_LIBDIR%%/lib-dynload/_fileio.so
 %%PYTHON_LIBDIR%%/lib-dynload/_functools.so
 %%PYTHON_LIBDIR%%/lib-dynload/_hashlib.so
 %%PYTHON_LIBDIR%%/lib-dynload/_heapq.so
 %%PYTHON_LIBDIR%%/lib-dynload/_hotshot.so
+%%PYTHON_LIBDIR%%/lib-dynload/_io.so
 %%PYTHON_LIBDIR%%/lib-dynload/_json.so
 %%PYTHON_LIBDIR%%/lib-dynload/_locale.so
 %%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
@@ -855,12 +907,24 @@
 %%PYTHON_LIBDIR%%/lib-tk/Tkconstants.py
 %%PYTHON_LIBDIR%%/lib-tk/Tkdnd.py
 %%PYTHON_LIBDIR%%/lib-tk/Tkinter.py
+%%PYTHON_LIBDIR%%/lib-tk/test/README
+%%PYTHON_LIBDIR%%/lib-tk/test/runtktests.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/__init__.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_text.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/__init__.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/support.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_extensions.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_functions.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_style.py
+%%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_widgets.py
 %%PYTHON_LIBDIR%%/lib-tk/tkColorChooser.py
 %%PYTHON_LIBDIR%%/lib-tk/tkCommonDialog.py
 %%PYTHON_LIBDIR%%/lib-tk/tkFileDialog.py
 %%PYTHON_LIBDIR%%/lib-tk/tkFont.py
 %%PYTHON_LIBDIR%%/lib-tk/tkMessageBox.py
 %%PYTHON_LIBDIR%%/lib-tk/tkSimpleDialog.py
+%%PYTHON_LIBDIR%%/lib-tk/ttk.py
 %%PYTHON_LIBDIR%%/lib-tk/turtle.py
 %%PYTHON_LIBDIR%%/linecache.py
 %%PYTHON_LIBDIR%%/locale.py
@@ -910,10 +974,6 @@
 %%PYTHON_LIBDIR%%/pickletools.py
 %%PYTHON_LIBDIR%%/pipes.py
 %%PYTHON_LIBDIR%%/pkgutil.py
-%%PYTHON_LIBDIR%%/plat-freebsd4/IN.py
-%%PYTHON_LIBDIR%%/plat-freebsd4/regen
-%%PYTHON_LIBDIR%%/plat-freebsd5/IN.py
-%%PYTHON_LIBDIR%%/plat-freebsd5/regen
 %%PYTHON_LIBDIR%%/plat-freebsd6/IN.py
 %%PYTHON_LIBDIR%%/plat-freebsd6/regen
 %%PYTHON_LIBDIR%%/plat-freebsd7/IN.py
@@ -935,7 +995,8 @@
 %%PYTHON_LIBDIR%%/py_compile.py
 %%PYTHON_LIBDIR%%/pyclbr.py
 %%PYTHON_LIBDIR%%/pydoc.py
-%%PYTHON_LIBDIR%%/pydoc_topics.py
+%%PYTHON_LIBDIR%%/pydoc_data/__init__.py
+%%PYTHON_LIBDIR%%/pydoc_data/topics.py
 %%PYTHON_LIBDIR%%/quopri.py
 %%PYTHON_LIBDIR%%/random.py
 %%PYTHON_LIBDIR%%/re.py
@@ -987,12 +1048,12 @@
 %%PYTHON_LIBDIR%%/sunaudio.py
 %%PYTHON_LIBDIR%%/symbol.py
 %%PYTHON_LIBDIR%%/symtable.py
+%%PYTHON_LIBDIR%%/sysconfig.py
 %%PYTHON_LIBDIR%%/tabnanny.py
 %%PYTHON_LIBDIR%%/tarfile.py
 %%PYTHON_LIBDIR%%/telnetlib.py
 %%PYTHON_LIBDIR%%/tempfile.py
 %%PYTHON_LIBDIR%%/test/185test.db
-%%PYTHON_LIBDIR%%/test/README
 %%PYTHON_LIBDIR%%/test/Sine-1000Hz-300ms.aif
 %%PYTHON_LIBDIR%%/test/__init__.py
 %%PYTHON_LIBDIR%%/test/audiotest.au
@@ -1015,7 +1076,6 @@
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt
 %%PYTHON_LIBDIR%%/test/curses_tests.py
-%%PYTHON_LIBDIR%%/test/test_future5.py
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
@@ -1165,6 +1225,8 @@
 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
 %%PYTHON_LIBDIR%%/test/floating_points.txt
 %%PYTHON_LIBDIR%%/test/fork_wait.py
+%%PYTHON_LIBDIR%%/test/formatfloat_testcases.txt
+%%PYTHON_LIBDIR%%/test/gdb_sample.py
 %%PYTHON_LIBDIR%%/test/greyrgb.uue
 %%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem
 %%PYTHON_LIBDIR%%/test/ieee754.txt
@@ -1175,6 +1237,7 @@
 %%PYTHON_LIBDIR%%/test/list_tests.py
 %%PYTHON_LIBDIR%%/test/lock_tests.py
 %%PYTHON_LIBDIR%%/test/mapping_tests.py
+%%PYTHON_LIBDIR%%/test/math_testcases.txt
 %%PYTHON_LIBDIR%%/test/nullcert.pem
 %%PYTHON_LIBDIR%%/test/outstanding_bugs.py
 %%PYTHON_LIBDIR%%/test/pickletester.py
@@ -1192,15 +1255,15 @@
 %%PYTHON_LIBDIR%%/test/relimport.py
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
+%%PYTHON_LIBDIR%%/test/script_helper.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
+%%PYTHON_LIBDIR%%/test/sha256.pem
 %%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/ssl_cert.pem
 %%PYTHON_LIBDIR%%/test/ssl_key.pem
 %%PYTHON_LIBDIR%%/test/string_tests.py
 %%PYTHON_LIBDIR%%/test/svn_python_org_https_cert.pem
-%%PYTHON_LIBDIR%%/test/test.xml
-%%PYTHON_LIBDIR%%/test/test.xml.out
 %%PYTHON_LIBDIR%%/test/test_MimeWriter.py
 %%PYTHON_LIBDIR%%/test/test_SimpleHTTPServer.py
 %%PYTHON_LIBDIR%%/test/test_StringIO.py
@@ -1214,7 +1277,9 @@
 %%PYTHON_LIBDIR%%/test/test_al.py
 %%PYTHON_LIBDIR%%/test/test_anydbm.py
 %%PYTHON_LIBDIR%%/test/test_applesingle.py
+%%PYTHON_LIBDIR%%/test/test_argparse.py
 %%PYTHON_LIBDIR%%/test/test_array.py
+%%PYTHON_LIBDIR%%/test/test_ascii_formatd.py
 %%PYTHON_LIBDIR%%/test/test_ast.py
 %%PYTHON_LIBDIR%%/test/test_asynchat.py
 %%PYTHON_LIBDIR%%/test/test_asyncore.py
@@ -1272,6 +1337,7 @@
 %%PYTHON_LIBDIR%%/test/test_commands.py
 %%PYTHON_LIBDIR%%/test/test_compare.py
 %%PYTHON_LIBDIR%%/test/test_compile.py
+%%PYTHON_LIBDIR%%/test/test_compileall.py
 %%PYTHON_LIBDIR%%/test/test_compiler.py
 %%PYTHON_LIBDIR%%/test/test_complex.py
 %%PYTHON_LIBDIR%%/test/test_complex_args.py
@@ -1296,6 +1362,8 @@
 %%PYTHON_LIBDIR%%/test/test_descr.py
 %%PYTHON_LIBDIR%%/test/test_descrtut.py
 %%PYTHON_LIBDIR%%/test/test_dict.py
+%%PYTHON_LIBDIR%%/test/test_dictcomps.py
+%%PYTHON_LIBDIR%%/test/test_dictviews.py
 %%PYTHON_LIBDIR%%/test/test_difflib.py
 %%PYTHON_LIBDIR%%/test/test_difflib_expect.html
 %%PYTHON_LIBDIR%%/test/test_dircache.py
@@ -1324,6 +1392,7 @@
 %%PYTHON_LIBDIR%%/test/test_extcall.py
 %%PYTHON_LIBDIR%%/test/test_fcntl.py
 %%PYTHON_LIBDIR%%/test/test_file.py
+%%PYTHON_LIBDIR%%/test/test_file2k.py
 %%PYTHON_LIBDIR%%/test/test_filecmp.py
 %%PYTHON_LIBDIR%%/test/test_fileinput.py
 %%PYTHON_LIBDIR%%/test/test_fileio.py
@@ -1342,8 +1411,10 @@
 %%PYTHON_LIBDIR%%/test/test_future2.py
 %%PYTHON_LIBDIR%%/test/test_future3.py
 %%PYTHON_LIBDIR%%/test/test_future4.py
+%%PYTHON_LIBDIR%%/test/test_future5.py
 %%PYTHON_LIBDIR%%/test/test_future_builtins.py
 %%PYTHON_LIBDIR%%/test/test_gc.py
+%%PYTHON_LIBDIR%%/test/test_gdb.py
 %%PYTHON_LIBDIR%%/test/test_gdbm.py
 %%PYTHON_LIBDIR%%/test/test_generators.py
 %%PYTHON_LIBDIR%%/test/test_genericpath.py
@@ -1373,6 +1444,7 @@
 %%PYTHON_LIBDIR%%/test/test_imp.py
 %%PYTHON_LIBDIR%%/test/test_import.py
 %%PYTHON_LIBDIR%%/test/test_importhooks.py
+%%PYTHON_LIBDIR%%/test/test_importlib.py
 %%PYTHON_LIBDIR%%/test/test_index.py
 %%PYTHON_LIBDIR%%/test/test_inspect.py
 %%PYTHON_LIBDIR%%/test/test_int.py
@@ -1403,6 +1475,7 @@
 %%PYTHON_LIBDIR%%/test/test_math.py
 %%PYTHON_LIBDIR%%/test/test_md5.py
 %%PYTHON_LIBDIR%%/test/test_memoryio.py
+%%PYTHON_LIBDIR%%/test/test_memoryview.py
 %%PYTHON_LIBDIR%%/test/test_mhlib.py
 %%PYTHON_LIBDIR%%/test/test_mimetools.py
 %%PYTHON_LIBDIR%%/test/test_mimetypes.py
@@ -1429,6 +1502,7 @@
 %%PYTHON_LIBDIR%%/test/test_os.py
 %%PYTHON_LIBDIR%%/test/test_ossaudiodev.py
 %%PYTHON_LIBDIR%%/test/test_parser.py
+%%PYTHON_LIBDIR%%/test/test_pdb.py
 %%PYTHON_LIBDIR%%/test/test_peepholer.py
 %%PYTHON_LIBDIR%%/test/test_pep247.py
 %%PYTHON_LIBDIR%%/test/test_pep263.py
@@ -1478,6 +1552,7 @@
 %%PYTHON_LIBDIR%%/test/test_scriptpackages.py
 %%PYTHON_LIBDIR%%/test/test_select.py
 %%PYTHON_LIBDIR%%/test/test_set.py
+%%PYTHON_LIBDIR%%/test/test_setcomps.py
 %%PYTHON_LIBDIR%%/test/test_sets.py
 %%PYTHON_LIBDIR%%/test/test_sgmllib.py
 %%PYTHON_LIBDIR%%/test/test_sha.py
@@ -1502,6 +1577,7 @@
 %%PYTHON_LIBDIR%%/test/test_stringprep.py
 %%PYTHON_LIBDIR%%/test/test_strop.py
 %%PYTHON_LIBDIR%%/test/test_strptime.py
+%%PYTHON_LIBDIR%%/test/test_strtod.py
 %%PYTHON_LIBDIR%%/test/test_struct.py
 %%PYTHON_LIBDIR%%/test/test_structmembers.py
 %%PYTHON_LIBDIR%%/test/test_structseq.py
@@ -1512,6 +1588,7 @@
 %%PYTHON_LIBDIR%%/test/test_symtable.py
 %%PYTHON_LIBDIR%%/test/test_syntax.py
 %%PYTHON_LIBDIR%%/test/test_sys.py
+%%PYTHON_LIBDIR%%/test/test_sysconfig.py
 %%PYTHON_LIBDIR%%/test/test_tarfile.py
 %%PYTHON_LIBDIR%%/test/test_tcl.py
 %%PYTHON_LIBDIR%%/test/test_telnetlib.py
@@ -1525,10 +1602,13 @@
 %%PYTHON_LIBDIR%%/test/test_threadsignals.py
 %%PYTHON_LIBDIR%%/test/test_time.py
 %%PYTHON_LIBDIR%%/test/test_timeout.py
+%%PYTHON_LIBDIR%%/test/test_tk.py
 %%PYTHON_LIBDIR%%/test/test_tokenize.py
 %%PYTHON_LIBDIR%%/test/test_trace.py
 %%PYTHON_LIBDIR%%/test/test_traceback.py
 %%PYTHON_LIBDIR%%/test/test_transformer.py
+%%PYTHON_LIBDIR%%/test/test_ttk_guionly.py
+%%PYTHON_LIBDIR%%/test/test_ttk_textonly.py
 %%PYTHON_LIBDIR%%/test/test_tuple.py
 %%PYTHON_LIBDIR%%/test/test_typechecks.py
 %%PYTHON_LIBDIR%%/test/test_types.py
@@ -1540,6 +1620,7 @@
 %%PYTHON_LIBDIR%%/test/test_unicodedata.py
 %%PYTHON_LIBDIR%%/test/test_unittest.py
 %%PYTHON_LIBDIR%%/test/test_univnewlines.py
+%%PYTHON_LIBDIR%%/test/test_univnewlines2k.py
 %%PYTHON_LIBDIR%%/test/test_unpack.py
 %%PYTHON_LIBDIR%%/test/test_urllib.py
 %%PYTHON_LIBDIR%%/test/test_urllib2.py
@@ -1557,6 +1638,7 @@
 %%PYTHON_LIBDIR%%/test/test_warnings.py
 %%PYTHON_LIBDIR%%/test/test_wave.py
 %%PYTHON_LIBDIR%%/test/test_weakref.py
+%%PYTHON_LIBDIR%%/test/test_weakset.py
 %%PYTHON_LIBDIR%%/test/test_whichdb.py
 %%PYTHON_LIBDIR%%/test/test_winreg.py
 %%PYTHON_LIBDIR%%/test/test_winsound.py
@@ -1588,6 +1670,11 @@
 %%PYTHON_LIBDIR%%/test/warning_tests.py
 %%PYTHON_LIBDIR%%/test/wrongcert.pem
 %%PYTHON_LIBDIR%%/test/xmltests.py
+%%PYTHON_LIBDIR%%/test/xmltestdata/simple-ns.xml
+%%PYTHON_LIBDIR%%/test/xmltestdata/simple.xml
+%%PYTHON_LIBDIR%%/test/xmltestdata/test.xml
+%%PYTHON_LIBDIR%%/test/xmltestdata/test.xml.out
+%%PYTHON_LIBDIR%%/test/win_console_handler.py
 %%PYTHON_LIBDIR%%/textwrap.py
 %%PYTHON_LIBDIR%%/this.py
 %%PYTHON_LIBDIR%%/threading.py
@@ -1599,7 +1686,31 @@
 %%PYTHON_LIBDIR%%/traceback.py
 %%PYTHON_LIBDIR%%/tty.py
 %%PYTHON_LIBDIR%%/types.py
-%%PYTHON_LIBDIR%%/unittest.py
+%%PYTHON_LIBDIR%%/unittest/__init__.py
+%%PYTHON_LIBDIR%%/unittest/__main__.py
+%%PYTHON_LIBDIR%%/unittest/case.py
+%%PYTHON_LIBDIR%%/unittest/loader.py
+%%PYTHON_LIBDIR%%/unittest/main.py
+%%PYTHON_LIBDIR%%/unittest/result.py
+%%PYTHON_LIBDIR%%/unittest/runner.py
+%%PYTHON_LIBDIR%%/unittest/signals.py
+%%PYTHON_LIBDIR%%/unittest/suite.py
+%%PYTHON_LIBDIR%%/unittest/test/__init__.py
+%%PYTHON_LIBDIR%%/unittest/test/dummy.py
+%%PYTHON_LIBDIR%%/unittest/test/support.py
+%%PYTHON_LIBDIR%%/unittest/test/test_assertions.py
+%%PYTHON_LIBDIR%%/unittest/test/test_break.py
+%%PYTHON_LIBDIR%%/unittest/test/test_case.py
+%%PYTHON_LIBDIR%%/unittest/test/test_discovery.py
+%%PYTHON_LIBDIR%%/unittest/test/test_functiontestcase.py
+%%PYTHON_LIBDIR%%/unittest/test/test_loader.py
+%%PYTHON_LIBDIR%%/unittest/test/test_program.py
+%%PYTHON_LIBDIR%%/unittest/test/test_result.py
+%%PYTHON_LIBDIR%%/unittest/test/test_runner.py
+%%PYTHON_LIBDIR%%/unittest/test/test_setups.py
+%%PYTHON_LIBDIR%%/unittest/test/test_skipping.py
+%%PYTHON_LIBDIR%%/unittest/test/test_suite.py
+%%PYTHON_LIBDIR%%/unittest/util.py
 %%PYTHON_LIBDIR%%/urllib.py
 %%PYTHON_LIBDIR%%/urllib2.py
 %%PYTHON_LIBDIR%%/urlparse.py
@@ -1644,7 +1755,7 @@
 %%PYTHON_LIBDIR%%/xmllib.py
 %%PYTHON_LIBDIR%%/xmlrpclib.py
 %%PYTHON_LIBDIR%%/zipfile.py
-lib/libpython2.6.a
+lib/libpython2.7.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/cgi0.sh
@@ -1699,7 +1810,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/simple.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/source.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/test_parser.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/texipre.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/test_unparse.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/unparse.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdist/FSProxy.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdist/RCSProxy.py
@@ -1740,12 +1851,10 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/fact.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/find-uname.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/from.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/ftpstats.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/lpwatch.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/makedir.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/markov.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mboxconvert.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mkrcs.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/morse.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/newslist.doc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/newslist.py
@@ -1756,7 +1865,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/script.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/unbirthday.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/update.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/wh.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockets/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockets/broadcast.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockets/echosvr.py
@@ -1884,6 +1992,20 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/matt/window-creation-more.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/matt/window-creation-simple.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/matt/window-creation-w-location.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/combo_themes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/dirbrowser.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/img/close_active.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/img/close_pressed.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/img/close.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/listbox_scrollcmd.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/mac_searchentry.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/notebook_closebtn.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/plastik_theme.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/roundframe.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/theme_selector.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/treeview_multicolumn.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/ttkcalendar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tkinter/ttk/widget_state.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/about_turtle.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/about_turtledemo.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/demohelp.txt
@@ -1895,6 +2017,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_fractalcurves.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_lindenmayer_indian.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_minimal_hanoi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_nim.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_paint.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_peace.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turtle/tdemo_penrose.py
@@ -1939,6 +2062,7 @@
 %%PORTDATA%%%%DATADIR%%/Tools/buildbot/external.bat
 %%PORTDATA%%%%DATADIR%%/Tools/buildbot/test-amd64.bat
 %%PORTDATA%%%%DATADIR%%/Tools/buildbot/test.bat
+%%PORTDATA%%%%DATADIR%%/Tools/ccbench/ccbench.py
 %%PORTDATA%%%%DATADIR%%/Tools/compiler/ACKS
 %%PORTDATA%%%%DATADIR%%/Tools/compiler/README
 %%PORTDATA%%%%DATADIR%%/Tools/compiler/ast.txt
@@ -1979,41 +2103,13 @@
 %%PORTDATA%%%%DATADIR%%/Tools/freeze/parsesetup.py
 %%PORTDATA%%%%DATADIR%%/Tools/freeze/win32.html
 %%PORTDATA%%%%DATADIR%%/Tools/freeze/winmakemakefile.py
+%%PORTDATA%%%%DATADIR%%/Tools/gdb/libpython.py
 %%PORTDATA%%%%DATADIR%%/Tools/i18n/makelocalealias.py
 %%PORTDATA%%%%DATADIR%%/Tools/i18n/msgfmt.py
 %%PORTDATA%%%%DATADIR%%/Tools/i18n/pygettext.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/EXAMPLE.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/README
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/ScrolledListbox.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/copyright
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/module_head
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/module_method
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/module_tail
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_head
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_method
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_mlist
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_new
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_structure
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tail
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_as_mapping
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_as_number
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_as_sequence
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_call
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_dealloc
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_getattr
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_hash
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_print
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_repr
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_setattr
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Templates/object_tp_str
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/Tkextra.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/genmodule.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/modulator.py
-%%PORTDATA%%%%DATADIR%%/Tools/modulator/varsubst.py
+%%PORTDATA%%%%DATADIR%%/Tools/iobench/iobench.py
 %%PORTDATA%%%%DATADIR%%/Tools/msi/README.txt
 %%PORTDATA%%%%DATADIR%%/Tools/msi/crtlicense.txt
-%%PORTDATA%%%%DATADIR%%/Tools/msi/merge.py
 %%PORTDATA%%%%DATADIR%%/Tools/msi/msi.py
 %%PORTDATA%%%%DATADIR%%/Tools/msi/msilib.py
 %%PORTDATA%%%%DATADIR%%/Tools/msi/msisupport.c
@@ -2069,6 +2165,7 @@
 %%PORTDATA%%%%DATADIR%%/Tools/pynche/websafe.txt
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/2to3
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/README
+%%PORTDATA%%%%DATADIR%%/Tools/scripts/analyze_dxp.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/byext.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/byteyears.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/checkappend.py
@@ -2084,6 +2181,7 @@
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/dutree.doc
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/dutree.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/eptags.py
+%%PORTDATA%%%%DATADIR%%/Tools/scripts/find_recursionlimit.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/finddiv.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/findlinksto.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/findnocoding.py
@@ -2124,6 +2222,7 @@
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/reindent.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/reindent-rst.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/rgrep.py
+%%PORTDATA%%%%DATADIR%%/Tools/scripts/serve.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/setup.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/smtpd.py
 %%PORTDATA%%%%DATADIR%%/Tools/scripts/suff.py
@@ -2140,6 +2239,8 @@
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/comparecodecs.py
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/gencjkcodecs.py
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/gencodec.py
+%%PORTDATA%%%%DATADIR%%/Tools/unicode/genwincodecs.bat
+%%PORTDATA%%%%DATADIR%%/Tools/unicode/genwincodec.py
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/listcodecs.py
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/makeunicodedata.py
 %%PORTDATA%%%%DATADIR%%/Tools/unicode/mkstringprep.py
@@ -2171,14 +2272,15 @@
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/pybench/package
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/pybench
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/msi
-%%PORTDATA%%@dirrm %%DATADIR%%/Tools/modulator/Templates
-%%PORTDATA%%@dirrm %%DATADIR%%/Tools/modulator
+%%PORTDATA%%@dirrm %%DATADIR%%/Tools/iobench
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/i18n
+%%PORTDATA%%@dirrm %%DATADIR%%/Tools/gdb
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/freeze
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/framer/framer
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/framer
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/faqwiz
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/compiler
+%%PORTDATA%%@dirrm %%DATADIR%%/Tools/ccbench
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/buildbot
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/bgen/bgen
 %%PORTDATA%%@dirrm %%DATADIR%%/Tools/bgen
@@ -2188,6 +2290,8 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/zlib
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turtle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tkinter/ttk/img
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tkinter/ttk
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tkinter/matt
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tkinter/guido
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tkinter
@@ -2217,27 +2321,37 @@
 @dirrm %%PYTHON_LIBDIR%%/xml/dom
 @dirrm %%PYTHON_LIBDIR%%/xml
 @dirrm %%PYTHON_LIBDIR%%/wsgiref
+@dirrm %%PYTHON_LIBDIR%%/unittest/test
+@dirrm %%PYTHON_LIBDIR%%/unittest
+@dirrm %%PYTHON_LIBDIR%%/test/data
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
+@dirrm %%PYTHON_LIBDIR%%/test/xmltestdata
 @dirrm %%PYTHON_LIBDIR%%/test
 @dirrm %%PYTHON_LIBDIR%%/sqlite3/test
 @dirrm %%PYTHON_LIBDIR%%/sqlite3
 @dirrm %%PYTHON_LIBDIR%%/site-packages
+@dirrm %%PYTHON_LIBDIR%%/pydoc_data
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd9
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd8
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd7
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6
-@dirrm %%PYTHON_LIBDIR%%/plat-freebsd5
-@dirrm %%PYTHON_LIBDIR%%/plat-freebsd4
 @dirrm %%PYTHON_LIBDIR%%/multiprocessing/dummy
 @dirrm %%PYTHON_LIBDIR%%/multiprocessing
 @dirrm %%PYTHON_LIBDIR%%/logging
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers/myfixes
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/tests/data/fixers
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/tests/data
 @dirrm %%PYTHON_LIBDIR%%/lib2to3/tests
 @dirrm %%PYTHON_LIBDIR%%/lib2to3/pgen2
 @dirrm %%PYTHON_LIBDIR%%/lib2to3/fixes
 @dirrm %%PYTHON_LIBDIR%%/lib2to3
+@dirrm %%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter
+@dirrm %%PYTHON_LIBDIR%%/lib-tk/test/test_ttk
+@dirrm %%PYTHON_LIBDIR%%/lib-tk/test
 @dirrm %%PYTHON_LIBDIR%%/lib-tk
 @dirrmtry %%PYTHON_LIBDIR%%/lib-old
 @dirrm %%PYTHON_LIBDIR%%/lib-dynload
+@dirrm %%PYTHON_LIBDIR%%/importlib
 @dirrm %%PYTHON_LIBDIR%%/json/tests
 @dirrm %%PYTHON_LIBDIR%%/json
 @dirrm %%PYTHON_LIBDIR%%/idlelib/Icons
Index: lang/python27/files/extra-patch-configure-pth
===================================================================
RCS file: /home/pcvs/ports/lang/python27/files/extra-patch-configure-pth,v
retrieving revision 1.2
diff -u -r1.2 extra-patch-configure-pth
--- lang/python27/files/extra-patch-configure-pth	15 Aug 2010 05:10:43 -0000	1.2
+++ lang/python27/files/extra-patch-configure-pth	15 Aug 2010 09:11:25 -0000
@@ -1,12 +1,12 @@
---- configure.orig	2009-03-12 14:16:24.000000000 +0000
-+++ configure	2009-03-12 14:17:16.000000000 +0000
-@@ -5230,6 +5230,9 @@
+--- configure.orig	2010-08-15 16:47:39.627297328 +0800
++++ configure	2010-08-15 16:50:31.353013856 +0800
+@@ -5880,6 +5880,9 @@
  CC="$ac_save_cc"
  fi
  
 +# XXX Explicitly disable system pthread libraries.
 +ac_cv_pthread=no
 +
- { echo "$as_me:$LINENO: result: $ac_cv_pthread" >&5
- echo "${ECHO_T}$ac_cv_pthread" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
+ $as_echo "$ac_cv_pthread" >&6; }
  fi
Index: lang/python27/files/extra-patch-setup.py
===================================================================
RCS file: /home/pcvs/ports/lang/python27/files/extra-patch-setup.py,v
retrieving revision 1.4
diff -u -r1.4 extra-patch-setup.py
--- lang/python27/files/extra-patch-setup.py	15 Aug 2010 05:10:43 -0000	1.4
+++ lang/python27/files/extra-patch-setup.py	15 Aug 2010 09:11:25 -0000
@@ -1,18 +1,18 @@
---- setup.py.1	2009-03-12 04:07:36.000000000 +0000
-+++ setup.py	2009-03-12 04:08:36.000000000 +0000
-@@ -1265,13 +1265,21 @@
-                 )
+--- setup.py.bak	2010-08-15 14:57:00.347134100 +0800
++++ setup.py	2010-08-15 15:00:06.019643300 +0800
+@@ -1402,10 +1402,22 @@
+             macros = dict()
              libraries = []
  
 -        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
 +        elif platform in ('freebsd4', 'freebsd5', 'freebsd6'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
--            macros = dict(                  # FreeBSD
+-            macros = dict()
 +            macros = dict(                  # FreeBSD 4-6
-                 HAVE_SEM_OPEN=0,
-                 HAVE_SEM_TIMEDWAIT=0,
-                 HAVE_FD_TRANSFER=1,
++                HAVE_SEM_OPEN=0,
++                HAVE_SEM_TIMEDWAIT=0,
++                HAVE_FD_TRANSFER=1,
 +                )
 +            libraries = []
 +
@@ -21,6 +21,7 @@
 +                HAVE_SEM_OPEN=1,
 +                HAVE_SEM_TIMEDWAIT=1,
 +                HAVE_FD_TRANSFER=1,
-                 )
++                )
              libraries = []
  
+         elif platform.startswith('openbsd'):
Index: lang/python27/files/patch-Doc-library-fcntl.rst
===================================================================
RCS file: lang/python27/files/patch-Doc-library-fcntl.rst
diff -N lang/python27/files/patch-Doc-library-fcntl.rst
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/python27/files/patch-Doc-library-fcntl.rst	15 Aug 2010 09:11:25 -0000
@@ -0,0 +1,11 @@
+--- Doc/library/fcntl.rst.orig	2010-08-14 16:19:09.194215129 +0800
++++ Doc/library/fcntl.rst	2010-08-14 16:19:36.999453016 +0800
+@@ -50,8 +50,6 @@
+    operations are typically defined in the library module :mod:`termios` and the
+    argument handling is even more complicated.
+ 
+-   The op parameter is limited to values that can fit in 32-bits.
+-
+    The parameter *arg* can be one of an integer, absent (treated identically to the
+    integer ``0``), an object supporting the read-only buffer interface (most likely
+    a plain Python string) or an object supporting the read-write buffer interface.
Index: lang/python27/files/patch-Lib-test-test_fcntl.py
===================================================================
RCS file: lang/python27/files/patch-Lib-test-test_fcntl.py
diff -N lang/python27/files/patch-Lib-test-test_fcntl.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/python27/files/patch-Lib-test-test_fcntl.py	15 Aug 2010 09:11:25 -0000
@@ -0,0 +1,11 @@
+--- Lib/test/test_fcntl.py.orig	2010-08-14 16:56:31.290525837 +0800
++++ Lib/test/test_fcntl.py	2010-08-14 16:56:39.007508167 +0800
+@@ -30,7 +30,7 @@
+     if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
+                         'Darwin1.2', 'darwin',
+                         'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
+-                        'freebsd6', 'freebsd7', 'freebsd8',
++                        'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9',
+                         'bsdos2', 'bsdos3', 'bsdos4',
+                         'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
+         if struct.calcsize('l') == 8:
Index: lang/python27/files/patch-Lib-test-test_ioctl.py
===================================================================
RCS file: lang/python27/files/patch-Lib-test-test_ioctl.py
diff -N lang/python27/files/patch-Lib-test-test_ioctl.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/python27/files/patch-Lib-test-test_ioctl.py	15 Aug 2010 09:11:25 -0000
@@ -0,0 +1,23 @@
+--- Lib/test/test_ioctl.py.orig	2010-08-14 16:20:34.137255285 +0800
++++ Lib/test/test_ioctl.py	2010-08-14 16:36:01.013654144 +0800
+@@ -41,18 +41,9 @@
+             raise unittest.SkipTest('pty module required')
+         mfd, sfd = pty.openpty()
+         try:
+-            if termios.TIOCSWINSZ < 0:
+-                set_winsz_opcode_maybe_neg = termios.TIOCSWINSZ
+-                set_winsz_opcode_pos = termios.TIOCSWINSZ & 0xffffffffL
+-            else:
+-                set_winsz_opcode_pos = termios.TIOCSWINSZ
+-                set_winsz_opcode_maybe_neg, = struct.unpack("i",
+-                        struct.pack("I", termios.TIOCSWINSZ))
+-
++            set_winsz_opcode = termios.TIOCSWINSZ
+             our_winsz = struct.pack("HHHH",80,25,0,0)
+-            # test both with a positive and potentially negative ioctl code
+-            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz)
+-            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz)
++            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz)
+         finally:
+             os.close(mfd)
+             os.close(sfd)
Index: lang/python27/files/patch-Lib-test-test_socket.py
===================================================================
RCS file: lang/python27/files/patch-Lib-test-test_socket.py
diff -N lang/python27/files/patch-Lib-test-test_socket.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/python27/files/patch-Lib-test-test_socket.py	15 Aug 2010 09:11:25 -0000
@@ -0,0 +1,11 @@
+--- Lib/test/test_socket.py.orig	2010-08-14 16:51:08.542899328 +0800
++++ Lib/test/test_socket.py	2010-08-14 16:53:25.902184941 +0800
+@@ -334,7 +334,7 @@
+         # I've ordered this by protocols that have both a tcp and udp
+         # protocol, at least for modern Linuxes.
+         if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+-                            'freebsd7', 'freebsd8', 'darwin'):
++                            'freebsd7', 'freebsd8', 'freebsd9', 'darwin'):
+             # avoid the 'echo' service on this platform, as there is an
+             # assumption breaking non-standard port/protocol entry
+             services = ('daytime', 'qotd', 'domain')
Index: lang/python27/files/patch-Modules-_ctypes-libffi-configure
===================================================================
RCS file: /home/pcvs/ports/lang/python27/files/patch-Modules-_ctypes-libffi-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-Modules-_ctypes-libffi-configure
--- lang/python27/files/patch-Modules-_ctypes-libffi-configure	15 Aug 2010 05:10:43 -0000	1.3
+++ lang/python27/files/patch-Modules-_ctypes-libffi-configure	15 Aug 2010 09:11:25 -0000
@@ -1,11 +1,11 @@
---- Modules/_ctypes/libffi/configure.orig	2008-05-24 00:06:50.000000000 +0900
-+++ Modules/_ctypes/libffi/configure	2008-10-09 20:24:02.000000000 +0900
-@@ -4725,7 +4725,7 @@
+--- Modules/_ctypes/libffi/configure.orig	2010-03-20 02:59:20.000000000 +0800
++++ Modules/_ctypes/libffi/configure	2010-06-04 10:04:38.000000000 +0800
+@@ -6289,7 +6289,7 @@
    rm -rf conftest*
    ;;
  
 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|sparc*-*linux*)
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
Index: lang/python27/files/patch-Modules-fcntlmodule.c
===================================================================
RCS file: lang/python27/files/patch-Modules-fcntlmodule.c
diff -N lang/python27/files/patch-Modules-fcntlmodule.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/python27/files/patch-Modules-fcntlmodule.c	15 Aug 2010 09:11:25 -0000
@@ -0,0 +1,53 @@
+--- Modules/fcntlmodule.c.orig	2010-08-14 16:36:54.991363730 +0800
++++ Modules/fcntlmodule.c	2010-08-14 16:41:05.555822031 +0800
+@@ -97,20 +97,15 @@
+ {
+ #define IOCTL_BUFSZ 1024
+     int fd;
+-    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
++    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
+        format for the 'code' parameter because Python turns 0x8000000
+        into either a large positive number (PyLong or PyInt on 64-bit
+        platforms) or a negative number on others (32-bit PyInt)
+        whereas the system expects it to be a 32bit bit field value
+        regardless of it being passed as an int or unsigned long on
+-       various platforms.  See the termios.TIOCSWINSZ constant across
+-       platforms for an example of thise.
+-
+-       If any of the 64bit platforms ever decide to use more than 32bits
+-       in their unsigned long ioctl codes this will break and need
+-       special casing based on the platform being built on.
++       various platforms.
+      */
+-    unsigned int code;
++    unsigned long code;
+     int arg;
+     int ret;
+     char *str;
+@@ -118,7 +113,7 @@
+     int mutate_arg = 1;
+     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
+ 
+-    if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
++    if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",
+                          conv_descriptor, &fd, &code,
+                          &str, &len, &mutate_arg)) {
+         char *arg;
+@@ -169,7 +164,7 @@
+     }
+ 
+     PyErr_Clear();
+-    if (PyArg_ParseTuple(args, "O&Is#:ioctl",
++    if (PyArg_ParseTuple(args, "O&ks#:ioctl",
+                          conv_descriptor, &fd, &code, &str, &len)) {
+         if (len > IOCTL_BUFSZ) {
+             PyErr_SetString(PyExc_ValueError,
+@@ -191,7 +186,7 @@
+     PyErr_Clear();
+     arg = 0;
+     if (!PyArg_ParseTuple(args,
+-         "O&I|i;ioctl requires a file or file descriptor,"
++         "O&k|i;ioctl requires a file or file descriptor,"
+          " an integer and optionally an integer or buffer argument",
+                           conv_descriptor, &fd, &code, &arg)) {
+       return NULL;
Index: lang/python27/files/patch-Python_thread__pthread.h
===================================================================
RCS file: /home/pcvs/ports/lang/python27/files/patch-Python_thread__pthread.h,v
retrieving revision 1.3
diff -u -r1.3 patch-Python_thread__pthread.h
--- lang/python27/files/patch-Python_thread__pthread.h	15 Aug 2010 05:10:43 -0000	1.3
+++ lang/python27/files/patch-Python_thread__pthread.h	15 Aug 2010 09:11:25 -0000
@@ -1,5 +1,5 @@
---- Python/thread_pthread.h.orig	2006-06-13 16:04:24.000000000 +0100
-+++ Python/thread_pthread.h	2009-03-12 10:55:49.000000000 +0000
+--- Python/thread_pthread.h.orig	2010-05-09 22:46:46.000000000 +0800
++++ Python/thread_pthread.h	2010-08-15 14:27:51.886823397 +0800
 @@ -26,13 +26,18 @@
  #endif
  #endif
@@ -10,9 +10,9 @@
 +
  /* The POSIX spec says that implementations supporting the sem_*
     family of functions must indicate this by defining
-    _POSIX_SEMAPHORES. */   
+    _POSIX_SEMAPHORES. */
  #ifdef _POSIX_SEMAPHORES
- /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so 
+ /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so
     we need to add 0 to make it work there as well. */
 -#if (_POSIX_SEMAPHORES+0) == -1
 +#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \
@@ -30,26 +30,26 @@
  #endif
 @@ -149,6 +153,7 @@
  {
- 	pthread_t th;
- 	int status;
-+	sigset_t set, oset;
+     pthread_t th;
+     int status;
++    sigset_t set, oset;
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
- 	pthread_attr_t attrs;
+     pthread_attr_t attrs;
  #endif
 @@ -177,6 +182,8 @@
  #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
-         pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
+     pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
  #endif
-+	sigfillset(&set);
-+	SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
++    sigfillset(&set);
++    SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
  
- 	status = pthread_create(&th, 
+     status = pthread_create(&th,
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 @@ -188,6 +195,7 @@
- 				 (void *)arg
- 				 );
+                              (void *)arg
+                              );
  
-+	SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
++    SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
- 	pthread_attr_destroy(&attrs);
+     pthread_attr_destroy(&attrs);
  #endif
Index: lang/python27/files/patch-setup.py
===================================================================
RCS file: /home/pcvs/ports/lang/python27/files/patch-setup.py,v
retrieving revision 1.20
diff -u -r1.20 patch-setup.py
--- lang/python27/files/patch-setup.py	15 Aug 2010 05:10:43 -0000	1.20
+++ lang/python27/files/patch-setup.py	15 Aug 2010 09:11:25 -0000
@@ -1,7 +1,7 @@
---- setup.py.orig	2009-03-31 18:20:48.000000000 +0000
-+++ setup.py	2009-09-10 05:27:01.000000000 +0000
-@@ -17,7 +17,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
+--- setup.py.orig	2010-06-07 09:55:38.000000000 +0800
++++ setup.py	2010-06-07 10:03:30.000000000 +0800
+@@ -21,7 +21,7 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
@@ -9,17 +9,17 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -577,7 +577,7 @@ class PyBuildExt(build_ext):
- 
-             readline_libs = ['readline']
-             if self.compiler.find_library_file(lib_dirs,
--                                                 'ncursesw'):
-+                                                 'xxxncursesw'):
-                 readline_libs.append('ncursesw')
-             elif self.compiler.find_library_file(lib_dirs,
-                                                  'ncurses'):
-@@ -589,7 +589,7 @@ class PyBuildExt(build_ext):
-                                                'termcap'):
+@@ -608,7 +608,7 @@
+         # use the same library for the readline and curses modules.
+         if 'curses' in readline_termcap_library:
+             curses_library = readline_termcap_library
+-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
++        elif self.compiler.find_library_file(lib_dirs, 'xxxncursesw'):
+             curses_library = 'ncursesw'
+         elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
+             curses_library = 'ncurses'
+@@ -647,7 +647,7 @@
+                                                      'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
 -                                   library_dirs=['/usr/lib/termcap'],
@@ -27,7 +27,7 @@
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -689,6 +689,8 @@ class PyBuildExt(build_ext):
+@@ -749,6 +749,8 @@
              # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
              exts.append( Extension('_sha256', ['sha256module.c']) )
              exts.append( Extension('_sha512', ['sha512module.c']) )
@@ -36,59 +36,59 @@
  
          # Modules that provide persistent dictionary-like semantics.  You will
          # probably want to arrange for at least one of them to be available on
-@@ -990,7 +992,7 @@ class PyBuildExt(build_ext):
-         # the more recent berkeleydb's db.h file first in the include path
-         # when attempting to compile and it will fail.
-         f = "/usr/include/db.h"
+@@ -1085,7 +1087,7 @@
+                 sysroot = macosx_sdk_root()
+                 f = os.path.join(sysroot, f[1:])
+ 
 -        if os.path.exists(f) and not db_incs:
 +        if os.path.exists(f):
              data = open(f).read()
              m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
              if m is not None:
-@@ -1080,7 +1082,7 @@ class PyBuildExt(build_ext):
+@@ -1210,13 +1212,14 @@
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
          panel_library = 'panel'
--        if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
-+        if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')):
-             curses_libs = ['ncursesw']
-             # Bug 1464056: If _curses.so links with ncursesw,
-             # _curses_panel.so must link with panelw.
-@@ -1090,6 +1092,7 @@ class PyBuildExt(build_ext):
-         elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
-             curses_libs = ['ncurses']
+-        if curses_library.startswith('ncurses'):
+-            if curses_library == 'ncursesw':
++        if curses_library.startswith('xxxncurses'):
++            if curses_library == 'xxxncursesw':
+                 # Bug 1464056: If _curses.so links with ncursesw,
+                 # _curses_panel.so must link with panelw.
+                 panel_library = 'panelw'
+             curses_libs = [curses_library]
              exts.append( Extension('_curses', ['_cursesmodule.c'],
 +                                   library_dirs = ['/usr/lib'],
                                     libraries = curses_libs) )
-         elif (self.compiler.find_library_file(lib_dirs, 'curses')
-               and platform != 'darwin'):
-@@ -1111,6 +1114,7 @@ class PyBuildExt(build_ext):
-         if (module_enabled(exts, '_curses') and
-             self.compiler.find_library_file(lib_dirs, panel_library)):
-             exts.append( Extension('_curses_panel', ['_curses_panel.c'],
+         elif curses_library == 'curses' and platform != 'darwin':
+                 # OSX has an old Berkeley curses, not good enough for
+@@ -1229,6 +1232,7 @@
+                 curses_libs = ['curses']
+ 
+             exts.append( Extension('_curses', ['_cursesmodule.c'],
 +                                   library_dirs = ['/usr/lib'],
-                                    libraries = [panel_library] + curses_libs) )
+                                    libraries = curses_libs) )
          else:
-             missing.append('_curses_panel')
-@@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext):
-                 )
+             missing.append('_curses')
+@@ -1397,7 +1401,7 @@
+             macros = dict()
              libraries = []
  
 -        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
 +        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
-             macros = dict(                  # FreeBSD
-@@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext):
+             macros = dict()
+@@ -1449,7 +1453,7 @@
              missing.append('linuxaudiodev')
  
-         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
--                        'freebsd7', 'freebsd8'):
-+                        'freebsd7', 'freebsd8', 'freebsd9'):
+         if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+-                        'freebsd7', 'freebsd8')
++                        'freebsd7', 'freebsd8', 'freebsd9')
+             or platform.startswith("gnukfreebsd")):
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
          else:
-             missing.append('ossaudiodev')
-@@ -1891,9 +1895,7 @@ def main():
+@@ -2031,9 +2035,7 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install