From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 3 08:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23F871065670 for ; Thu, 3 Jul 2008 08:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F185C8FC19 for ; Thu, 3 Jul 2008 08:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m638U0PX088652 for ; Thu, 3 Jul 2008 08:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m638U0ft088651; Thu, 3 Jul 2008 08:30:00 GMT (envelope-from gnats) Resent-Date: Thu, 3 Jul 2008 08:30:00 GMT Resent-Message-Id: <200807030830.m638U0ft088651@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhen REN Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 354D0106566C for ; Thu, 3 Jul 2008 08:21:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 20F588FC13 for ; Thu, 3 Jul 2008 08:21:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m638LHQ9024452 for ; Thu, 3 Jul 2008 08:21:17 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m638LHrr024450; Thu, 3 Jul 2008 08:21:17 GMT (envelope-from nobody) Message-Id: <200807030821.m638LHrr024450@www.freebsd.org> Date: Thu, 3 Jul 2008 08:21:17 GMT From: Zhen REN To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/125210: [UPDATE] update www/moinmoin to 1.7.0_1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2008 08:30:01 -0000 >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 " " + echo " Order deny,allow" + echo " Allow from all" + echo " " echo " Alias /mywiki $destdir" echo " " echo " SetHandler python-program" @@ -37,7 +42,11 @@ echo "" echo ",-----" - echo " Alias /wiki/ \"$sharedir/htdocs/\"" + echo " Alias /moin_static170/ \"$sharedir/htdocs/\"" + echo " " + echo " Order deny,allow" + echo " Allow from all" + echo " " echo " ScriptAlias /mywiki \"$destdir/moin.cgi\"" echo " " echo " Allow from all" >Release-Note: >Audit-Trail: >Unformatted: