Update to 1.9.4:

This release ist mostly about security and bug fixes and a few
minor changes (including Python 2.7 compatibility).

3 files changed, 89 insertions, 22 deletions

diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index eabd03a513d..384772b38e5 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/04/08 19:09:17 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/06/03 22:49:25 wiz Exp $
 #
 
-VER=		1.9.3
+VER=		1.9.4
 DISTNAME=	moin-${VER}
 PKGNAME=	${PYPKGPREFIX}-moin-${VER}
-PKGREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://static.moinmo.in/files/
 
diff --git a/www/py-moin/PLIST b/www/py-moin/PLIST
index f2538b14e52..6013eccc4d5 100644
--- a/www/py-moin/PLIST
+++ b/www/py-moin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/04/08 20:21:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/06/03 22:49:25 wiz Exp $
 bin/moin
 ${PYSITELIB}/MoinMoin/Page.py
 ${PYSITELIB}/MoinMoin/Page.pyc
@@ -863,6 +863,9 @@ ${PYSITELIB}/MoinMoin/script/migration/1090200.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1090300.py
 ${PYSITELIB}/MoinMoin/script/migration/1090300.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1090300.pyo
+${PYSITELIB}/MoinMoin/script/migration/1090400.py
+${PYSITELIB}/MoinMoin/script/migration/1090400.pyc
+${PYSITELIB}/MoinMoin/script/migration/1090400.pyo
 ${PYSITELIB}/MoinMoin/script/migration/__init__.py
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyc
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyo
@@ -1109,6 +1112,9 @@ ${PYSITELIB}/MoinMoin/support/flup/server/threadpool.pyo
 ${PYSITELIB}/MoinMoin/support/htmlmarkup.py
 ${PYSITELIB}/MoinMoin/support/htmlmarkup.pyc
 ${PYSITELIB}/MoinMoin/support/htmlmarkup.pyo
+${PYSITELIB}/MoinMoin/support/md5crypt.py
+${PYSITELIB}/MoinMoin/support/md5crypt.pyc
+${PYSITELIB}/MoinMoin/support/md5crypt.pyo
 ${PYSITELIB}/MoinMoin/support/parsedatetime/__init__.py
 ${PYSITELIB}/MoinMoin/support/parsedatetime/__init__.pyc
 ${PYSITELIB}/MoinMoin/support/parsedatetime/__init__.pyo
@@ -1208,6 +1214,9 @@ ${PYSITELIB}/MoinMoin/support/pygments/lexers/dotnet.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/functional.py
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/functional.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/functional.pyo
+${PYSITELIB}/MoinMoin/support/pygments/lexers/hdl.py
+${PYSITELIB}/MoinMoin/support/pygments/lexers/hdl.pyc
+${PYSITELIB}/MoinMoin/support/pygments/lexers/hdl.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/math.py
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/math.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/math.pyo
@@ -1346,9 +1355,6 @@ ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/lint.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/profiler.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/profiler.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/profiler.pyo
-${PYSITELIB}/MoinMoin/support/werkzeug/contrib/reporterstream.py
-${PYSITELIB}/MoinMoin/support/werkzeug/contrib/reporterstream.pyc
-${PYSITELIB}/MoinMoin/support/werkzeug/contrib/reporterstream.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/securecookie.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/securecookie.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/contrib/securecookie.pyo
@@ -1370,33 +1376,36 @@ ${PYSITELIB}/MoinMoin/support/werkzeug/debug/__init__.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/console.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/console.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/console.pyo
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/render.py
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/render.pyc
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/render.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/repr.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/repr.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/repr.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/tbtools.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/tbtools.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/debug/tbtools.pyo
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/utils.py
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/utils.pyc
-${PYSITELIB}/MoinMoin/support/werkzeug/debug/utils.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/exceptions.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/exceptions.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/exceptions.pyo
+${PYSITELIB}/MoinMoin/support/werkzeug/formparser.py
+${PYSITELIB}/MoinMoin/support/werkzeug/formparser.pyc
+${PYSITELIB}/MoinMoin/support/werkzeug/formparser.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/http.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/http.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/http.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/local.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/local.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/local.pyo
+${PYSITELIB}/MoinMoin/support/werkzeug/posixemulation.py
+${PYSITELIB}/MoinMoin/support/werkzeug/posixemulation.pyc
+${PYSITELIB}/MoinMoin/support/werkzeug/posixemulation.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/routing.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/routing.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/routing.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/script.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/script.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/script.pyo
+${PYSITELIB}/MoinMoin/support/werkzeug/security.py
+${PYSITELIB}/MoinMoin/support/werkzeug/security.pyc
+${PYSITELIB}/MoinMoin/support/werkzeug/security.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/serving.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/serving.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/serving.pyo
@@ -1409,6 +1418,9 @@ ${PYSITELIB}/MoinMoin/support/werkzeug/test.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/testapp.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/testapp.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/testapp.pyo
+${PYSITELIB}/MoinMoin/support/werkzeug/urls.py
+${PYSITELIB}/MoinMoin/support/werkzeug/urls.pyc
+${PYSITELIB}/MoinMoin/support/werkzeug/urls.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/useragents.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/useragents.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/useragents.pyo
@@ -1418,6 +1430,9 @@ ${PYSITELIB}/MoinMoin/support/werkzeug/utils.pyo
 ${PYSITELIB}/MoinMoin/support/werkzeug/wrappers.py
 ${PYSITELIB}/MoinMoin/support/werkzeug/wrappers.pyc
 ${PYSITELIB}/MoinMoin/support/werkzeug/wrappers.pyo
+${PYSITELIB}/MoinMoin/support/werkzeug/wsgi.py
+${PYSITELIB}/MoinMoin/support/werkzeug/wsgi.pyc
+${PYSITELIB}/MoinMoin/support/werkzeug/wsgi.pyo
 ${PYSITELIB}/MoinMoin/support/xappy/__init__.py
 ${PYSITELIB}/MoinMoin/support/xappy/__init__.pyc
 ${PYSITELIB}/MoinMoin/support/xappy/__init__.pyo
@@ -2579,10 +2594,12 @@ share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--option
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_system_pages.zip
@@ -2593,11 +2610,14 @@ share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--translated_system
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--all_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--optional_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Chinese_Taiwan--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--all_system_pages.zip
@@ -2606,9 +2626,11 @@ share/moin/underlay/pages/LanguageSetup/attachments/Croatian--essential_system_p
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_system_pages.zip
@@ -2616,14 +2638,20 @@ share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_help_pages.z
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--essential_category_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--optional_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Danish--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Danish--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Dutch--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Dutch--all_pages.zip
@@ -2655,11 +2683,14 @@ share/moin/underlay/pages/LanguageSetup/attachments/English--translated_system_p
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Finnish--all_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Finnish--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--optional_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Finnish--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Finnish--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/French--admin_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/French--all_category_pages.zip
@@ -2699,23 +2730,35 @@ share/moin/underlay/pages/LanguageSetup/attachments/German--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/German--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/German--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/German--translated_system_pages.zip
-share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--essential_system_pages.zip
-share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--optional_help_pages.zip
-share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hebrew--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hindi--all_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hindi--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hindi--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hindi--optional_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hindi--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--essential_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Hungarian--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--optional_help_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Indonesian--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Italian--admin_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Italian--all_category_pages.zip
@@ -2752,10 +2795,12 @@ share/moin/underlay/pages/LanguageSetup/attachments/Korean--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Korean--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Korean--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--admin_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Latvian--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Latvian--essential_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--essential_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Latvian--essential_template_pages.zip
@@ -2767,6 +2812,7 @@ share/moin/underlay/pages/LanguageSetup/attachments/Latvian--translated_system_p
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--essential_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Lithuanian--optional_help_pages.zip
@@ -2777,9 +2823,14 @@ share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Mongolian--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--course_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--essential_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--essential_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Norwegian_Bokmal--optional_pages.zip
@@ -2795,8 +2846,10 @@ share/moin/underlay/pages/LanguageSetup/attachments/Persian--translated_system_p
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Polish--all_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Polish--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Polish--optional_system_pages.zip
@@ -2804,11 +2857,16 @@ share/moin/underlay/pages/LanguageSetup/attachments/Polish--translated_system_pa
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Portuguese--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Romanian--admin_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Romanian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Romanian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Romanian--all_system_pages.zip
@@ -2837,19 +2895,28 @@ share/moin/underlay/pages/LanguageSetup/attachments/Russian--optional_template_p
 share/moin/underlay/pages/LanguageSetup/attachments/Russian--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Serbian--all_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Serbian--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Serbian--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--admin_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--essential_category_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--optional_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Simplified_Chinese--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Slovak--all_category_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Slovak--all_help_pages.zip
@@ -2896,10 +2963,12 @@ share/moin/underlay/pages/LanguageSetup/attachments/Swedish--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Swedish--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Swedish--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Swedish--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Turkish--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--all_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Turkish--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Turkish--translated_system_pages.zip
@@ -2912,6 +2981,7 @@ share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--essential_system_
 share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--optional_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Ukrainian--translated_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/current
diff --git a/www/py-moin/distinfo b/www/py-moin/distinfo
index 43c10f7b13e..e1f40aad5c8 100644
--- a/www/py-moin/distinfo
+++ b/www/py-moin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/01/27 05:52:40 obache Exp $
+$NetBSD: distinfo,v 1.9 2012/06/03 22:49:25 wiz Exp $
 
-SHA1 (moin-1.9.3.tar.gz) = e019c2742f42d4d1f32b0f86f985ce938b821f1b
-RMD160 (moin-1.9.3.tar.gz) = c8679c9440768906c47048f2544a26b77b1ca061
-Size (moin-1.9.3.tar.gz) = 30514897 bytes
-SHA1 (patch-MoinMoin_parser_text__rst.py) = 21876302d8ecef85295cc6c24ef4e3823f578556
-SHA1 (patch-MoinMoin_support_werkzeug_templates.py) = d0baba8d2d01f9757e0702786828e2f4d6716c1b
+SHA1 (moin-1.9.4.tar.gz) = f5dfef5512cfae36c71eefbcbafde6857f1790b9
+RMD160 (moin-1.9.4.tar.gz) = 3c74f0b8d226780aedca628d8d1e0b03e4d28224
+Size (moin-1.9.4.tar.gz) = 36718571 bytes