Update to 0.10

Reorder pkg-plist
Update maintainer's email

PR:		31741
Submitted by:	maintainer

3 files changed, 52 insertions, 100 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 546ed81..ffb6657 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	moinmoin
-PORTVERSION=	0.9
+PORTVERSION=	0.10
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	moin
-DISTNAME=	${PORTNAME:S/m/M/g}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	moin-${PORTVERSION}
 
-MAINTAINER=	perky@python.or.kr
+MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
@@ -22,21 +21,19 @@ CGIUSER?=	moinmoin
 CGIUSERID?=	192
 SUID_WRAPPER=	moin
 
-WIKI_WRKSRC=	${WRKSRC}/wiki-moinmoin
-LIB_TARGET=	${PYTHON_SITELIBDIR}/MoinMoin
-LIB_DIRS=	action formatter i18n macro parser py15 support twisted webapi .
+WIKI_WRKSRC=	${WRKSRC}/MoinMoin/wiki-moinmoin
 CGI_TARGET=	${PREFIX}/www/cgi-bin/moin
 CGI_FILES=	${SUID_WRAPPER} moin.cgi moin_config.py data
 CONTENT_TARGET=	${PREFIX}/www/data/moin
 CONTENT_FILES=	PythonPowered.gif default.css img moinmoin.gif index.html
+SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 do-configure:
 	@# Add the username, uid, group and gid
 	${SH} ${FILESDIR}/configure.sh ${CGIUSER} ${CGIUSERID}
 
 do-build:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	${SETUP_CMD} build
 	@# Compile setuid wrapper
 	${CC} ${CFLAGS} -o ${WIKI_WRKSRC}/${SUID_WRAPPER} \
 		-DPYTHON_PATH='"${PYTHON_CMD}"' \
@@ -45,13 +42,10 @@ do-build:
 
 do-install:
 	@# Install MoinMoin library
-	${MKDIR} ${LIB_TARGET}
-.for dir in ${LIB_DIRS}
-	${MKDIR} ${LIB_TARGET}/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/*.py* ${LIB_TARGET}/${dir}
-.endfor
+	${SETUP_CMD} install
+
 	@# Install CGI files and set permissions
-	${MKDIR} ${CGI_TARGET}
+	${MKDIR} ${CGI_TARGET}/data/backup
 	cd ${WIKI_WRKSRC} && ${CP} -Rp ${CGI_FILES} ${CGI_TARGET}/
 	${CHOWN} -R ${CGIUSER}:${CGIUSER} ${CGI_TARGET}/data \
 		${CGI_TARGET}/${SUID_WRAPPER}
diff --git a/www/moinmoin/distinfo b/www/moinmoin/distinfo
index 1972bd1..0a3063e 100644
--- a/www/moinmoin/distinfo
+++ b/www/moinmoin/distinfo
@@ -1 +1 @@
-MD5 (MoinMoin-0.9.tgz) = cff46855144af5abb7707da1d1be4b98
+MD5 (moin-0.10.tar.gz) = 583296b1760518ddbce67b255f35e94d
diff --git a/www/moinmoin/pkg-plist b/www/moinmoin/pkg-plist
index d5e9a94..6037ff8 100644
--- a/www/moinmoin/pkg-plist
+++ b/www/moinmoin/pkg-plist
@@ -1,4 +1,6 @@
-www/cgi-bin/moin/data/text/xbel_2d1_2e0_2exsl
+www/cgi-bin/moin/data/editlog
+www/cgi-bin/moin/data/intermap.txt
+www/cgi-bin/moin/data/text/ActionMarket
 www/cgi-bin/moin/data/text/AnonymousCoward
 www/cgi-bin/moin/data/text/AtsuoIshimoto
 www/cgi-bin/moin/data/text/CategoryCategory
@@ -58,7 +60,6 @@ www/cgi-bin/moin/data/text/MetaWiki
 www/cgi-bin/moin/data/text/MichaelChermside
 www/cgi-bin/moin/data/text/ModularizeForReuse
 www/cgi-bin/moin/data/text/MoinMoin
-www/cgi-bin/moin/data/text/SandBox
 www/cgi-bin/moin/data/text/MoinMoinBugs
 www/cgi-bin/moin/data/text/MoinMoinDiscussion
 www/cgi-bin/moin/data/text/MoinMoinDone
@@ -79,14 +80,14 @@ www/cgi-bin/moin/data/text/PatternTemplate
 www/cgi-bin/moin/data/text/PikiPiki
 www/cgi-bin/moin/data/text/PrettyPrintXslt
 www/cgi-bin/moin/data/text/ProcessingInstructions
-www/cgi-bin/moin/data/text/TimBird
 www/cgi-bin/moin/data/text/PythonLanguage
 www/cgi-bin/moin/data/text/RandomPage
+www/cgi-bin/moin/data/text/Really_20special_20page_20names_20_e4_f6_fc_c4_d6_dc_df_5c_7b_5b_5d_7d_2f_2c_2e_2d_3b_3a_5f_21_a7_24_25_26_2f_28_29_3d_22_3f_b4_2b_2a_23_27_7e_3c_3e_3c_7c_5e_b0_40
 www/cgi-bin/moin/data/text/RecentChanges
 www/cgi-bin/moin/data/text/RichardJones
 www/cgi-bin/moin/data/text/RobertChurch
+www/cgi-bin/moin/data/text/SandBox
 www/cgi-bin/moin/data/text/SecurityNeeds
-www/cgi-bin/moin/data/text/Really_20special_20page_20names_20_e4_f6_fc_c4_d6_dc_df_5c_7b_5b_5d_7d_2f_2c_2e_2d_3b_3a_5f_21_a7_24_25_26_2f_28_29_3d_22_3f_b4_2b_2a_23_27_7e_3c_3e_3c_7c_5e_b0_40
 www/cgi-bin/moin/data/text/SgmlEntities
 www/cgi-bin/moin/data/text/SourceForge
 www/cgi-bin/moin/data/text/SpamSpamSpam
@@ -95,6 +96,7 @@ www/cgi-bin/moin/data/text/StructuredText
 www/cgi-bin/moin/data/text/SunirShah
 www/cgi-bin/moin/data/text/SystemInfo
 www/cgi-bin/moin/data/text/SystemPages
+www/cgi-bin/moin/data/text/TimBird
 www/cgi-bin/moin/data/text/TitleIndex
 www/cgi-bin/moin/data/text/TopicMap
 www/cgi-bin/moin/data/text/UploadFile
@@ -119,18 +121,17 @@ www/cgi-bin/moin/data/text/WordIndex
 www/cgi-bin/moin/data/text/XsltVersion
 www/cgi-bin/moin/data/text/YasushiIwata
 www/cgi-bin/moin/data/text/biblio_2exsl
-www/cgi-bin/moin/data/text/ActionMarket
-www/cgi-bin/moin/data/backup/.cvsignore
-www/cgi-bin/moin/data/intermap.txt
-www/cgi-bin/moin/data/editlog
-www/cgi-bin/moin/moin_config.py
-www/cgi-bin/moin/moin.cgi
+www/cgi-bin/moin/data/text/xbel_2d1_2e0_2exsl
 www/cgi-bin/moin/moin
-@dirrm www/cgi-bin/moin/data/backup
+www/cgi-bin/moin/moin.cgi
+www/cgi-bin/moin/moin_config.py
 @dirrm www/cgi-bin/moin/data/text
+@dirrm www/cgi-bin/moin/data/backup
 @dirrm www/cgi-bin/moin/data
 @dirrm www/cgi-bin/moin
-www/data/moin/img/smile4.gif
+www/data/moin/PythonPowered.gif
+www/data/moin/default.css
+www/data/moin/img/alert.gif
 www/data/moin/img/angry.gif
 www/data/moin/img/attention.gif
 www/data/moin/img/biggrin.gif
@@ -150,199 +151,156 @@ www/data/moin/img/moin-print.gif
 www/data/moin/img/moin-search.gif
 www/data/moin/img/moin-show.gif
 www/data/moin/img/moin-telnet.gif
-www/data/moin/img/moin-www.gif
 www/data/moin/img/moin-updated.gif
+www/data/moin/img/moin-www.gif
 www/data/moin/img/redface.gif
 www/data/moin/img/sad.gif
 www/data/moin/img/smile.gif
 www/data/moin/img/smile2.gif
 www/data/moin/img/smile3.gif
-www/data/moin/img/alert.gif
+www/data/moin/img/smile4.gif
 www/data/moin/index.html
 www/data/moin/moinmoin.gif
-www/data/moin/default.css
-www/data/moin/PythonPowered.gif
 @dirrm www/data/moin/img
 @dirrm www/data/moin
-@cwd %%LOCALBASE%%
 %%PYTHON_SITELIB%%/MoinMoin/Page.py
 %%PYTHON_SITELIB%%/MoinMoin/Page.pyc
-%%PYTHON_SITELIB%%/MoinMoin/Page.pyo
 %%PYTHON_SITELIB%%/MoinMoin/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/_template.py
 %%PYTHON_SITELIB%%/MoinMoin/_template.pyc
-%%PYTHON_SITELIB%%/MoinMoin/_template.pyo
 %%PYTHON_SITELIB%%/MoinMoin/action/DeletePage.py
 %%PYTHON_SITELIB%%/MoinMoin/action/DeletePage.pyc
-%%PYTHON_SITELIB%%/MoinMoin/action/DeletePage.pyo
 %%PYTHON_SITELIB%%/MoinMoin/action/LikePages.py
 %%PYTHON_SITELIB%%/MoinMoin/action/LikePages.pyc
-%%PYTHON_SITELIB%%/MoinMoin/action/LikePages.pyo
+%%PYTHON_SITELIB%%/MoinMoin/action/LocalSiteMap.py
+%%PYTHON_SITELIB%%/MoinMoin/action/LocalSiteMap.pyc
 %%PYTHON_SITELIB%%/MoinMoin/action/SpellCheck.py
 %%PYTHON_SITELIB%%/MoinMoin/action/SpellCheck.pyc
-%%PYTHON_SITELIB%%/MoinMoin/action/SpellCheck.pyo
 %%PYTHON_SITELIB%%/MoinMoin/action/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/action/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/action/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/action/titleindex.py
 %%PYTHON_SITELIB%%/MoinMoin/action/titleindex.pyc
-%%PYTHON_SITELIB%%/MoinMoin/action/titleindex.pyo
 %%PYTHON_SITELIB%%/MoinMoin/caching.py
 %%PYTHON_SITELIB%%/MoinMoin/caching.pyc
-%%PYTHON_SITELIB%%/MoinMoin/caching.pyo
 %%PYTHON_SITELIB%%/MoinMoin/cgimain.py
 %%PYTHON_SITELIB%%/MoinMoin/cgimain.pyc
-%%PYTHON_SITELIB%%/MoinMoin/cgimain.pyo
-%%PYTHON_SITELIB%%/MoinMoin/cmdmain.py
-%%PYTHON_SITELIB%%/MoinMoin/cmdmain.pyc
-%%PYTHON_SITELIB%%/MoinMoin/cmdmain.pyo
 %%PYTHON_SITELIB%%/MoinMoin/config.py
 %%PYTHON_SITELIB%%/MoinMoin/config.pyc
-%%PYTHON_SITELIB%%/MoinMoin/config.pyo
 %%PYTHON_SITELIB%%/MoinMoin/editlog.py
 %%PYTHON_SITELIB%%/MoinMoin/editlog.pyc
-%%PYTHON_SITELIB%%/MoinMoin/editlog.pyo
 %%PYTHON_SITELIB%%/MoinMoin/formatter/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/formatter/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/formatter/base.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/base.pyc
-%%PYTHON_SITELIB%%/MoinMoin/formatter/base.pyo
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_html.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_html.pyc
-%%PYTHON_SITELIB%%/MoinMoin/formatter/text_html.pyo
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_plain.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_plain.pyc
-%%PYTHON_SITELIB%%/MoinMoin/formatter/text_plain.pyo
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_xml.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/text_xml.pyc
-%%PYTHON_SITELIB%%/MoinMoin/formatter/text_xml.pyo
 %%PYTHON_SITELIB%%/MoinMoin/httpdmain.py
 %%PYTHON_SITELIB%%/MoinMoin/httpdmain.pyc
-%%PYTHON_SITELIB%%/MoinMoin/httpdmain.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/_check.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/_check.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/_check.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/_sync.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/_sync.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/_sync.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/de.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/de.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/de.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fi.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fi.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/fi.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fr.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fr.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/fr.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/nl.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.pyc
-%%PYTHON_SITELIB%%/MoinMoin/i18n/sv.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/BR.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/Include.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/Include.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/Include.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/OrphanedPages.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/OrphanedPages.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/OrphanedPages.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/RandomPage.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/RandomPage.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/RandomPage.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/RecentChanges.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/RecentChanges.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/RecentChanges.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/TableOfContents.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/TableOfContents.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/TableOfContents.pyo
+%%PYTHON_SITELIB%%/MoinMoin/macro/TeudView.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/TeudView.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/WantedPages.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/WantedPages.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/WantedPages.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/macro/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/parser/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/parser/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/parser/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/parser/plain.py
 %%PYTHON_SITELIB%%/MoinMoin/parser/plain.pyc
-%%PYTHON_SITELIB%%/MoinMoin/parser/plain.pyo
 %%PYTHON_SITELIB%%/MoinMoin/parser/python.py
 %%PYTHON_SITELIB%%/MoinMoin/parser/python.pyc
-%%PYTHON_SITELIB%%/MoinMoin/parser/python.pyo
 %%PYTHON_SITELIB%%/MoinMoin/parser/wiki.py
 %%PYTHON_SITELIB%%/MoinMoin/parser/wiki.pyc
-%%PYTHON_SITELIB%%/MoinMoin/parser/wiki.pyo
 %%PYTHON_SITELIB%%/MoinMoin/parser/xslt.py
 %%PYTHON_SITELIB%%/MoinMoin/parser/xslt.pyc
-%%PYTHON_SITELIB%%/MoinMoin/parser/xslt.pyo
 %%PYTHON_SITELIB%%/MoinMoin/py15/Cookie.py
 %%PYTHON_SITELIB%%/MoinMoin/py15/Cookie.pyc
-%%PYTHON_SITELIB%%/MoinMoin/py15/Cookie.pyo
 %%PYTHON_SITELIB%%/MoinMoin/py15/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/py15/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/py15/__init__.pyo
+%%PYTHON_SITELIB%%/MoinMoin/request.py
+%%PYTHON_SITELIB%%/MoinMoin/request.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/scripts/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/_util.py
+%%PYTHON_SITELIB%%/MoinMoin/scripts/_util.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.py
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.pyc
+%%PYTHON_SITELIB%%/MoinMoin/security.py
+%%PYTHON_SITELIB%%/MoinMoin/security.pyc
 %%PYTHON_SITELIB%%/MoinMoin/support/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/support/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/support/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/support/cgitb.py
 %%PYTHON_SITELIB%%/MoinMoin/support/cgitb.pyc
-%%PYTHON_SITELIB%%/MoinMoin/support/cgitb.pyo
 %%PYTHON_SITELIB%%/MoinMoin/support/inspect.py
 %%PYTHON_SITELIB%%/MoinMoin/support/inspect.pyc
-%%PYTHON_SITELIB%%/MoinMoin/support/inspect.pyo
 %%PYTHON_SITELIB%%/MoinMoin/support/pydoc.py
 %%PYTHON_SITELIB%%/MoinMoin/support/pydoc.pyc
-%%PYTHON_SITELIB%%/MoinMoin/support/pydoc.pyo
 %%PYTHON_SITELIB%%/MoinMoin/twisted/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/twisted/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/twisted/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/user.py
 %%PYTHON_SITELIB%%/MoinMoin/user.pyc
-%%PYTHON_SITELIB%%/MoinMoin/user.pyo
+%%PYTHON_SITELIB%%/MoinMoin/userform.py
+%%PYTHON_SITELIB%%/MoinMoin/userform.pyc
 %%PYTHON_SITELIB%%/MoinMoin/util.py
 %%PYTHON_SITELIB%%/MoinMoin/util.pyc
-%%PYTHON_SITELIB%%/MoinMoin/util.pyo
 %%PYTHON_SITELIB%%/MoinMoin/version.py
 %%PYTHON_SITELIB%%/MoinMoin/version.pyc
-%%PYTHON_SITELIB%%/MoinMoin/version.pyo
 %%PYTHON_SITELIB%%/MoinMoin/webapi/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/__init__.pyc
-%%PYTHON_SITELIB%%/MoinMoin/webapi/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/webapi/cgiMoin.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/cgiMoin.pyc
-%%PYTHON_SITELIB%%/MoinMoin/webapi/cgiMoin.pyo
+%%PYTHON_SITELIB%%/MoinMoin/webapi/twistedMoin.py
+%%PYTHON_SITELIB%%/MoinMoin/webapi/twistedMoin.pyc
 %%PYTHON_SITELIB%%/MoinMoin/wikiaction.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiaction.pyc
-%%PYTHON_SITELIB%%/MoinMoin/wikiaction.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.py
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.pyc
-%%PYTHON_SITELIB%%/MoinMoin/wikimacro.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.pyc
-%%PYTHON_SITELIB%%/MoinMoin/wikiutil.pyo
 %%PYTHON_SITELIB%%/MoinMoin/xsltutil.py
 %%PYTHON_SITELIB%%/MoinMoin/xsltutil.pyc
-%%PYTHON_SITELIB%%/MoinMoin/xsltutil.pyo
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/action
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/formatter
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/i18n
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/macro
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/parser
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/py15
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/support
-@dirrm %%PYTHON_SITELIB%%/MoinMoin/twisted
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/webapi
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/twisted
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/support
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/scripts
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/py15
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/parser
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/macro
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/i18n
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/formatter
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/action
 @dirrm %%PYTHON_SITELIB%%/MoinMoin