1 files changed, 138 insertions, 130 deletions

diff --git a/devel/py-kid/pkg-plist b/devel/py-kid/pkg-plist
index 809942870ee3..26b6f92dce0d 100644
--- a/devel/py-kid/pkg-plist
+++ b/devel/py-kid/pkg-plist
@@ -1,129 +1,135 @@
-@comment $FreeBSD$
-bin/kidc
 bin/kid
-%%PYTHON_SITELIBDIR%%/kid/__init__.py
-%%PYTHON_SITELIBDIR%%/kid/codewriter.py
-%%PYTHON_SITELIBDIR%%/kid/compile.py
-%%PYTHON_SITELIBDIR%%/kid/compiler.py
-%%PYTHON_SITELIBDIR%%/kid/et.py
-%%PYTHON_SITELIBDIR%%/kid/filter.py
-%%PYTHON_SITELIBDIR%%/kid/format.py
-%%PYTHON_SITELIBDIR%%/kid/importer.py
-%%PYTHON_SITELIBDIR%%/kid/namespace.py
-%%PYTHON_SITELIBDIR%%/kid/parser.py
-%%PYTHON_SITELIBDIR%%/kid/properties.py
-%%PYTHON_SITELIBDIR%%/kid/pull.py
-%%PYTHON_SITELIBDIR%%/kid/release.py
-%%PYTHON_SITELIBDIR%%/kid/run.py
-%%PYTHON_SITELIBDIR%%/kid/serialization.py
-%%PYTHON_SITELIBDIR%%/kid/server.py
-%%PYTHON_SITELIBDIR%%/kid/template_util.py
-%%PYTHON_SITELIBDIR%%/kid/util.py
-%%PYTHON_SITELIBDIR%%/kid/test/__init__.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_comment.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_compiler.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_error.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_extends.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_format.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_layout.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_match.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_namespace.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_parser.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_properties.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_scope.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.py
-%%PYTHON_SITELIBDIR%%/kid/test/util.py
-%%PYTHON_SITELIBDIR%%/kid/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_comment.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_compiler.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_error.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_extends.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_format.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_layout.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_match.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_namespace.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_parser.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_properties.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_scope.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/util.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_comment.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_compiler.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_error.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_extends.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_format.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_layout.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_match.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_namespace.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_parser.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_properties.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_scope.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/util.pyo
-%%PYTHON_SITELIBDIR%%/kid/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kid/codewriter.pyc
-%%PYTHON_SITELIBDIR%%/kid/compile.pyc
-%%PYTHON_SITELIBDIR%%/kid/compiler.pyc
-%%PYTHON_SITELIBDIR%%/kid/et.pyc
-%%PYTHON_SITELIBDIR%%/kid/filter.pyc
-%%PYTHON_SITELIBDIR%%/kid/format.pyc
-%%PYTHON_SITELIBDIR%%/kid/importer.pyc
-%%PYTHON_SITELIBDIR%%/kid/namespace.pyc
-%%PYTHON_SITELIBDIR%%/kid/parser.pyc
-%%PYTHON_SITELIBDIR%%/kid/properties.pyc
-%%PYTHON_SITELIBDIR%%/kid/pull.pyc
-%%PYTHON_SITELIBDIR%%/kid/release.pyc
-%%PYTHON_SITELIBDIR%%/kid/run.pyc
-%%PYTHON_SITELIBDIR%%/kid/serialization.pyc
-%%PYTHON_SITELIBDIR%%/kid/server.pyc
-%%PYTHON_SITELIBDIR%%/kid/template_util.pyc
-%%PYTHON_SITELIBDIR%%/kid/util.pyc
-%%PYTHON_SITELIBDIR%%/kid/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kid/codewriter.pyo
-%%PYTHON_SITELIBDIR%%/kid/compile.pyo
-%%PYTHON_SITELIBDIR%%/kid/compiler.pyo
-%%PYTHON_SITELIBDIR%%/kid/et.pyo
-%%PYTHON_SITELIBDIR%%/kid/filter.pyo
-%%PYTHON_SITELIBDIR%%/kid/format.pyo
-%%PYTHON_SITELIBDIR%%/kid/importer.pyo
-%%PYTHON_SITELIBDIR%%/kid/namespace.pyo
-%%PYTHON_SITELIBDIR%%/kid/run.pyo
-%%PYTHON_SITELIBDIR%%/kid/parser.pyo
-%%PYTHON_SITELIBDIR%%/kid/properties.pyo
-%%PYTHON_SITELIBDIR%%/kid/pull.pyo
-%%PYTHON_SITELIBDIR%%/kid/release.pyo
-%%PYTHON_SITELIBDIR%%/kid/serialization.pyo
-%%PYTHON_SITELIBDIR%%/kid/server.pyo
-%%PYTHON_SITELIBDIR%%/kid/template_util.pyo
-%%PYTHON_SITELIBDIR%%/kid/util.pyo
+bin/kidc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_OLD%%%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/codewriter.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/codewriter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/codewriter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compile.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compile.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/compiler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/et.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/filter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/format.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/format.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/format.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/importer.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/importer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/importer.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/namespace.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/parser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/properties.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/pull.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/release.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/run.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/run.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/run.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/serialization.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/serialization.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/serialization.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/server.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/server.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/server.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/template_util.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/template_util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/template_util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_attribute_interpolation.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_attribute_interpolation.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_attribute_interpolation.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_codewriter.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_codewriter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_codewriter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_comment.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_comment.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_comment.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_compiler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_error.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extended_layout.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extended_layout.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extended_layout.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extends.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extends.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_extends.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_format.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_format.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_format.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid_lang.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid_lang.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_kid_lang.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_layout.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_layout.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_layout.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_match.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_match.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_match.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_namespace.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_parser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_properties.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_scope.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization_escaping.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization_escaping.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_serialization_escaping.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_suffixes.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_suffixes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_suffixes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_templatepath.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_templatepath.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_templatepath.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_unicode.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_unicode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/test_unicode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/util.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/util.py
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/util.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi/kid_handler.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi/sysinfo.kid
@@ -132,8 +138,10 @@ bin/kid
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic/sysinfo.kid
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic/tutorial.kid
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic/tutorial2.kid
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/cgi
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/basic
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%/kid/test
-@dirrmtry %%PYTHON_SITELIBDIR%%/kid
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cgi
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/basic
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid/test
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/kid
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYKID_EGG%%