- Add WSGI support. [1]

- Fix shebang line in moin.fcgi. [2]

PR:		ports/145690 [1], ports/145646 [2]
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> [1]
		ghostonthewire <ghostonthewire@gmail.com> [2]
Approved by:	maintainer

3 files changed, 37 insertions, 4 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 773048cb87fe..9d2df769f553 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moinmoin
 PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://static.moinmo.in/files/
 DISTNAME=	moin-${PORTVERSION}
@@ -39,13 +39,15 @@ MOINSCRIPT=	${MOINDIR}/server/moin.fcgi
 .elif ${MOINTYPE} == "MOD_PYTHON"
 .elif ${MOINTYPE} == "CGI"
 MOINSCRIPT=	${MOINDIR}/server/moin.cgi
+.elif ${MOINTYPE} == "WSGI"
+MOINSCRIPT=	${MOINDIR}/server/moin.wsgi
 .else
-BROKEN=		MOINTYPE must be a STANDALONE, FCGI, MOD_PYTHON or CGI.
+BROKEN=		MOINTYPE must be a STANDALONE, FCGI, WSGI, MOD_PYTHON or CGI.
 .endif
 
 pre-everything::
 	@${ECHO}
-	@${ECHO} "Set MOINTYPE=(CGI|FCGI|STANDALONE) to define"
+	@${ECHO} "Set MOINTYPE=(CGI|FCGI|WSGI|STANDALONE) to define"
 	@${ECHO} "type of installation. Default is CGI."
 	@${ECHO} "Use MOINDEST=/path to modify installation destination."
 	@${ECHO} "Default value for MOINDEST is ${PREFIX}/www/wiki."
diff --git a/www/moinmoin/files/patch-wiki-server-moin.fcgi b/www/moinmoin/files/patch-wiki-server-moin.fcgi
new file mode 100644
index 000000000000..9793fcdda817
--- /dev/null
+++ b/www/moinmoin/files/patch-wiki-server-moin.fcgi
@@ -0,0 +1,8 @@
+--- wiki/server/moin.fcgi.orig  2010-02-28 23:28:49.000000000 +0800
++++ wiki/server/moin.fcgi       2010-04-28 16:33:04.097920979 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ """
+     MoinMoin - CGI/FCGI Driver script
diff --git a/www/moinmoin/files/pkg-install.in b/www/moinmoin/files/pkg-install.in
index 1da3ecc9f26d..8fad86a4c341 100644
--- a/www/moinmoin/files/pkg-install.in
+++ b/www/moinmoin/files/pkg-install.in
@@ -56,6 +56,29 @@ case "x$2" in
 
 		;;
 
+	"xWSGI")
+
+		echo "Since you chose MOINTYPE=WSGI, you should "
+		echo "add something like that to your Apache configuration."
+		echo ""
+
+		echo ",-----"
+		echo " Alias /moin_static180/ \"$sharedir/htdocs/\""
+		echo " <Directory \"$sharedir/htdocs/\">"
+		echo "     Order deny,allow"
+		echo "     Allow from all"
+		echo " </Directory>"
+		echo " WSGIScriptAlias /mywiki \"$destdir/moin.wsgi\""
+		echo "#If you use HTTP authorization enable the following also"
+    		echo "#WSGIPassAuthorization On"
+		echo " <Directory \"$sharedir/htdocs/\">"
+		echo "     Allow from all"
+		echo " </Directory>"
+		echo "\`-----"
+		echo ""
+
+		;;
+
 	*)
 	
 		;;
@@ -84,7 +107,7 @@ case "x$2" in
 	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 "# want : moin.py (standalone), moin.fcg (FCGI), moin.wsgi (WSGI) or moin.cgi."
 	echo 'export MOINSCRIPT="moin.cgi"'
 	echo '# Defaults should be fine but you may want to modify these.'
 	echo 'export MOINDIR="%%MOINDIR%%"'