6 files changed, 207 insertions, 54 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index a7d9f42d8b84..e51c025462d7 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -6,32 +6,29 @@
 #
 
 PORTNAME=	moinmoin
-PORTVERSION=	0.11
+PORTVERSION=	1.0
 CATEGORIES=	www python
-MASTER_SITES= 	http://twiki.org/p/pub/TWiki/TWikiDrawPlugin/ \
-		${MASTER_SITE_SOURCEFORGE} \
-		http://fallin.lv/distfiles/
+MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE} \
+		http://twiki.org/p/pub/TWiki/TWikiDrawPlugin/:twiki \
+		http://fallin.lv/distfiles/:twiki
 MASTER_SITE_SUBDIR=	moin
 DISTNAME=	moin-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tgz twikidraw.jar
-EXTRACT_ONLY=	${DISTNAME}.tgz
+DISTFILES=	${DISTNAME}.tar.gz twikidraw.jar:twiki
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PLIST_SUB+=	PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||}
+PLIST_SUB+=	PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||} \
+		CGIUSER=${CGIUSER} CGIROOT=${CGIROOT}
 
-CGIUSER?=	moinmoin
+CGIUSER=	moinmoin
 CGIUSERID?=	192
 CGIROOT=	${PREFIX}/www/cgi-bin
 HTDOCSROOT=	${PREFIX}/www/data
 MOINDIR=	${PREFIX}/share/moin
 
-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' \
@@ -45,6 +42,10 @@ post-build:
 		-DMOIN_PREFIX='"${MOINDIR}"' \
 		${FILESDIR}/wrapper.c
 
+pre-install:
+	PKG_PREFIX=${PREFIX} INST_UID="${CGIUSERID}" \
+	${SH} pkg-install ${PKGNAME} PRE-INSTALL
+
 post-install:
 	${INSTALL_DATA} ${DISTDIR}/twikidraw.jar ${MOINDIR}/htdocs/applets/TWikiDrawPlugin/
 
@@ -64,6 +65,7 @@ post-install:
 			${MOINDIR}/cgi-bin/moin_config.py
 	${TEST} -d ${MOINDIR}/data/text || \
 		${LN} -sf ${MOINDIR}/data/text.default ${MOINDIR}/data/text
+	-${MKDIR} ${HTDOCSROOT}
 	-${LN} -sf ${MOINDIR}/htdocs ${HTDOCSROOT}/moin
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/moinmoin/distinfo b/www/moinmoin/distinfo
index 205e2d6306b5..e526ab4edd14 100644
--- a/www/moinmoin/distinfo
+++ b/www/moinmoin/distinfo
@@ -1,2 +1,2 @@
-MD5 (moin-0.11.tgz) = 53c49bba9b08a0dcc12459057120b159
+MD5 (moin-1.0.tar.gz) = 0eb137c592261bbb051208ef8f4ffd7d
 MD5 (twikidraw.jar) = 092291b0afb8e8921f0dbbda41d5b3fc
diff --git a/www/moinmoin/files/configure.sh b/www/moinmoin/files/configure.sh
deleted file mode 100644
index 3cdc44eccdba..000000000000
--- a/www/moinmoin/files/configure.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-# * stolen from mailman port.
-
-USER=$1
-UID=$2
-GROUP=${USER}
-GID=${UID}
-
-if [ -z "$USER" -o -z "$UID" ]; then
-	echo "Syntax: $0 <username> <uid>"
-	exit 1
-fi
-
-if pw group show "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-else
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-else
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-d /notexistence -s /sbin/nologin -c "MoinMoin User"
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
diff --git a/www/moinmoin/pkg-deinstall b/www/moinmoin/pkg-deinstall
new file mode 100644
index 000000000000..2de1de0b0617
--- /dev/null
+++ b/www/moinmoin/pkg-deinstall
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+USER=moinmoin
+
+if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	echo "To delete MoinMoin user permanently, use 'pw userdel ${USER}'"
+fi
+
+exit 0
diff --git a/www/moinmoin/pkg-install b/www/moinmoin/pkg-install
new file mode 100644
index 000000000000..e59ee74e384a
--- /dev/null
+++ b/www/moinmoin/pkg-install
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
+[ "$INST_USER" ] || INST_USER=moinmoin
+[ "$INST_GROUP" ] || INST_GROUP=${INST_USER}
+[ "$INST_UID" ] || INST_UID=192
+[ "$INST_GID" ] || INST_GID=${INST_UID}
+
+if ! pw groupshow "${INST_GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${INST_GROUP} -g ${INST_GID}; then
+		echo "Added group \"${INST_GROUP}\"."
+	else
+		echo "Adding group \"${INST_GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${INST_USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${INST_USER} -u ${INST_UID} -g ${INST_GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "MoinMoin User"; \
+	then
+		echo "Added user \"${INST_USER}\"."
+	else
+		echo "Adding user \"${INST_USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/www/moinmoin/pkg-plist b/www/moinmoin/pkg-plist
index 9f6769bd6c99..e2698e2d8e70 100644
--- a/www/moinmoin/pkg-plist
+++ b/www/moinmoin/pkg-plist
@@ -2,191 +2,323 @@ bin/moin-create
 bin/moin-dump
 %%PYTHON_SITELIB%%/MoinMoin/Page.py
 %%PYTHON_SITELIB%%/MoinMoin/Page.pyc
+%%PYTHON_SITELIB%%/MoinMoin/Page.pyo
+%%PYTHON_SITELIB%%/MoinMoin/PageEditor.py
+%%PYTHON_SITELIB%%/MoinMoin/PageEditor.pyc
+%%PYTHON_SITELIB%%/MoinMoin/PageEditor.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/AttachFile.py
 %%PYTHON_SITELIB%%/MoinMoin/action/AttachFile.pyc
+%%PYTHON_SITELIB%%/MoinMoin/action/AttachFile.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/LocalSiteMap.pyo
 %%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/links.py
+%%PYTHON_SITELIB%%/MoinMoin/action/links.pyc
+%%PYTHON_SITELIB%%/MoinMoin/action/links.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/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/eventlog.py
 %%PYTHON_SITELIB%%/MoinMoin/eventlog.pyc
+%%PYTHON_SITELIB%%/MoinMoin/eventlog.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/it.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/it.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/it.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/ja.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/ja.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ja.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/ko.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/ko.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/ko.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/nl.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/nl.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/pt.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/pt.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/pt.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/sv.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/sv.pyo
 %%PYTHON_SITELIB%%/MoinMoin/i18n/zh.py
 %%PYTHON_SITELIB%%/MoinMoin/i18n/zh.pyc
+%%PYTHON_SITELIB%%/MoinMoin/i18n/zh.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/AbandonedPages.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/AbandonedPages.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/AbandonedPages.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/BR.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/BR.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/FootNote.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/FootNote.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/FootNote.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/FullSearch.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/GetText.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/GetText.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/GetText.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/PageSize.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/PageSize.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/PageSize.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/StatsChart.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/StatsChart.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/StatsChart.pyo
 %%PYTHON_SITELIB%%/MoinMoin/macro/SystemAdmin.py
 %%PYTHON_SITELIB%%/MoinMoin/macro/SystemAdmin.pyc
+%%PYTHON_SITELIB%%/MoinMoin/macro/SystemAdmin.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/TeudView.pyo
 %%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/rst.py
+%%PYTHON_SITELIB%%/MoinMoin/parser/rst.pyc
+%%PYTHON_SITELIB%%/MoinMoin/parser/rst.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/processor/CSV.py
+%%PYTHON_SITELIB%%/MoinMoin/processor/CSV.pyc
+%%PYTHON_SITELIB%%/MoinMoin/processor/CSV.pyo
+%%PYTHON_SITELIB%%/MoinMoin/processor/Colorize.py
+%%PYTHON_SITELIB%%/MoinMoin/processor/Colorize.pyc
+%%PYTHON_SITELIB%%/MoinMoin/processor/Colorize.pyo
+%%PYTHON_SITELIB%%/MoinMoin/processor/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/processor/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/processor/__init__.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/request.pyo
 %%PYTHON_SITELIB%%/MoinMoin/scripts/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/scripts/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/scripts/_util.py
 %%PYTHON_SITELIB%%/MoinMoin/scripts/_util.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/_util.pyo
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.py
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_create.pyo
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_dump.py
 %%PYTHON_SITELIB%%/MoinMoin/scripts/moin_dump.pyc
+%%PYTHON_SITELIB%%/MoinMoin/scripts/moin_dump.pyo
 %%PYTHON_SITELIB%%/MoinMoin/security.py
 %%PYTHON_SITELIB%%/MoinMoin/security.pyc
+%%PYTHON_SITELIB%%/MoinMoin/security.pyo
 %%PYTHON_SITELIB%%/MoinMoin/stats/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/stats/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/stats/chart.py
 %%PYTHON_SITELIB%%/MoinMoin/stats/chart.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/chart.pyo
 %%PYTHON_SITELIB%%/MoinMoin/stats/hitcounts.py
 %%PYTHON_SITELIB%%/MoinMoin/stats/hitcounts.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/hitcounts.pyo
 %%PYTHON_SITELIB%%/MoinMoin/stats/pagesize.py
 %%PYTHON_SITELIB%%/MoinMoin/stats/pagesize.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/pagesize.pyo
 %%PYTHON_SITELIB%%/MoinMoin/stats/useragents.py
 %%PYTHON_SITELIB%%/MoinMoin/stats/useragents.pyc
+%%PYTHON_SITELIB%%/MoinMoin/stats/useragents.pyo
 %%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/difflib.py
+%%PYTHON_SITELIB%%/MoinMoin/support/difflib.pyc
+%%PYTHON_SITELIB%%/MoinMoin/support/difflib.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/support/xmlrpclib.py
+%%PYTHON_SITELIB%%/MoinMoin/support/xmlrpclib.pyc
+%%PYTHON_SITELIB%%/MoinMoin/support/xmlrpclib.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/userform.pyo
+%%PYTHON_SITELIB%%/MoinMoin/util/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/util/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/util/__init__.pyo
+%%PYTHON_SITELIB%%/MoinMoin/util/dataset.py
+%%PYTHON_SITELIB%%/MoinMoin/util/dataset.pyc
+%%PYTHON_SITELIB%%/MoinMoin/util/dataset.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/cliMoin.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/cliMoin.pyc
+%%PYTHON_SITELIB%%/MoinMoin/webapi/cliMoin.pyo
 %%PYTHON_SITELIB%%/MoinMoin/webapi/color.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/color.pyc
+%%PYTHON_SITELIB%%/MoinMoin/webapi/color.pyo
 %%PYTHON_SITELIB%%/MoinMoin/webapi/twistedMoin.py
 %%PYTHON_SITELIB%%/MoinMoin/webapi/twistedMoin.pyc
+%%PYTHON_SITELIB%%/MoinMoin/webapi/twistedMoin.pyo
+%%PYTHON_SITELIB%%/MoinMoin/widget/__init__.py
+%%PYTHON_SITELIB%%/MoinMoin/widget/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/widget/__init__.pyo
+%%PYTHON_SITELIB%%/MoinMoin/widget/base.py
+%%PYTHON_SITELIB%%/MoinMoin/widget/base.pyc
+%%PYTHON_SITELIB%%/MoinMoin/widget/base.pyo
+%%PYTHON_SITELIB%%/MoinMoin/widget/browser.py
+%%PYTHON_SITELIB%%/MoinMoin/widget/browser.pyc
+%%PYTHON_SITELIB%%/MoinMoin/widget/browser.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikiaction.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiaction.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikiaction.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikiform.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiform.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikiform.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.py
 %%PYTHON_SITELIB%%/MoinMoin/wikimacro.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikimacro.pyo
+%%PYTHON_SITELIB%%/MoinMoin/wikirpc.py
+%%PYTHON_SITELIB%%/MoinMoin/wikirpc.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikirpc.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.py
 %%PYTHON_SITELIB%%/MoinMoin/wikiutil.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikiutil.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/__init__.py
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/__init__.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/__init__.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/util.py
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/util.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/util.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/wikiexport.py
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/wikiexport.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/wikiexport.pyo
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/xsltutil.py
 %%PYTHON_SITELIB%%/MoinMoin/wikixml/xsltutil.pyc
+%%PYTHON_SITELIB%%/MoinMoin/wikixml/xsltutil.pyo
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/wikixml
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/widget
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/webapi
+@dirrm %%PYTHON_SITELIB%%/MoinMoin/util
 @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/processor
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/parser
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/macro
 @dirrm %%PYTHON_SITELIB%%/MoinMoin/i18n
@@ -233,6 +365,7 @@ 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/HelpOnInstalling_2fTroubleShooting
 share/moin/data/text.default/HelpOnLinking
 share/moin/data/text.default/HelpOnLists
 share/moin/data/text.default/HelpOnMacros
@@ -240,6 +373,7 @@ 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/HelpOnProcessors
 share/moin/data/text.default/HelpOnRules
 share/moin/data/text.default/HelpOnSkins
 share/moin/data/text.default/HelpOnSmileys
@@ -278,6 +412,7 @@ 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/HilfeZurInstallation_2fFehlerBehebung
 share/moin/data/text.default/HilfeZurKonfiguration
 share/moin/data/text.default/HilfeZurNavigation
 share/moin/data/text.default/HilfeZurRechtschreibpr_fcfung
@@ -369,6 +504,7 @@ 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/thumbs-up.gif
 share/moin/htdocs/img/tired.gif
 share/moin/htdocs/img/tongue.gif
 share/moin/htdocs/index.html
@@ -397,5 +533,8 @@ share/moin/htdocs/index.html
 @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
+@exec chmod -R u+rw,go-wxs %D/share/moin/data
+@exec chown -R %%CGIUSER%%:%%CGIUSER%% %%CGIROOT%%/moin %D/share/moin/data
+@exec [ -d %D/www/data ] || mkdir -p %D/www/data
+@unexec [ -L %D/www/data/moin ] && rm -f %D/www/data/moin
+@exec [ -L %D/www/data/moin ] || ln -fs %D/share/moin/htdocs %D/www/data/moin || true