7 files changed, 325 insertions, 211 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 2df5f87f217d..105ee92a39e9 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -6,12 +6,15 @@
 #
 
 PORTNAME=	moinmoin
-PORTVERSION=	0.10
-PORTREVISION=	2
+PORTVERSION=	0.11
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= 	http://twiki.org/p/pub/TWiki/TWikiDrawPlugin/ \
+		${MASTER_SITE_SOURCEFORGE} \
+		http://fallin.lv/distfiles/
 MASTER_SITE_SUBDIR=	moin
 DISTNAME=	moin-${PORTVERSION}
+DISTFILES=	${DISTNAME}.tgz twikidraw.jar
+EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	perky@fallin.lv
 
@@ -20,50 +23,53 @@ PLIST_SUB+=	PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
 
 CGIUSER?=	moinmoin
 CGIUSERID?=	192
-SUID_WRAPPER=	moin
-
-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
+CGIROOT=	${PREFIX}/www/cgi-bin
+HTDOCSROOT=	${PREFIX}/www/data
+MOINDIR=	${PREFIX}/share/moin
 SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 do-configure:
 	@# Add the username, uid, group and gid
 	${SH} ${FILESDIR}/configure.sh ${CGIUSER} ${CGIUSERID}
 
+post-patch:
+	@# Tweak configuration
+	${SED} -e 's|^url_prefix =.*$$|url_prefix="/moin"|g' \
+		${WRKSRC}/wiki/cgi-bin/moin_config.py > \
+		${WRKSRC}/wiki/cgi-bin/moin_config.py.default
+
 do-build:
 	${SETUP_CMD} build
 	@# Compile setuid wrapper
-	${CC} ${CFLAGS} -o ${WIKI_WRKSRC}/${SUID_WRAPPER} \
+	${CC} ${CFLAGS} -o ${WRKDIR}/moin \
 		-DPYTHON_PATH='"${PYTHON_CMD}"' \
-		-DSCRIPT_PATH='"${CGI_TARGET}/moin.cgi"' \
+		-DMOIN_PREFIX='"${MOINDIR}"' \
 		${FILESDIR}/wrapper.c
 
 do-install:
-	@# Install MoinMoin library
+	@# Install MoinMoin
 	${SETUP_CMD} install
+	${INSTALL_DATA} ${DISTDIR}/twikidraw.jar ${MOINDIR}/htdocs/applets/TWikiDrawPlugin/
+
+	@# Install Wrapper
+	${MKDIR} ${CGIROOT}
+	${INSTALL_PROGRAM} ${WRKDIR}/moin ${CGIROOT}/
+	${CHMOD} 4555 ${CGIROOT}/moin
 
-	@# Install CGI files and set permissions
-	${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}
-	${CHMOD} -R u+rw,go-wxs ${CGI_TARGET}/data
-	${CHMOD} 4555 ${CGI_TARGET}/${SUID_WRAPPER}
+	@# Arrange Permissions
+	${MKDIR} ${MOINDIR}/data/backup
+	${CHMOD} -R u+rw,go-wxs ${MOINDIR}/data
+	${CHOWN} -R ${CGIUSER}:${CGIUSER} ${CGIROOT}/moin ${MOINDIR}/data
 
-	@# Install content files
-	${MKDIR} ${CONTENT_TARGET}
-	cd ${WIKI_WRKSRC} && ${CP} -Rp ${CONTENT_FILES} ${CONTENT_TARGET}/
+	@# Create symbolic links and copy defaults
+	${TEST} -f ${MOINDIR}/cgi-bin/moin_config.py || \
+		${CP} ${MOINDIR}/cgi-bin/moin_config.py.default \
+			${MOINDIR}/cgi-bin/moin_config.py
+	${TEST} -d ${MOINDIR}/data/text || \
+		${LN} -sf ${MOINDIR}/data/text.default ${MOINDIR}/data/text
+	-${LN} -sf ${MOINDIR}/htdocs ${HTDOCSROOT}/moin
 
-	@# Patch configurations
-	${SED} -e 's|moin\.cgi|/cgi-bin/moin/moin|g' \
-		${CONTENT_TARGET}/index.html >${CONTENT_TARGET}/index.html.tmp
-	${CAT} ${CONTENT_TARGET}/index.html.tmp >${CONTENT_TARGET}/index.html
-	${SED} -e 's|^url_prefix =.*$$|url_prefix="/moin/"|g' \
-		${CGI_TARGET}/moin_config.py >${CGI_TARGET}/moin_config.py.tmp
-	${CAT} ${CGI_TARGET}/moin_config.py.tmp >${CGI_TARGET}/moin_config.py
-	${RM} -f ${CONTENT_TARGET}/index.html.tmp ${CGI_TARGET}/moin_config.py.tmp
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/moinmoin/distinfo b/www/moinmoin/distinfo
index 0a3063ec7a7f..205e2d6306b5 100644
--- a/www/moinmoin/distinfo
+++ b/www/moinmoin/distinfo
@@ -1 +1,2 @@
-MD5 (moin-0.10.tar.gz) = 583296b1760518ddbce67b255f35e94d
+MD5 (moin-0.11.tgz) = 53c49bba9b08a0dcc12459057120b159
+MD5 (twikidraw.jar) = 092291b0afb8e8921f0dbbda41d5b3fc
diff --git a/www/moinmoin/files/patch-MoinMoin::parser::wiki.py b/www/moinmoin/files/patch-MoinMoin::parser::wiki.py
deleted file mode 100644
index 91bc343ba18f..000000000000
--- a/www/moinmoin/files/patch-MoinMoin::parser::wiki.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- MoinMoin/parser/wiki.py.orig	Wed Jan  9 21:20:17 2002
-+++ MoinMoin/parser/wiki.py	Wed Jan  9 21:22:55 2002
-@@ -388,7 +388,7 @@
-     def replace(self, match):
-         #hit = filter(lambda g: g[1], match.groupdict().items())
-         for type, hit in match.groupdict().items():
--            if hit is not None:
-+            if hit is not None and type != 'hmarker':
-                 ##print "###", cgi.escape(`type`), cgi.escape(`hit`), "###"
-                 if self.in_pre and type not in ['pre', 'ent']:
-                     return self.highlight_text(hit)
diff --git a/www/moinmoin/files/patch-setup.py b/www/moinmoin/files/patch-setup.py
new file mode 100644
index 000000000000..981b94c6cdd6
--- /dev/null
+++ b/www/moinmoin/files/patch-setup.py
@@ -0,0 +1,15 @@
+--- setup.py.orig	Tue Mar 12 09:25:00 2002
++++ setup.py	Tue Mar 12 09:26:47 2002
+@@ -157,10 +157,10 @@
+     'data_files': [
+         ('share/moin/cgi-bin',
+             glob.glob('wiki/cgi-bin/*.cgi') +
+-            glob.glob('wiki/cgi-bin/*.py')  ),
++            glob.glob('wiki/cgi-bin/*.py.default')  ),
+         ('share/moin/data',
+             ['wiki/data/intermap.txt']),
+-        ('share/moin/data/text',
++        ('share/moin/data/text.default',
+             filter(pagefile_filter, glob.glob('wiki/data/text/*'))),
+         ('share/moin/data/backup', []),
+         ('share/moin/data/cache', []),
diff --git a/www/moinmoin/files/wrapper.c b/www/moinmoin/files/wrapper.c
index 6ee4f1e7e2de..bcf6f81f8b91 100644
--- a/www/moinmoin/files/wrapper.c
+++ b/www/moinmoin/files/wrapper.c
@@ -7,7 +7,8 @@
 int
 main(int argc, char *argv[], char *envp[])
 {
-	char *margv[] = { PYTHON_PATH, SCRIPT_PATH, NULL };
+	char *margv[] = { PYTHON_PATH, MOIN_PREFIX"/cgi-bin/moin.cgi", NULL };
 
+	chdir(MOIN_PREFIX);
 	return execve(PYTHON_PATH, margv, envp);
 }
diff --git a/www/moinmoin/pkg-message b/www/moinmoin/pkg-message
new file mode 100644
index 000000000000..307f9039b71b
--- /dev/null
+++ b/www/moinmoin/pkg-message
@@ -0,0 +1,7 @@
+=============================================
+ You can configure detail options at
+ ${PREFIX}/share/moin/cgi-bin/moin_config.py
+
+ And, you may need graphics/py-gdchart port
+ to use chart extension.
+=============================================
diff --git a/www/moinmoin/pkg-plist b/www/moinmoin/pkg-plist
index 6037ff89407a..9f6769bd6c99 100644
--- a/www/moinmoin/pkg-plist
+++ b/www/moinmoin/pkg-plist
@@ -1,174 +1,13 @@
-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
-www/cgi-bin/moin/data/text/CategoryEmpty
-www/cgi-bin/moin/data/text/CategoryHomepage
-www/cgi-bin/moin/data/text/DeleteThisPage
-www/cgi-bin/moin/data/text/EditText
-www/cgi-bin/moin/data/text/ExtensionGuidelines
-www/cgi-bin/moin/data/text/FindPage
-www/cgi-bin/moin/data/text/FrontPage
-www/cgi-bin/moin/data/text/GarthKidd
-www/cgi-bin/moin/data/text/GermanUmlauts
-www/cgi-bin/moin/data/text/HelloWorld
-www/cgi-bin/moin/data/text/HelpContents
-www/cgi-bin/moin/data/text/HelpForBeginners
-www/cgi-bin/moin/data/text/HelpIndex
-www/cgi-bin/moin/data/text/HelpOnAdministration
-www/cgi-bin/moin/data/text/HelpOnConfiguration
-www/cgi-bin/moin/data/text/HelpOnEditing
-www/cgi-bin/moin/data/text/HelpOnFormatting
-www/cgi-bin/moin/data/text/HelpOnHeadlines
-www/cgi-bin/moin/data/text/HelpOnInstalling
-www/cgi-bin/moin/data/text/HelpOnLinking
-www/cgi-bin/moin/data/text/HelpOnLists
-www/cgi-bin/moin/data/text/HelpOnMacros
-www/cgi-bin/moin/data/text/HelpOnNavigation
-www/cgi-bin/moin/data/text/HelpOnPageCreation
-www/cgi-bin/moin/data/text/HelpOnPageDeletion
-www/cgi-bin/moin/data/text/HelpOnProcessingInstructions
-www/cgi-bin/moin/data/text/HelpOnRules
-www/cgi-bin/moin/data/text/HelpOnSmileys
-www/cgi-bin/moin/data/text/HelpOnSpellCheck
-www/cgi-bin/moin/data/text/HelpOnTables
-www/cgi-bin/moin/data/text/HelpOnUpdating
-www/cgi-bin/moin/data/text/HelpOnXmlPages
-www/cgi-bin/moin/data/text/HelpTemplate
-www/cgi-bin/moin/data/text/HierarchicalWikiWiki
-www/cgi-bin/moin/data/text/HomepageTemplate
-www/cgi-bin/moin/data/text/IndexingScheme
-www/cgi-bin/moin/data/text/InterWiki
-www/cgi-bin/moin/data/text/J_f8rnHansen
-www/cgi-bin/moin/data/text/J_f8rnsTodo
-www/cgi-bin/moin/data/text/J_fcrgenHermann
-www/cgi-bin/moin/data/text/J_fcrgenHermannBooks
-www/cgi-bin/moin/data/text/J_fcrgenHermannLinks
-www/cgi-bin/moin/data/text/KeithNaas
-www/cgi-bin/moin/data/text/KlausSeistrup
-www/cgi-bin/moin/data/text/LocalSpellingWords
-www/cgi-bin/moin/data/text/MacroMarket
-www/cgi-bin/moin/data/text/MagnusLyck_e5
-www/cgi-bin/moin/data/text/MarkoSchulz
-www/cgi-bin/moin/data/text/MartinPool
-www/cgi-bin/moin/data/text/MattWestervelt
-www/cgi-bin/moin/data/text/MeatBall
-www/cgi-bin/moin/data/text/MeatballWiki
-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/MoinMoinBugs
-www/cgi-bin/moin/data/text/MoinMoinDiscussion
-www/cgi-bin/moin/data/text/MoinMoinDone
-www/cgi-bin/moin/data/text/MoinMoinFaq
-www/cgi-bin/moin/data/text/MoinMoinI18n
-www/cgi-bin/moin/data/text/MoinMoinIdeas
-www/cgi-bin/moin/data/text/MoinMoinMailingLists
-www/cgi-bin/moin/data/text/MoinMoinNotBugs
-www/cgi-bin/moin/data/text/MoinMoinRefactoring
-www/cgi-bin/moin/data/text/MoinMoinRelease
-www/cgi-bin/moin/data/text/MoinMoinTests
-www/cgi-bin/moin/data/text/MoinMoinTodo
-www/cgi-bin/moin/data/text/MoinMoinWikis
-www/cgi-bin/moin/data/text/OriginalWiki
-www/cgi-bin/moin/data/text/OrphanedPages
-www/cgi-bin/moin/data/text/ParserMarket
-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/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/SgmlEntities
-www/cgi-bin/moin/data/text/SourceForge
-www/cgi-bin/moin/data/text/SpamSpamSpam
-www/cgi-bin/moin/data/text/StevePike
-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
-www/cgi-bin/moin/data/text/UserPreferences
-www/cgi-bin/moin/data/text/UtilityScripts
-www/cgi-bin/moin/data/text/VinJaCa
-www/cgi-bin/moin/data/text/WantedPages
-www/cgi-bin/moin/data/text/WhyWikiWorks
-www/cgi-bin/moin/data/text/WikiCategory
-www/cgi-bin/moin/data/text/WikiClone
-www/cgi-bin/moin/data/text/WikiHomePage
-www/cgi-bin/moin/data/text/WikiMarkup
-www/cgi-bin/moin/data/text/WikiName
-www/cgi-bin/moin/data/text/WikiNature
-www/cgi-bin/moin/data/text/WikiSandBox
-www/cgi-bin/moin/data/text/WikiTextFormattingTestPage
-www/cgi-bin/moin/data/text/WikiWiki
-www/cgi-bin/moin/data/text/WikiWikiNess
-www/cgi-bin/moin/data/text/WikiWikiWeb
-www/cgi-bin/moin/data/text/WikiWikiWebFaq
-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/xbel_2d1_2e0_2exsl
-www/cgi-bin/moin/moin
-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/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
-www/data/moin/img/frown.gif
-www/data/moin/img/idea.gif
-www/data/moin/img/moin-deleted.gif
-www/data/moin/img/moin-diff.gif
-www/data/moin/img/moin-edit.gif
-www/data/moin/img/moin-email.gif
-www/data/moin/img/moin-ftp.gif
-www/data/moin/img/moin-help.gif
-www/data/moin/img/moin-info.gif
-www/data/moin/img/moin-inter.gif
-www/data/moin/img/moin-new.gif
-www/data/moin/img/moin-news.gif
-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-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/smile4.gif
-www/data/moin/index.html
-www/data/moin/moinmoin.gif
-@dirrm www/data/moin/img
-@dirrm www/data/moin
+bin/moin-create
+bin/moin-dump
 %%PYTHON_SITELIB%%/MoinMoin/Page.py
 %%PYTHON_SITELIB%%/MoinMoin/Page.pyc
 %%PYTHON_SITELIB%%/MoinMoin/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/__init__.pyc
 %%PYTHON_SITELIB%%/MoinMoin/_template.py
 %%PYTHON_SITELIB%%/MoinMoin/_template.pyc
+%%PYTHON_SITELIB%%/MoinMoin/action/AttachFile.py
+%%PYTHON_SITELIB%%/MoinMoin/action/AttachFile.pyc
 %%PYTHON_SITELIB%%/MoinMoin/action/DeletePage.py
 %%PYTHON_SITELIB%%/MoinMoin/action/DeletePage.pyc
 %%PYTHON_SITELIB%%/MoinMoin/action/LikePages.py
@@ -189,6 +28,8 @@ www/data/moin/moinmoin.gif
 %%PYTHON_SITELIB%%/MoinMoin/config.pyc
 %%PYTHON_SITELIB%%/MoinMoin/editlog.py
 %%PYTHON_SITELIB%%/MoinMoin/editlog.pyc
+%%PYTHON_SITELIB%%/MoinMoin/eventlog.py
+%%PYTHON_SITELIB%%/MoinMoin/eventlog.pyc
 %%PYTHON_SITELIB%%/MoinMoin/formatter/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/formatter/__init__.pyc
 %%PYTHON_SITELIB%%/MoinMoin/formatter/base.py
@@ -213,22 +54,44 @@ www/data/moin/moinmoin.gif
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fi.pyc
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fr.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/fr.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/it.py
+%%PYTHON_SITELIB%%/MoinMoin/i18n/it.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ja.py
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ja.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ko.py
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ko.pyc
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/pt.py
+%%PYTHON_SITELIB%%/MoinMoin/i18n/pt.pyc
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/zh.py
+%%PYTHON_SITELIB%%/MoinMoin/i18n/zh.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/AbandonedPages.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/AbandonedPages.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/FootNote.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/FootNote.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/GetText.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/GetText.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/Include.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/Include.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/OrphanedPages.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/OrphanedPages.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/PageSize.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/PageSize.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/RandomPage.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/RandomPage.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/RecentChanges.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/RecentChanges.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/StatsChart.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/StatsChart.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/SystemAdmin.py
+%%PYTHON_SITELIB%%/MoinMoin/macro/SystemAdmin.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/TableOfContents.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/TableOfContents.pyc
 %%PYTHON_SITELIB%%/MoinMoin/macro/TeudView.py
@@ -259,8 +122,20 @@ www/data/moin/moinmoin.gif
 %%PYTHON_SITELIB%%/MoinMoin/scripts/_util.pyc
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.py
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_dump.py
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_dump.pyc
 %%PYTHON_SITELIB%%/MoinMoin/security.py
 %%PYTHON_SITELIB%%/MoinMoin/security.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/stats/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/chart.py
+%%PYTHON_SITELIB%%/MoinMoin/stats/chart.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/hitcounts.py
+%%PYTHON_SITELIB%%/MoinMoin/stats/hitcounts.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/pagesize.py
+%%PYTHON_SITELIB%%/MoinMoin/stats/pagesize.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/useragents.py
+%%PYTHON_SITELIB%%/MoinMoin/stats/useragents.pyc
 %%PYTHON_SITELIB%%/MoinMoin/support/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/support/__init__.pyc
 %%PYTHON_SITELIB%%/MoinMoin/support/cgitb.py
@@ -283,19 +158,33 @@ www/data/moin/moinmoin.gif
 %%PYTHON_SITELIB%%/MoinMoin/webapi/__init__.pyc
 %%PYTHON_SITELIB%%/MoinMoin/webapi/cgiMoin.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/cgiMoin.pyc
+%%PYTHON_SITELIB%%/MoinMoin/webapi/cliMoin.py
+%%PYTHON_SITELIB%%/MoinMoin/webapi/cliMoin.pyc
+%%PYTHON_SITELIB%%/MoinMoin/webapi/color.py
+%%PYTHON_SITELIB%%/MoinMoin/webapi/color.pyc
 %%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/wikiform.py
+%%PYTHON_SITELIB%%/MoinMoin/wikiform.pyc
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.py
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.pyc
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.pyc
-%%PYTHON_SITELIB%%/MoinMoin/xsltutil.py
-%%PYTHON_SITELIB%%/MoinMoin/xsltutil.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/util.py
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/util.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/wikiexport.py
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/wikiexport.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/xsltutil.py
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/xsltutil.pyc
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/wikixml
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/webapi
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/twisted
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/support
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/stats
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/scripts
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/py15
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/parser
@@ -304,3 +193,209 @@ www/data/moin/moinmoin.gif
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/formatter
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/action
 @dirrm %%PYTHON_SITELIB%%/MoinMoin
+share/moin/cgi-bin/moin.cgi
+@unexec if cmp -s %D/share/moin/cgi-bin/moin_config.py %D/share/moin/cgi-bin/moin_config.py.default; then rm -f %D/share/moin/cgi-bin/moin_config.py; fi
+share/moin/cgi-bin/moin_config.py.default
+@exec [ -f %B/moin_config.py ] || cp %B/%f %B/moin_config.py
+share/moin/data/intermap.txt
+share/moin/data/text.default/AbandonedPages
+@exec [ -d %D/share/moin/data/text/ ] || ln -fs %B %D/share/moin/data/text
+@unexec if [ -L %D/share/moin/data/text ]; then rm -f %D/share/moin/data/text; fi
+share/moin/data/text.default/Aktuelle_c4nderungen
+share/moin/data/text.default/AufgegebeneSeiten
+share/moin/data/text.default/BenutzerEinstellungen
+share/moin/data/text.default/CategoryCategory
+share/moin/data/text.default/CategoryHomepage
+share/moin/data/text.default/EventStats
+share/moin/data/text.default/EventStats_2fHitCounts
+share/moin/data/text.default/EventStats_2fUserAgents
+share/moin/data/text.default/FindPage
+share/moin/data/text.default/FrontPage
+share/moin/data/text.default/GesuchteSeiten
+share/moin/data/text.default/HelpContents
+share/moin/data/text.default/HelpForBeginners
+share/moin/data/text.default/HelpForDevelopers
+share/moin/data/text.default/HelpIndex
+share/moin/data/text.default/HelpMiscellaneous
+share/moin/data/text.default/HelpMiscellaneous_2fFrequentlyAskedQuestions
+share/moin/data/text.default/HelpOnActions
+share/moin/data/text.default/HelpOnActions_2fAttachFile
+share/moin/data/text.default/HelpOnAdministration
+share/moin/data/text.default/HelpOnConfiguration
+share/moin/data/text.default/HelpOnConfiguration_2fEmailSupport
+share/moin/data/text.default/HelpOnConfiguration_2fSecurityPolicy
+share/moin/data/text.default/HelpOnEditing
+share/moin/data/text.default/HelpOnEditing_2fSubPages
+share/moin/data/text.default/HelpOnFormatting
+share/moin/data/text.default/HelpOnHeadlines
+share/moin/data/text.default/HelpOnInstalling
+share/moin/data/text.default/HelpOnInstalling_2fApacheOnUnix
+share/moin/data/text.default/HelpOnInstalling_2fApacheOnWin32
+share/moin/data/text.default/HelpOnInstalling_2fBasicInstallation
+share/moin/data/text.default/HelpOnInstalling_2fInternetInformationServer
+share/moin/data/text.default/HelpOnLinking
+share/moin/data/text.default/HelpOnLists
+share/moin/data/text.default/HelpOnMacros
+share/moin/data/text.default/HelpOnNavigation
+share/moin/data/text.default/HelpOnPageCreation
+share/moin/data/text.default/HelpOnPageDeletion
+share/moin/data/text.default/HelpOnProcessingInstructions
+share/moin/data/text.default/HelpOnRules
+share/moin/data/text.default/HelpOnSkins
+share/moin/data/text.default/HelpOnSmileys
+share/moin/data/text.default/HelpOnSpellCheck
+share/moin/data/text.default/HelpOnTables
+share/moin/data/text.default/HelpOnUpdating
+share/moin/data/text.default/HelpOnUserPreferences
+share/moin/data/text.default/HelpOnXmlPages
+share/moin/data/text.default/HelpTemplate
+share/moin/data/text.default/HilfeAllgemein
+share/moin/data/text.default/HilfeAllgemein_2fFragenUndAntworten
+share/moin/data/text.default/HilfeF_fcrAnf_e4nger
+share/moin/data/text.default/HilfeF_fcrEntwickler
+share/moin/data/text.default/HilfeIndex
+share/moin/data/text.default/HilfeInhalt
+share/moin/data/text.default/HilfeTemplate
+share/moin/data/text.default/HilfeZuAktionen
+share/moin/data/text.default/HilfeZuAktionen_2fDateiAnh_e4nge
+share/moin/data/text.default/HilfeZuBenutzerEinstellungen
+share/moin/data/text.default/HilfeZuLayouts
+share/moin/data/text.default/HilfeZuListen
+share/moin/data/text.default/HilfeZuMakros
+share/moin/data/text.default/HilfeZuSmileys
+share/moin/data/text.default/HilfeZuTabellen
+share/moin/data/text.default/HilfeZuTrennlinien
+share/moin/data/text.default/HilfeZuVerarbeitungsAnweisungen
+share/moin/data/text.default/HilfeZuVerweisen
+share/moin/data/text.default/HilfeZuXmlSeiten
+share/moin/data/text.default/HilfeZu_dcberschriften
+share/moin/data/text.default/HilfeZumEditieren
+share/moin/data/text.default/HilfeZumEditieren_2fUnterSeiten
+share/moin/data/text.default/HilfeZumFormatieren
+share/moin/data/text.default/HilfeZumUpdaten
+share/moin/data/text.default/HilfeZurAdministration
+share/moin/data/text.default/HilfeZurInstallation
+share/moin/data/text.default/HilfeZurInstallation_2fApacheAufUnix
+share/moin/data/text.default/HilfeZurInstallation_2fApacheAufWin32
+share/moin/data/text.default/HilfeZurInstallation_2fBasisInstallation
+share/moin/data/text.default/HilfeZurKonfiguration
+share/moin/data/text.default/HilfeZurNavigation
+share/moin/data/text.default/HilfeZurRechtschreibpr_fcfung
+share/moin/data/text.default/HilfeZurSeitenErzeugung
+share/moin/data/text.default/HilfeZurSeitenL_f6schung
+share/moin/data/text.default/HomepageTemplate
+share/moin/data/text.default/InterWiki
+share/moin/data/text.default/LocalSpellingWords
+share/moin/data/text.default/MoinMoin
+share/moin/data/text.default/MoinMoin_2fInstallDocs
+share/moin/data/text.default/MoinMoin_2fInstallationsAnleitung
+share/moin/data/text.default/OrphanedPages
+share/moin/data/text.default/PageSize
+share/moin/data/text.default/Python4Suite
+share/moin/data/text.default/PythonLanguage
+share/moin/data/text.default/RandomPage
+share/moin/data/text.default/RecentChanges
+share/moin/data/text.default/SeiteFinden
+share/moin/data/text.default/SeitenGr_f6_dfe
+share/moin/data/text.default/SiteNavigation
+share/moin/data/text.default/StartSeite
+share/moin/data/text.default/StructuredText
+share/moin/data/text.default/SystemInfo
+share/moin/data/text.default/TitelIndex
+share/moin/data/text.default/TitleIndex
+share/moin/data/text.default/UserPreferences
+share/moin/data/text.default/VerwaisteSeiten
+share/moin/data/text.default/WantedPages
+share/moin/data/text.default/WegWeiser
+share/moin/data/text.default/WikiHomePage
+share/moin/data/text.default/WikiName
+share/moin/data/text.default/WikiSandBox
+share/moin/data/text.default/WikiWikiWeb
+share/moin/data/text.default/WordIndex
+share/moin/data/text.default/WortIndex
+share/moin/data/text.default/XsltVersion
+share/moin/data/text.default/ZufallsSeite
+share/moin/htdocs/applets/TWikiDrawPlugin/twikidraw.jar
+share/moin/htdocs/css/moinmoin.css
+share/moin/htdocs/img/PythonPowered.gif
+share/moin/htdocs/img/alert.gif
+share/moin/htdocs/img/angry.gif
+share/moin/htdocs/img/attention.gif
+share/moin/htdocs/img/biggrin.gif
+share/moin/htdocs/img/checkmark.gif
+share/moin/htdocs/img/devil.gif
+share/moin/htdocs/img/draft.png
+share/moin/htdocs/img/eek.gif
+share/moin/htdocs/img/eyes.gif
+share/moin/htdocs/img/frown.gif
+share/moin/htdocs/img/icon-error.gif
+share/moin/htdocs/img/icon-info.gif
+share/moin/htdocs/img/idea.gif
+share/moin/htdocs/img/lol.gif
+share/moin/htdocs/img/moin-bottom.gif
+share/moin/htdocs/img/moin-deleted.gif
+share/moin/htdocs/img/moin-diff.gif
+share/moin/htdocs/img/moin-edit.gif
+share/moin/htdocs/img/moin-email-x.gif
+share/moin/htdocs/img/moin-email.gif
+share/moin/htdocs/img/moin-ftp.gif
+share/moin/htdocs/img/moin-help.gif
+share/moin/htdocs/img/moin-home.gif
+share/moin/htdocs/img/moin-info.gif
+share/moin/htdocs/img/moin-inter.gif
+share/moin/htdocs/img/moin-new.gif
+share/moin/htdocs/img/moin-news.gif
+share/moin/htdocs/img/moin-parent.gif
+share/moin/htdocs/img/moin-popup.gif
+share/moin/htdocs/img/moin-print.gif
+share/moin/htdocs/img/moin-rss.gif
+share/moin/htdocs/img/moin-search.gif
+share/moin/htdocs/img/moin-show.gif
+share/moin/htdocs/img/moin-telnet.gif
+share/moin/htdocs/img/moin-top.gif
+share/moin/htdocs/img/moin-up.gif
+share/moin/htdocs/img/moin-updated.gif
+share/moin/htdocs/img/moin-www.gif
+share/moin/htdocs/img/moin-xml.gif
+share/moin/htdocs/img/moin-xml2.gif
+share/moin/htdocs/img/moinmoin.gif
+share/moin/htdocs/img/ohwell.gif
+share/moin/htdocs/img/prio1.gif
+share/moin/htdocs/img/prio2.gif
+share/moin/htdocs/img/prio3.gif
+share/moin/htdocs/img/redface.gif
+share/moin/htdocs/img/sad.gif
+share/moin/htdocs/img/smile.gif
+share/moin/htdocs/img/smile2.gif
+share/moin/htdocs/img/smile3.gif
+share/moin/htdocs/img/smile4.gif
+share/moin/htdocs/img/tired.gif
+share/moin/htdocs/img/tongue.gif
+share/moin/htdocs/index.html
+@dirrm share/moin/htdocs/img
+@dirrm share/moin/htdocs/css
+@dirrm share/moin/htdocs/applets/TWikiDrawPlugin
+@dirrm share/moin/htdocs/applets
+@dirrm share/moin/htdocs
+@dirrm share/moin/data/user
+@dirrm share/moin/data/text.default
+@dirrm share/moin/data/plugin/macro
+@dirrm share/moin/data/plugin/action
+@dirrm share/moin/data/plugin
+@dirrm share/moin/data/pages
+@dirrm share/moin/data/cache
+@dirrm share/moin/data/backup
+@dirrm share/moin/data
+@dirrm share/moin/cgi-bin
+@dirrm share/moin
+@exec [ -d %D/share/moin/data/backup ] || mkdir -p %D/share/moin/data/backup
+@exec [ -d %D/share/moin/data/cache ] || mkdir -p %D/share/moin/data/cache
+@exec [ -d %D/share/moin/data/pages ] || mkdir -p %D/share/moin/data/pages
+@exec [ -d %D/share/moin/data/plugin ] || mkdir -p %D/share/moin/data/plugin
+@exec [ -d %D/share/moin/data/plugin/action ] || mkdir -p %D/share/moin/data/plugin/action
+@exec [ -d %D/share/moin/data/plugin/macro ] || mkdir -p %D/share/moin/data/plugin/macro
+@exec [ -d %D/share/moin/data/user ] || mkdir -p %D/share/moin/data/user
+www/cgi-bin/moin
+@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@unexec if [ -L %D/www/data/moin ]; then rm -f %D/www/data/moin; fi
+@exec [ -d %D/www/data/moin ] || ln -fs %D/share/moin/htdocs %D/www/data/moin