28 files changed, 320 insertions, 0 deletions

diff --git a/converters/py-iconv/pkg-plist b/converters/py-iconv/pkg-plist
index 3f0f8cf9bd6e..ba396cd5b883 100644
--- a/converters/py-iconv/pkg-plist
+++ b/converters/py-iconv/pkg-plist
@@ -1,3 +1,4 @@
 %%PYTHON_SITELIBDIR%%/iconv.so
 %%PYTHON_SITELIBDIR%%/iconvcodec.py
 %%PYTHON_SITELIBDIR%%/iconvcodec.pyc
+%%PYTHON_SITELIBDIR%%/iconvcodec.pyo
diff --git a/devel/decompyle/pkg-plist b/devel/decompyle/pkg-plist
index a818ebc3f9d7..1e35abb91280 100644
--- a/devel/decompyle/pkg-plist
+++ b/devel/decompyle/pkg-plist
@@ -1,31 +1,45 @@
 bin/decompyle
 %%PYTHON_SITELIBDIR%%/decompyle/Parser.py
 %%PYTHON_SITELIBDIR%%/decompyle/Parser.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/Parser.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/Scanner.py
 %%PYTHON_SITELIBDIR%%/decompyle/Scanner.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/Scanner.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/Walker.py
 %%PYTHON_SITELIBDIR%%/decompyle/Walker.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/Walker.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/__init__.py
 %%PYTHON_SITELIBDIR%%/decompyle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/__init__.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_15.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_15.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_15.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_16.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_16.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_16.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_20.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_20.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_20.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_21.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_21.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_21.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_22.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_22.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_22.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/dis_files.py
 %%PYTHON_SITELIBDIR%%/decompyle/dis_files.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/dis_files.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/magics.py
 %%PYTHON_SITELIBDIR%%/decompyle/magics.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/magics.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/marshal_20.so
 %%PYTHON_SITELIBDIR%%/decompyle/marshal_files.py
 %%PYTHON_SITELIBDIR%%/decompyle/marshal_files.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/marshal_files.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/spark.py
 %%PYTHON_SITELIBDIR%%/decompyle/spark.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/spark.pyo
 %%PYTHON_SITELIBDIR%%/decompyle/verify.py
 %%PYTHON_SITELIBDIR%%/decompyle/verify.pyc
+%%PYTHON_SITELIBDIR%%/decompyle/verify.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/decompyle
diff --git a/devel/happydoc/pkg-plist b/devel/happydoc/pkg-plist
index e48e084e5599..4cbb9753c380 100644
--- a/devel/happydoc/pkg-plist
+++ b/devel/happydoc/pkg-plist
@@ -1,128 +1,190 @@
 bin/happydoc
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/CommandLineApp.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/CommandLineApp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/CommandLineApp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/StreamFlushTest.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/StreamFlushTest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/StreamFlushTest.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/appclass.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/appclass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/appclass.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/cvsversion.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/cvsversion.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/cvsversion.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Dia.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Dia.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Dia.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_MultipleFile.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_MultipleFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_MultipleFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_SingleFile.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_SingleFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_SingleFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Stdout.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Stdout.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_Stdout.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_mstruct.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_mstruct.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/docset_mstruct.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/mstruct_const.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/mstruct_const.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset/mstruct_const.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/MML.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/MML.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/MML.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicDocumentClass.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicDocumentClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicDocumentClass.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicStructuredText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicStructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ClassicStructuredText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocBookClass.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocBookClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocBookClass.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentClass.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentClass.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentWithImages.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentWithImages.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/DocumentWithImages.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLClass.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLClass.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLWithImages.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLWithImages.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/HTMLWithImages.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ST.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ST.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ST.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STDOM.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STDOM.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STDOM.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STletters.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STletters.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/STletters.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/StructuredText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/StructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/StructuredText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/Zwiki.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/Zwiki.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/Zwiki.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ts_regex.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ts_regex.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText/ts_regex.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_ClassicStructuredText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_ClassicStructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_ClassicStructuredText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_PlainText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_PlainText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_PlainText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_RawText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_RawText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_RawText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_StructuredText.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_StructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/docstring_StructuredText.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/OpenOffice/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/OpenOffice/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/OpenOffice/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/fileformatterbase.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/fileformatterbase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/fileformatterbase.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Dia.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Dia.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Dia.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBook.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBook.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBookX.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBookX.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_DocBookX.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_HTMLFile.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_HTMLFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_HTMLFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Null.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Null.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_Null.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_TextFile.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_TextFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_TextFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_XPyDoc.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_XPyDoc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/formatter_XPyDoc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/openoffice.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/openoffice.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/openoffice.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/xmlformatterbase.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/xmlformatterbase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/formatter/xmlformatterbase.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocset.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocset.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocset.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocstring.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydocstring.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydom.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydom.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happydom.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happyformatter.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happyformatter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/happyformatter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/indentstring.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/indentstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/indentstring.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/optiontools.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/optiontools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/optiontools.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parsecomments.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parsecomments.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parsecomments.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/classinfo.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/classinfo.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/classinfo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/functioninfo.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/functioninfo.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/functioninfo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/imports.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/imports.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/imports.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/moduleinfo.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/moduleinfo.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/moduleinfo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/suite.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/suite.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/suite.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/utils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/parseinfo/utils.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/path.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/path.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/path.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/pluginloader.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/pluginloader.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/pluginloader.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/prettyast.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/prettyast.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/prettyast.pyo
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/trace.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoclib/trace.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoclib/trace.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docset
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring/StructuredText
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoclib/docstring
diff --git a/devel/py-ansistyle/pkg-plist b/devel/py-ansistyle/pkg-plist
index 0ca5b4a5e97a..4f49bc5c65e7 100644
--- a/devel/py-ansistyle/pkg-plist
+++ b/devel/py-ansistyle/pkg-plist
@@ -1,3 +1,4 @@
 lib/%%PYTHON_VERSION%%/site-packages/_ansistyle.so
 lib/%%PYTHON_VERSION%%/site-packages/ansistyle.py
 lib/%%PYTHON_VERSION%%/site-packages/ansistyle.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ansistyle.pyo
diff --git a/devel/py-ciphon/pkg-plist b/devel/py-ciphon/pkg-plist
index 927dd1f76a75..576c404d8c9e 100644
--- a/devel/py-ciphon/pkg-plist
+++ b/devel/py-ciphon/pkg-plist
@@ -1,16 +1,23 @@
 bin/ciphon
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/check.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/check.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/check.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/config.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/config.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/ftplib2.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/ftplib2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/ftplib2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/install.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/install.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/install.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/packagelist.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/packagelist.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/packagelist.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/xmlparsers.py
 lib/%%PYTHON_VERSION%%/site-packages/Ciphon/xmlparsers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Ciphon/xmlparsers.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Ciphon
diff --git a/devel/py-cxx/pkg-plist b/devel/py-cxx/pkg-plist
index 23d6bbd5d947..de36d009adcc 100644
--- a/devel/py-cxx/pkg-plist
+++ b/devel/py-cxx/pkg-plist
@@ -6,6 +6,7 @@ include/%%PYTHON_VERSION%%/CXX/Objects.hxx
 @dirrm include/%%PYTHON_VERSION%%/CXX
 lib/%%PYTHON_VERSION%%/site-packages/CXX/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/CXX/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/CXX/__init__.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/CXX
 share/%%PYTHON_VERSION%%/CXX/IndirectPythonInterface.cxx
 share/%%PYTHON_VERSION%%/CXX/cxx_extensions.cxx
diff --git a/devel/py-fileutils/pkg-plist b/devel/py-fileutils/pkg-plist
index 8a9ab8cbfed8..d413f5e9fc14 100644
--- a/devel/py-fileutils/pkg-plist
+++ b/devel/py-fileutils/pkg-plist
@@ -1,2 +1,3 @@
 lib/%%PYTHON_VERSION%%/site-packages/fileutils.py
 lib/%%PYTHON_VERSION%%/site-packages/fileutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/fileutils.pyo
diff --git a/devel/py-log4py/pkg-plist b/devel/py-log4py/pkg-plist
index b6286a34af61..8192bbb4809b 100644
--- a/devel/py-log4py/pkg-plist
+++ b/devel/py-log4py/pkg-plist
@@ -1,5 +1,6 @@
 lib/%%PYTHON_VERSION%%/site-packages/log4py.py
 lib/%%PYTHON_VERSION%%/site-packages/log4py.pyc
+lib/%%PYTHON_VERSION%%/site-packages/log4py.pyo
 %%PORTDOCS%%share/doc/log4py/AUTHORS
 %%PORTDOCS%%share/doc/log4py/COPYING
 %%PORTDOCS%%share/doc/log4py/ChangeLog
diff --git a/devel/wizard/pkg-plist b/devel/wizard/pkg-plist
index 0bc21661ccb8..d904d61f74fb 100644
--- a/devel/wizard/pkg-plist
+++ b/devel/wizard/pkg-plist
@@ -1,5 +1,6 @@
 lib/%%PYTHON_VERSION%%/site-packages/wizard.py
 lib/%%PYTHON_VERSION%%/site-packages/wizard.pyc
+lib/%%PYTHON_VERSION%%/site-packages/wizard.pyo
 %%PORTDOCS%%share/doc/wizard/Makefile
 %%PORTDOCS%%share/doc/wizard/libwizard.tex
 %%PORTDOCS%%share/doc/wizard/wizard.css
diff --git a/dns/py-adns/pkg-plist b/dns/py-adns/pkg-plist
index de0c190b1308..6cef527401b9 100644
--- a/dns/py-adns/pkg-plist
+++ b/dns/py-adns/pkg-plist
@@ -1,7 +1,10 @@
 %%PYTHON_SITELIBDIR%%/ADNS.py
 %%PYTHON_SITELIBDIR%%/ADNS.pyc
+%%PYTHON_SITELIBDIR%%/ADNS.pyo
 %%PYTHON_SITELIBDIR%%/adns.so
 %%PYTHON_SITELIBDIR%%/hostmx.py
 %%PYTHON_SITELIBDIR%%/hostmx.pyc
+%%PYTHON_SITELIBDIR%%/hostmx.pyo
 %%PYTHON_SITELIBDIR%%/rblcheck.py
 %%PYTHON_SITELIBDIR%%/rblcheck.pyc
+%%PYTHON_SITELIBDIR%%/rblcheck.pyo
diff --git a/graphics/py-graphviz/pkg-plist b/graphics/py-graphviz/pkg-plist
index 2459e754815a..c2f4a3bf7cdf 100644
--- a/graphics/py-graphviz/pkg-plist
+++ b/graphics/py-graphviz/pkg-plist
@@ -1,4 +1,5 @@
 %%PYTHON_SITELIBDIR%%/graphviz/__init__.py
 %%PYTHON_SITELIBDIR%%/graphviz/__init__.pyc
+%%PYTHON_SITELIBDIR%%/graphviz/__init__.pyo
 %%PYTHON_SITELIBDIR%%/graphviz/graphviz.so
 @dirrm %%PYTHON_SITELIBDIR%%/graphviz
diff --git a/math/py-gnuplot/pkg-plist b/math/py-gnuplot/pkg-plist
index e38153bb87d1..44d7983de924 100644
--- a/math/py-gnuplot/pkg-plist
+++ b/math/py-gnuplot/pkg-plist
@@ -1,29 +1,42 @@
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/PlotItems.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/PlotItems.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/PlotItems.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/_Gnuplot.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/_Gnuplot.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/_Gnuplot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/demo.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/demo.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/demo.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/funcutils.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/funcutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/funcutils.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gnuplot_Suites.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gnuplot_Suites.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gnuplot_Suites.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_mac.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_mac.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_mac.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_unix.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_unix.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_unix.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_win32.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_win32.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/gp_win32.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/oldplot.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/oldplot.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/oldplot.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/test.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/test.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/test.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/utils.py
 lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/utils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Gnuplot/utils.pyo
 %%PORTDOCS%%share/doc/py-gnuplot/Gnuplot.html
 %%PORTDOCS%%share/doc/py-gnuplot/Gnuplot/PlotItems.py.html
 %%PORTDOCS%%share/doc/py-gnuplot/Gnuplot/PlotItems.py_AnyFile.html
diff --git a/math/py-gsl/pkg-plist b/math/py-gsl/pkg-plist
index b6522327aa0d..5b8996431cc5 100644
--- a/math/py-gsl/pkg-plist
+++ b/math/py-gsl/pkg-plist
@@ -1,13 +1,16 @@
 @cwd %%LOCALBASE%%
 %%PYTHON_SITELIBDIR%%/pygsl/__init__.py
 %%PYTHON_SITELIBDIR%%/pygsl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pygsl/_rng.so
 %%PYTHON_SITELIBDIR%%/pygsl/const.so
 %%PYTHON_SITELIBDIR%%/pygsl/errors.py
 %%PYTHON_SITELIBDIR%%/pygsl/errors.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/errors.pyo
 %%PYTHON_SITELIBDIR%%/pygsl/ieee.so
 %%PYTHON_SITELIBDIR%%/pygsl/init.so
 %%PYTHON_SITELIBDIR%%/pygsl/rng.py
 %%PYTHON_SITELIBDIR%%/pygsl/rng.pyc
+%%PYTHON_SITELIBDIR%%/pygsl/rng.pyo
 %%PYTHON_SITELIBDIR%%/pygsl/sf.so
 @dirrm %%PYTHON_SITELIBDIR%%/pygsl
diff --git a/math/py-numeric17/pkg-plist b/math/py-numeric17/pkg-plist
index 8f9e4fab95fa..a862bedd07a7 100644
--- a/math/py-numeric17/pkg-plist
+++ b/math/py-numeric17/pkg-plist
@@ -4,32 +4,45 @@ include/%%PYTHON_VERSION%%/Numeric/ranlib.h
 include/%%PYTHON_VERSION%%/Numeric/ufuncobject.h
 lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.py
 lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FFT/FFT.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FFT/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FFT/fftpack.so
 lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.py
 lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/MA_version.pyo
 lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.py
 lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.pyc
+lib/%%PYTHON_VERSION%%/site-packages/MA/activeattr.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric.pth
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/ArrayPrinter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/LinearAlgebra.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/LinearAlgebra.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/LinearAlgebra.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/MLab.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/MLab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/MLab.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Matrix.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Matrix.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Matrix.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Numeric.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Numeric.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Numeric.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Precision.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/Precision.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/Precision.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/RandomArray.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/RandomArray.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/RandomArray.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/UserArray.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/UserArray.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/UserArray.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/_numpy.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/arrayfns.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/lapack_lite.so
@@ -38,11 +51,14 @@ lib/%%PYTHON_VERSION%%/site-packages/Numeric/ranlib.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/umath.so
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.py
 lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Numeric/numeric_version.pyo
 lib/%%PYTHON_VERSION%%/site-packages/RNG/RNG.so
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.py
 lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.pyc
+lib/%%PYTHON_VERSION%%/site-packages/RNG/Statistics.pyo
 lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/RNG/__init__.pyo
 @comment share/doc/py-numeric/numpy.pdf
 share/examples/py-numeric/NumTut/__init__.py
 share/examples/py-numeric/NumTut/greece.pik
diff --git a/misc/salias/pkg-plist b/misc/salias/pkg-plist
index b1b5e7e7e731..f1bc0c4c9632 100644
--- a/misc/salias/pkg-plist
+++ b/misc/salias/pkg-plist
@@ -1,3 +1,4 @@
 bin/salias
 lib/%%PYTHON_VERSION%%/site-packages/salias.py
 lib/%%PYTHON_VERSION%%/site-packages/salias.pyc
+lib/%%PYTHON_VERSION%%/site-packages/salias.pyo
diff --git a/net-im/py-jabber/pkg-plist b/net-im/py-jabber/pkg-plist
index 2dbcf6c9f7a5..3001a6070ac9 100644
--- a/net-im/py-jabber/pkg-plist
+++ b/net-im/py-jabber/pkg-plist
@@ -1,4 +1,6 @@
 lib/%%PYTHON_VERSION%%/site-packages/xmlstream.py
 lib/%%PYTHON_VERSION%%/site-packages/xmlstream.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xmlstream.pyo
 lib/%%PYTHON_VERSION%%/site-packages/jabber.py
 lib/%%PYTHON_VERSION%%/site-packages/jabber.pyc
+lib/%%PYTHON_VERSION%%/site-packages/jabber.pyo
diff --git a/net-mgmt/py-ipy/pkg-plist b/net-mgmt/py-ipy/pkg-plist
index b526b8ef8600..4695f12f5a96 100644
--- a/net-mgmt/py-ipy/pkg-plist
+++ b/net-mgmt/py-ipy/pkg-plist
@@ -1,2 +1,3 @@
 lib/%%PYTHON_VERSION%%/site-packages/IPy.py
 lib/%%PYTHON_VERSION%%/site-packages/IPy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/IPy.pyo
diff --git a/net-p2p/py-fngrab/pkg-plist b/net-p2p/py-fngrab/pkg-plist
index ed9ae70b4494..580c27e7d1e3 100644
--- a/net-p2p/py-fngrab/pkg-plist
+++ b/net-p2p/py-fngrab/pkg-plist
@@ -1,12 +1,17 @@
 bin/fngrab
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab
diff --git a/net/py-adns/pkg-plist b/net/py-adns/pkg-plist
index de0c190b1308..6cef527401b9 100644
--- a/net/py-adns/pkg-plist
+++ b/net/py-adns/pkg-plist
@@ -1,7 +1,10 @@
 %%PYTHON_SITELIBDIR%%/ADNS.py
 %%PYTHON_SITELIBDIR%%/ADNS.pyc
+%%PYTHON_SITELIBDIR%%/ADNS.pyo
 %%PYTHON_SITELIBDIR%%/adns.so
 %%PYTHON_SITELIBDIR%%/hostmx.py
 %%PYTHON_SITELIBDIR%%/hostmx.pyc
+%%PYTHON_SITELIBDIR%%/hostmx.pyo
 %%PYTHON_SITELIBDIR%%/rblcheck.py
 %%PYTHON_SITELIBDIR%%/rblcheck.pyc
+%%PYTHON_SITELIBDIR%%/rblcheck.pyo
diff --git a/net/py-fngrab/pkg-plist b/net/py-fngrab/pkg-plist
index ed9ae70b4494..580c27e7d1e3 100644
--- a/net/py-fngrab/pkg-plist
+++ b/net/py-fngrab/pkg-plist
@@ -1,12 +1,17 @@
 bin/fngrab
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.py
 lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab
diff --git a/net/py-ipy/pkg-plist b/net/py-ipy/pkg-plist
index b526b8ef8600..4695f12f5a96 100644
--- a/net/py-ipy/pkg-plist
+++ b/net/py-ipy/pkg-plist
@@ -1,2 +1,3 @@
 lib/%%PYTHON_VERSION%%/site-packages/IPy.py
 lib/%%PYTHON_VERSION%%/site-packages/IPy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/IPy.pyo
diff --git a/net/py-jabber/pkg-plist b/net/py-jabber/pkg-plist
index 2dbcf6c9f7a5..3001a6070ac9 100644
--- a/net/py-jabber/pkg-plist
+++ b/net/py-jabber/pkg-plist
@@ -1,4 +1,6 @@
 lib/%%PYTHON_VERSION%%/site-packages/xmlstream.py
 lib/%%PYTHON_VERSION%%/site-packages/xmlstream.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xmlstream.pyo
 lib/%%PYTHON_VERSION%%/site-packages/jabber.py
 lib/%%PYTHON_VERSION%%/site-packages/jabber.pyc
+lib/%%PYTHON_VERSION%%/site-packages/jabber.pyo
diff --git a/print/py-fonttools/pkg-plist b/print/py-fonttools/pkg-plist
index dfaa4dbc3b11..8b86aa4a03fd 100644
--- a/print/py-fonttools/pkg-plist
+++ b/print/py-fonttools/pkg-plist
@@ -14,8 +14,11 @@ lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/MacRoman.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/StandardEncoding.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/MacRoman.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/MacRoman.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/StandardEncoding.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/StandardEncoding.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/arrayTools.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/eexec.py
@@ -26,13 +29,21 @@ lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psOperators.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/textTools.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/eexecOp.so
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/arrayTools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/arrayTools.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/eexec.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/eexec.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/homeResFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/homeResFile.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psCharStrings.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psCharStrings.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psLib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psLib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psOperators.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/psOperators.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/textTools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/misc/textTools.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/macUtils.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/sfnt.py
@@ -78,63 +89,119 @@ lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/asciiTable
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/otCommon.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/ttProgram.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/C_F_F_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/C_F_F_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/D_S_I_G_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/D_S_I_G_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/DefaultTable.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/DefaultTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/G_P_O_S_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/G_P_O_S_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/G_S_U_B_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/G_S_U_B_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/L_T_S_H_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/L_T_S_H_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/O_S_2f_2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/O_S_2f_2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_B_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_B_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_D_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_D_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_J_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_J_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_P_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_P_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_S_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_S_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_V_.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I_V_.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__0.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__0.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__1.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__1.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__3.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__5.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/T_S_I__5.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_c_m_a_p.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_c_m_a_p.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_c_v_t.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_c_v_t.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_f_p_g_m.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_f_p_g_m.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_g_a_s_p.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_g_a_s_p.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_g_l_y_f.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_g_l_y_f.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_d_m_x.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_d_m_x.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_e_a_d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_e_a_d.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_h_e_a.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_h_e_a.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_m_t_x.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_h_m_t_x.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_k_e_r_n.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_k_e_r_n.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_l_o_c_a.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_l_o_c_a.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_m_a_x_p.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_m_a_x_p.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_n_a_m_e.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_n_a_m_e.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_p_o_s_t.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_p_o_s_t.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_p_r_e_p.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_p_r_e_p.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_v_h_e_a.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_v_h_e_a.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_v_m_t_x.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/_v_m_t_x.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/asciiTable.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/asciiTable.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/otCommon.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/otCommon.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/ttProgram.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/tables/ttProgram.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/ttBrowser.py
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/ttBrowser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/test/ttBrowser.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/macUtils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/macUtils.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/sfnt.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/sfnt.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/standardGlyphOrder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/standardGlyphOrder.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/xmlImport.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/ttLib/xmlImport.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/afmLib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/afmLib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/agl.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/agl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/cffLib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/cffLib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/fondLib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/fondLib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/nfntLib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/nfntLib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/t1Lib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/t1Lib.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/unicode.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/unicode.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/sstruct.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/sstruct.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools/xmlWriter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/FontTools/xmlWriter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/FontTools.pth
 %%PORTDOCS%%share/doc/py-fonttools/index.html
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/FontTools/fontTools/encodings
diff --git a/science/mayavi/pkg-plist b/science/mayavi/pkg-plist
index 5e146cd480a2..642a3b99baee 100644
--- a/science/mayavi/pkg-plist
+++ b/science/mayavi/pkg-plist
@@ -1,98 +1,145 @@
 bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Base/DataVizManager.py
 %%PYTHON_SITELIBDIR%%/mayavi/Base/DataVizManager.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Base/DataVizManager.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Base/ModuleManager.py
 %%PYTHON_SITELIBDIR%%/mayavi/Base/ModuleManager.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Base/ModuleManager.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Base/Objects.py
 %%PYTHON_SITELIBDIR%%/mayavi/Base/Objects.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Base/Objects.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Base/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Base/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Base/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Common.py
 %%PYTHON_SITELIBDIR%%/mayavi/Common.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Common.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractUnstructuredGrid.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractUnstructuredGrid.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractUnstructuredGrid.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorComponents.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorComponents.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorComponents.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorNorm.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorNorm.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractVectorNorm.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/MaskPoints.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/MaskPoints.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/MaskPoints.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpVector.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpVector.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpVector.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Main.py
 %%PYTHON_SITELIBDIR%%/mayavi/Main.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Main.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/HedgeHog.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/HedgeHog.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/HedgeHog.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Outline.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Outline.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Outline.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/PolyData.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/PolyData.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/PolyData.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ScalarCutPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ScalarCutPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/ScalarCutPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Streamlines.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Streamlines.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Streamlines.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/StructuredGridOutline.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/StructuredGridOutline.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/StructuredGridOutline.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/SurfaceMap.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/SurfaceMap.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/SurfaceMap.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/PLOT3DReader.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/PLOT3DReader.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/PLOT3DReader.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VRMLImporter.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VRMLImporter.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VRMLImporter.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkData.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkData.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkData.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/mv3DSImporter.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/mv3DSImporter.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/mv3DSImporter.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/ivtk.py
 %%PYTHON_SITELIBDIR%%/mayavi/ivtk.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/ivtk.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/Icons/actor.gif
 %%PYTHON_SITELIBDIR%%/vtkPipeline/Icons/camera.gif
 %%PYTHON_SITELIBDIR%%/vtkPipeline/Icons/colormap.gif
@@ -113,16 +160,22 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/vtkPipeline/Icons/tk.gif
 %%PYTHON_SITELIBDIR%%/vtkPipeline/TreeWidget.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/TreeWidget.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/TreeWidget.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ZoomHeight.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ZoomHeight.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/ZoomHeight.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/__init__.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/__init__.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/__init__.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/test_parser.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/test_parser.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/test_parser.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkMethodParser.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkMethodParser.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/vtkMethodParser.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.pyc
+%%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/mayavi/Base
 @dirrm %%PYTHON_SITELIBDIR%%/mayavi/Filters
 @dirrm %%PYTHON_SITELIBDIR%%/mayavi/Misc
diff --git a/security/py-amkCrypto/pkg-plist b/security/py-amkCrypto/pkg-plist
index ba7bc745d378..b6194c57093f 100644
--- a/security/py-amkCrypto/pkg-plist
+++ b/security/py-amkCrypto/pkg-plist
@@ -1,69 +1,102 @@
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC2.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC4.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC4.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/ARC4.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/Blowfish.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/Blowfish.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/Blowfish.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/CAST.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/CAST.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/CAST.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES3.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES3.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/DES3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/IDEA.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/IDEA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/IDEA.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/RC5.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/RC5.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/RC5.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Cipher/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Ciphers.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Ciphers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Ciphers.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/HMAC.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/HMAC.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/HMAC.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD2.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD2.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD2.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD5.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD5.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/MD5.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/RIPEMD.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/RIPEMD.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/RIPEMD.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/SHA.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/SHA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/SHA.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hash/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hashes.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hashes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Hashes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/AllOrNothing.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/AllOrNothing.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/AllOrNothing.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Protocol/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/DSA.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/DSA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/DSA.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/ElGamal.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/ElGamal.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/ElGamal.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/RSA.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/RSA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/RSA.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/pubkey.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/pubkey.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/pubkey.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/qNEW.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/qNEW.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey/qNEW.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/RFC1751.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/RFC1751.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/RFC1751.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/number.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/number.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/number.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/randpool.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/randpool.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/randpool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/test.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/test.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/test.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/testdata.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/testdata.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util/testdata.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Utils.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/Utils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/Utils.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Crypto/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Crypto/mxCrypto.so
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Crypto/Util
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Crypto/PublicKey
diff --git a/security/py-cryptkit/pkg-plist b/security/py-cryptkit/pkg-plist
index f8a798033fc8..664d98247bd7 100644
--- a/security/py-cryptkit/pkg-plist
+++ b/security/py-cryptkit/pkg-plist
@@ -3,26 +3,37 @@ lib/%%PYTHON_VERSION%%/site-packages/rijndaelc.so
 lib/%%PYTHON_VERSION%%/site-packages/sha256c.so
 lib/%%PYTHON_VERSION%%/site-packages/aes/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/aes/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/aes/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/aes/aes.py
 lib/%%PYTHON_VERSION%%/site-packages/aes/aes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/aes/aes.pyo
 lib/%%PYTHON_VERSION%%/site-packages/cryptsock/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/cryptsock/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/cryptsock/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/cryptsock/cryptsock.py
 lib/%%PYTHON_VERSION%%/site-packages/cryptsock/cryptsock.pyc
+lib/%%PYTHON_VERSION%%/site-packages/cryptsock/cryptsock.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ecc/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/ecc/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ecc/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ecc/ecc.py
 lib/%%PYTHON_VERSION%%/site-packages/ecc/ecc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ecc/ecc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/ecc/elliptic.py
 lib/%%PYTHON_VERSION%%/site-packages/ecc/elliptic.pyc
+lib/%%PYTHON_VERSION%%/site-packages/ecc/elliptic.pyo
 lib/%%PYTHON_VERSION%%/site-packages/entropy/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/entropy/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/entropy/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/entropy/entropy.py
 lib/%%PYTHON_VERSION%%/site-packages/entropy/entropy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/entropy/entropy.pyo
 lib/%%PYTHON_VERSION%%/site-packages/sha256/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/sha256/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/sha256/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/sha256/sha256.py
 lib/%%PYTHON_VERSION%%/site-packages/sha256/sha256.pyc
+lib/%%PYTHON_VERSION%%/site-packages/sha256/sha256.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/aes
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/cryptsock
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/ecc
diff --git a/textproc/roap/pkg-plist b/textproc/roap/pkg-plist
index d0d2a9783034..63c55a7507d6 100644
--- a/textproc/roap/pkg-plist
+++ b/textproc/roap/pkg-plist
@@ -1,14 +1,19 @@
 bin/roap
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/roaplib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/datasource.py
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/datasource.pyc
+lib/%%PYTHON_VERSION%%/site-packages/roaplib/datasource.pyo
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/generate.py
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/generate.pyc
+lib/%%PYTHON_VERSION%%/site-packages/roaplib/generate.pyo
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/matchobject.py
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/matchobject.pyc
+lib/%%PYTHON_VERSION%%/site-packages/roaplib/matchobject.pyo
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/roapxml.py
 lib/%%PYTHON_VERSION%%/site-packages/roaplib/roapxml.pyc
+lib/%%PYTHON_VERSION%%/site-packages/roaplib/roapxml.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/roaplib
 %%PORTDOCS%%share/doc/roap/README
 %%PORTDOCS%%share/doc/roap/README.ja
diff --git a/www/pyweblib/pkg-plist b/www/pyweblib/pkg-plist
index a26c0c26734e..eeb5c15a26b3 100644
--- a/www/pyweblib/pkg-plist
+++ b/www/pyweblib/pkg-plist
@@ -1,13 +1,19 @@
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/forms.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/forms.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/forms.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/helper.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/helper.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/helper.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/httphelper.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/httphelper.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/httphelper.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/session.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/session.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/session.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/sslenv.py
 lib/%%PYTHON_VERSION%%/site-packages/pyweblib/sslenv.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyweblib/sslenv.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/pyweblib