3 files changed, 230 insertions, 5 deletions

diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 41d20a527099..17b8d0b4dfab 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	Genshi
-PORTVERSION=	0.4
-PORTREVISION=	1
+PORTVERSION=	0.4.4
+#PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	textproc www python
 MASTER_SITES=	http://ftp.edgewall.com/pub/${PORTNAME:L}/ \
@@ -20,4 +20,15 @@ COMMENT=	Python toolkit for stream-based generation of output for the web
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/py-genshi/distinfo b/textproc/py-genshi/distinfo
index e7c9402b3b94..6c5e9132dfff 100644
--- a/textproc/py-genshi/distinfo
+++ b/textproc/py-genshi/distinfo
@@ -1,3 +1,3 @@
-MD5 (Genshi-0.4.tar.gz) = de173a730938dac1ad9d4dce955b9343
-SHA256 (Genshi-0.4.tar.gz) = acd65a99c9db110a1a690bf80011c445f3cad0bda4097cf119e26bc46568908d
-SIZE (Genshi-0.4.tar.gz) = 261785
+MD5 (Genshi-0.4.4.tar.gz) = 4bbf7a4cde45b82a55d2f42f4a254c6a
+SHA256 (Genshi-0.4.4.tar.gz) = 190cfd031d55ef474207196d06775cf5e36d6494884e227e5fbaef8051f8b0a1
+SIZE (Genshi-0.4.4.tar.gz) = 284080
diff --git a/textproc/py-genshi/pkg-plist b/textproc/py-genshi/pkg-plist
index ddf68a1c022f..0f4857f56981 100644
--- a/textproc/py-genshi/pkg-plist
+++ b/textproc/py-genshi/pkg-plist
@@ -1 +1,215 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PORTDOCS%%%%DOCSDIR%%/2000ft.png
+%%PORTDOCS%%%%DOCSDIR%%/api/api-objects.txt
+%%PORTDOCS%%%%DOCSDIR%%/api/class-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/api/crarr.png
+%%PORTDOCS%%%%DOCSDIR%%/api/epydoc.css
+%%PORTDOCS%%%%DOCSDIR%%/api/epydoc.js
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.builder-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.builder.Element-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.builder.ElementFactory-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.builder.Fragment-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core.Attrs-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core.Markup-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core.Namespace-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core.QName-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.core.Stream-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters.html-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters.html.HTMLFormFiller-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters.html.HTMLSanitizer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters.i18n-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.filters.i18n.Translator-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.input-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.input.HTMLParser-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.input.ParseError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.input.XMLParser-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output.DocType-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output.HTMLSerializer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output.TextSerializer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output.XHTMLSerializer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.output.XMLSerializer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.path-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.path.Path-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.path.PathSyntaxError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.BadDirectiveError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.Context-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.Template-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.TemplateError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.TemplateMeta-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.TemplateRuntimeError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.base.TemplateSyntaxError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.AttrsDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.ChooseDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.ContentDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.DefDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.DirectiveMeta-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.ForDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.IfDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.MatchDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.OtherwiseDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.ReplaceDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.StripDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.WhenDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.directives.WithDirective-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.Code-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.Expression-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.LenientLookup-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.StrictLookup-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.Suite-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.Undefined-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.eval.UndefinedError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.interpolation-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.loader-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.loader.TemplateLoader-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.loader.TemplateNotFound-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.markup-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.markup.MarkupTemplate-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.plugin-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.plugin.AbstractTemplateEnginePlugin-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.plugin.ConfigurationError-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.plugin.MarkupTemplateEnginePlugin-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.plugin.TextTemplateEnginePlugin-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.text-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.template.text.TextTemplate-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.util-module.html
+%%PORTDOCS%%%%DOCSDIR%%/api/genshi.util.LRUCache-class.html
+%%PORTDOCS%%%%DOCSDIR%%/api/help.html
+%%PORTDOCS%%%%DOCSDIR%%/api/identifier-index.html
+%%PORTDOCS%%%%DOCSDIR%%/api/index.html
+%%PORTDOCS%%%%DOCSDIR%%/api/module-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/api/redirect.html
+%%PORTDOCS%%%%DOCSDIR%%/api/since-index.html
+%%PORTDOCS%%%%DOCSDIR%%/conf/docutils.ini
+%%PORTDOCS%%%%DOCSDIR%%/conf/epydoc.ini
+%%PORTDOCS%%%%DOCSDIR%%/filters.html
+%%PORTDOCS%%%%DOCSDIR%%/filters.txt
+%%PORTDOCS%%%%DOCSDIR%%/i18n.html
+%%PORTDOCS%%%%DOCSDIR%%/i18n.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/plugin.txt
+%%PORTDOCS%%%%DOCSDIR%%/streams.html
+%%PORTDOCS%%%%DOCSDIR%%/streams.txt
+%%PORTDOCS%%%%DOCSDIR%%/style/bkgnd_pattern.png
+%%PORTDOCS%%%%DOCSDIR%%/style/docutils.css
+%%PORTDOCS%%%%DOCSDIR%%/style/edgewall.css
+%%PORTDOCS%%%%DOCSDIR%%/style/epydoc.css
+%%PORTDOCS%%%%DOCSDIR%%/style/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/style/shadow.gif
+%%PORTDOCS%%%%DOCSDIR%%/style/vertbars.png
+%%PORTDOCS%%%%DOCSDIR%%/templates.html
+%%PORTDOCS%%%%DOCSDIR%%/templates.txt
+%%PORTDOCS%%%%DOCSDIR%%/text-templates.html
+%%PORTDOCS%%%%DOCSDIR%%/text-templates.txt
+%%PORTDOCS%%%%DOCSDIR%%/xml-templates.html
+%%PORTDOCS%%%%DOCSDIR%%/xml-templates.txt
+%%PORTDOCS%%%%DOCSDIR%%/xpath.html
+%%PORTDOCS%%%%DOCSDIR%%/xpath.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/kidrun.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/layout.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/layout.kid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/run.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/test.kid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/basic.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/bigtable.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/cheetah/footer.tmpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/cheetah/header.tmpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/cheetah/template.tmpl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/clearsilver/footer.cs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/clearsilver/header.cs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/clearsilver/template.cs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/django/templates/base.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/django/templates/template.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/django/templatetags/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/django/templatetags/bench.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/genshi/base.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/genshi/template.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/kid/base.kid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/kid/template.kid
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/myghty/base.myt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/myghty/template.myt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/simpletal/base.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench/simpletal/template.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cherrypy/config.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cherrypy/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cherrypy/index.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/common/macros.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/module/test.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/run.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/skins/default/footer.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/skins/default/header.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/includes/skins/default/layout.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transform/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transform/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transform/run.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transform/template.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/dev.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/config/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/config/app.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/config/log.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/controllers.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/json.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/model.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/release.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/static/images/favicon.ico
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/static/images/tg_under_the_hood.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/login.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/master.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/plain.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/sitetemplate.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/templates/welcome.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/tests/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/tests/test_controllers.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/genshitest/tests/test_model.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/sample-prod.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/setup.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbogears/start-genshitest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpy/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpy/hello.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpy/hello.py
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/conf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/style
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/basic
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/cheetah
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/clearsilver
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/django/templates
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/django/templatetags
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/django
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/genshi
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/kid
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/myghty
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench/simpletal
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bench
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cherrypy
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/includes/common
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/includes/module
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/includes/skins/default
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/includes/skins
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/includes
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/transform
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest/config
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest/static/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest/static
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest/templates
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest/tests
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears/genshitest
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/turbogears
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/webpy
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%