Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jul 2008 08:21:17 GMT
From:      Zhen REN <bg1tpt@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/125210: [UPDATE] update www/moinmoin to 1.7.0_1
Message-ID:  <200807030821.m638LHrr024450@www.freebsd.org>
Resent-Message-ID: <200807030830.m638U0ft088651@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         125210
>Category:       ports
>Synopsis:       [UPDATE] update www/moinmoin to 1.7.0_1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 03 08:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Zhen REN
>Release:        7.0-STABLE
>Organization:
>Environment:
FreeBSD razor 7.0-STABLE FreeBSD 7.0-STABLE #0: Tue May 22 10:54:26 CST 2008 root@razor:/usr/obj/usr/src/sys/GENERIC i386
>Description:
File not found when run "make instance MOINTYPE=STANDALONE MOINDEST=xxx"
>How-To-Repeat:
cd /usr/ports/www/moinmoin
make install clean
make instance MOINTYPE=STANDALONE MOINDEST=xxx

>Fix:
1. change the MOINSCRIPT to wikiserver.py when defined MOINTYPE=STANDALONE, the old wiki.py is deprecated.
2. change the hint when making instances, add configuration for static contents.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/moinmoin/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	27 Jun 2008 12:25:35 -0000	1.39
+++ Makefile	3 Jul 2008 06:32:18 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	moinmoin
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://static.moinmo.in/files/
 DISTNAME=	moin-${PORTVERSION}
@@ -31,7 +32,7 @@
 PKGDEINSTALL=	${PKGINSTALL}
 
 .if ${MOINTYPE} == "STANDALONE"
-MOINSCRIPT=	${MOINDIR}/server/moin.py
+MOINSCRIPT=	${MOINDIR}/server/wikiserver.py
 .elif ${MOINTYPE} == "FCGI"
 MOINSCRIPT=	${MOINDIR}/server/moin.fcg
 .elif ${MOINTYPE} == "MOD_PYTHON"
Index: files/pkg-install.in
===================================================================
RCS file: /home/ncvs/ports/www/moinmoin/files/pkg-install.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-install.in
--- files/pkg-install.in	27 Jun 2008 12:25:35 -0000	1.2
+++ files/pkg-install.in	3 Jul 2008 08:03:12 -0000
@@ -17,6 +17,11 @@
 		echo "add something like that to your Apache configuration."
 		echo ""
 		echo ",-----"
+		echo " Alias /moin_static170/ \"$sharedir/htdocs/\""
+		echo " <Directory \"$sharedir/htdocs/\">"
+		echo "     Order deny,allow"
+		echo "     Allow from all"
+		echo " </Directory>"
 		echo " Alias /mywiki $destdir"
 		echo " <Location \"/mywiki\">"
         	echo "     SetHandler python-program"
@@ -37,7 +42,11 @@
 		echo ""
 
 		echo ",-----"
-		echo " Alias /wiki/ \"$sharedir/htdocs/\""
+		echo " Alias /moin_static170/ \"$sharedir/htdocs/\""
+		echo " <Directory \"$sharedir/htdocs/\">"
+		echo "     Order deny,allow"
+		echo "     Allow from all"
+		echo " </Directory>"
 		echo " ScriptAlias /mywiki \"$destdir/moin.cgi\""
 		echo " <Directory \"$sharedir/htdocs/\">"
 		echo "     Allow from all"


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807030821.m638LHrr024450>