PORTREVSION => 2.

Fix error pointed out by tg@. Now just blow away the Tools subdir on uninstall
in case something compiled that stuff.

22 files changed, 22 insertions, 1870 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python/Makefile b/lang/python/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index b22737fa26a..83fca2974e1 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 416ed5b042f..6bc2eb2638e 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -116,120 +116,67 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/audiopy/audiopy
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGenerator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenGeneratorGroup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenHeapBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenModule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenObjectDefinition.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenOutput.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStackBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenStringBuffer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenType.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions_win32.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/extensions_win32.ini
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/freeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/hello.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makeconfig.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makefreeze.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/makemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ClassBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ColorDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Debugger.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Delegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/EditorWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FileList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FormatParagraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/FrameViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/GrepDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IOBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/folder.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/minusnode.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/openfolder.gif
@@ -237,92 +184,55 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/python.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Icons/tk.gif
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleConf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/IdleHistory.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiScrolledLists.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/MultiStatusBar.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/NEWS.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ObjectBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OldStackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/OutputWindow.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ParenMatch.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PathBrowser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Percolator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyParse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/PyShell.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/README.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/RemoteInterp.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ReplaceDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScriptBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ScrolledList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchBinding.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialog.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchDialogBase.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/SearchEngine.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Separator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/StackViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TODO.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ToolTip.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/TreeWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/UndoDelegator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WidgetRedirector.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/eventparse.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/extend.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/help.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.bat
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idle.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/idlever.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/keydefs.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/setup.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/testcode.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/EXAMPLE.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/ScrolledListbox.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/copyright
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_head
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/module_method
@@ -338,7 +248,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -346,170 +255,93 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_setattr
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_str
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Tkextra.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/genmodule.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/modulator.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/varsubst.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/ListViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Main.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/PyncheWidget.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/StripViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/Switchboard.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TextViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/TypeinViewer.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/rgb.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/X/xlicense.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/__init__.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/html40colors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/namedcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pyColorChooser.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/byteyears.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/linktree.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lll.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/objgraph.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/parseentities.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.pyo
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/suff.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/trace.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/which.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/versioncheck/pyversioncheck.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/tktools.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wcmac.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/webchecker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/websucker.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/webchecker/wsgui.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/world/world
 lib/%%PYTHON_VERSION%%/UserDict.py
@@ -2809,6 +2641,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/audiopy
-%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools
+%%PORTDOCS%%@unexec /bin/rm -fr %D/lib/%%PYTHON_VERSION%%/Tools || true
 @dirrm lib/%%PYTHON_VERSION%%
 @dirrm include/%%PYTHON_VERSION%%