Update to moinmoin 1.3.1

This port now supports installation of multiple wiki
instances as proposed by the installation guide.
Follow the textual instructions that are echoed out
by the 'make install' progress for more information.

Thanks to Florent for polishing up my update patches.

Submitted by:	Florent Thoumie <flz@xbsd.org>
PR:		ports/76377

3 files changed, 113 insertions, 30 deletions

diff --git a/www/moinmoin/files/patch-setup.py b/www/moinmoin/files/patch-setup.py
deleted file mode 100644
index 1b8fd8eed8a7..000000000000
--- a/www/moinmoin/files/patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- setup.py.orig	Sun Jun  6 08:58:33 2004
-+++ setup.py	Fri Jun 25 03:31:38 2004
-@@ -167,9 +167,11 @@
-     'scripts': moin_scripts,
- 
-     'data_files': [
--        ('share/moin/cgi-bin', filter(trash_filter, glob.glob('wiki/cgi-bin/*'))),
-+        ('share/moin/cgi-bin', filter(trash_filter,
-+            glob.glob('wiki/cgi-bin/*.cgi') +
-+            glob.glob('wiki/cgi-bin/*.py.default'))),
-         ('share/moin/data', ['wiki/data/intermap.txt']),
--        ('share/moin/data/text', filter(trash_filter, glob.glob('wiki/data/text/*'))),
-+        ('share/moin/data/text.default', filter(trash_filter, glob.glob('wiki/data/text/*'))),
-         ('share/moin/data/plugin', ['wiki/data/plugin/__init__.py']),
-         ('share/moin/data/plugin/action', ['wiki/data/plugin/action/__init__.py']),
-         ('share/moin/data/plugin/macro', ['wiki/data/plugin/macro/__init__.py']),
diff --git a/www/moinmoin/files/pkg-install.in b/www/moinmoin/files/pkg-install.in
new file mode 100644
index 000000000000..276a6f4dfea0
--- /dev/null
+++ b/www/moinmoin/files/pkg-install.in
@@ -0,0 +1,113 @@
+#! /bin/sh
+
+destdir=%%MOINDEST%%
+sharedir=%%MOINDIR%%
+
+case "x$2" in
+
+"xINSTANCE")
+
+	echo "************************************************************"
+
+	case "x$3" in
+
+	"xMOD_PYTHON")
+
+		echo "Since you chose MOINTYPE=MOD_PYTHON, you may want to"
+		echo "add something like that to your Apache configuration."
+		echo ""
+		echo ",-----"
+		echo " Alias /mywiki $destdir"
+		echo " <Location \"/mywiki\">"
+        	echo "     SetHandler python-program"
+        	echo "     PythonPath \"['$destdir'] + sys.path\""
+        	echo "     PythonHandler MoinMoin.request::RequestModPy.run"
+        	echo "     PythonAutoReload On"
+        	echo "     PythonDebug On"
+		echo " </Location>"
+		echo "\`-----"
+		echo ""
+
+		;;
+
+	"xCGI")
+
+		echo "Since you chose MOINTYPE=CGI, you may want to"
+		echo "add something like that to your Apache configuration."
+		echo ""
+
+		echo ",-----"
+		echo " Alias /wiki/ \"$sharedir/htdocs/\""
+		echo " ScriptAlias /mywiki \"$destdir/moin.cgi\""
+		echo " <Directory \"$sharedir/htdocs/\">"
+		echo "     Allow from all"
+		echo " </Directory>"
+		echo "\`-----"
+		echo ""
+
+		;;
+
+	*)
+	
+		;;
+
+	esac
+
+	echo "You may need to modify wikiconfig.py in your wiki instance"
+	echo "directory (eg. $destdir)."
+	echo ""
+	echo "If you want to install additional wiki instances"
+	echo "call 'make instance' with appriopriate arguments."
+	echo "E.g.: make MOINTYPE=FCGI MOINDEST=/usr/local/www/wiki instance"
+	echo "************************************************************"
+
+	;;
+
+"xPOST-INSTALL")
+
+	echo "************************************************************"
+	echo "Important: You have currently no wiki instance installed."
+	echo ""
+	echo "If you're installing from ports, just run 'make instance'"
+	echo "with appriopriate arguments."
+	echo "eg. make MOINTYPE=FCGI MOINDEST=/usr/local/www/wiki instance"
+	echo ""
+	echo "If you're installing from package, run these commands."
+	echo ""
+	echo "# Choose here one script depending on the type of wiki you"
+	echo "# want : moin.py (standalone), moin.fcg (FCGI) or moin.cgi."
+	echo 'export MOINSCRIPT="moin.cgi"'
+	echo '# Defaults should be fine but you may want to modify these.'
+	echo 'export MOINDIR="%%MOINDIR%%"'
+	echo 'export MOINDEST="%%MOINDEST%%"'
+	echo '# Set this to your apache user and group.'
+	echo 'export CGIUSER="www"'
+	echo 'export CGIGROUP="www"'
+	echo ''
+	echo 'mkdir -p ${MOINDEST}/data'
+	echo 'mkdir -p ${MOINDEST}/underlay'
+	echo 'cp -R ${MOINDIR}/data ${MOINDEST}'
+	echo 'cp -R ${MOINDIR}/underlay ${MOINDEST}'
+	echo 'chmod -R u+rw,go-ws ${MOINDEST}/data'
+	echo 'install -m 0555 ${MOINDIR}/config/wikiconfig.py ${MOINDEST}'
+	echo 'test -z "${MOINSCRIPT}" || \'
+	echo '	install -m 0555 ${MOINDIR}/server/${MOINSCRIPT} ${MOINDEST}'
+	echo 'chown -R ${CGIUSER}:${CGIGROUP} ${MOINDEST}'
+	echo ""
+	echo "Note: export might not work with your shell, use"
+	echo "# setenv VAR 'value' instead"
+	echo "************************************************************"
+
+	;;
+
+"xDEINSTALL")
+
+	echo "************************************************************"
+	echo "All shared files have been removed."
+	echo "To complete deinstallation, please remove all the wiki"
+	echo "instances you have created."
+	echo "************************************************************"
+
+	;;
+
+esac
diff --git a/www/moinmoin/files/wrapper.c b/www/moinmoin/files/wrapper.c
deleted file mode 100644
index bcf6f81f8b91..000000000000
--- a/www/moinmoin/files/wrapper.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-  MoinMoin setuid wrapper by perky
-  $FreeBSD$
-*/
-#include <unistd.h>
-
-int
-main(int argc, char *argv[], char *envp[])
-{
-	char *margv[] = { PYTHON_PATH, MOIN_PREFIX"/cgi-bin/moin.cgi", NULL };
-
-	chdir(MOIN_PREFIX);
-	return execve(PYTHON_PATH, margv, envp);
-}