From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 11 16:30:40 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 920EF16A40A for ; Tue, 11 Apr 2006 16:30:40 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD76743D78 for ; Tue, 11 Apr 2006 16:30:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3BGUGxr054297 for ; Tue, 11 Apr 2006 16:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3BGUG9K054296; Tue, 11 Apr 2006 16:30:16 GMT (envelope-from gnats) Resent-Date: Tue, 11 Apr 2006 16:30:16 GMT Resent-Message-Id: <200604111630.k3BGUG9K054296@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, Jean-Baptiste Quenot Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03B3916A400 for ; Tue, 11 Apr 2006 16:25:20 +0000 (UTC) (envelope-from jbq@anyware-tech.com) Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92B7443D49 for ; Tue, 11 Apr 2006 16:25:19 +0000 (GMT) (envelope-from jbq@anyware-tech.com) Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10]) by caraldi.com (Postfix) with ESMTP id 1D7C964C9 for ; Tue, 11 Apr 2006 18:25:18 +0200 (CEST) Received: by vision.anyware (Postfix, from userid 1021) id B41F761AC; Tue, 11 Apr 2006 18:25:19 +0200 (CEST) Message-Id: <20060411162519.B41F761AC@vision.anyware> Date: Tue, 11 Apr 2006 18:25:19 +0200 (CEST) From: Jean-Baptiste Quenot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95627: Maintainer update: www/cocoon 2.1.9 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: Tue, 11 Apr 2006 16:30:40 -0000 >Number: 95627 >Category: ports >Synopsis: Maintainer update: www/cocoon 2.1.9 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 11 16:30:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jean-Baptiste Quenot >Release: FreeBSD 5.5-PRERELEASE i386 >Organization: >Environment: System: FreeBSD vision.anyware 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #1: Thu Mar 9 19:20:53 CET 2006 jbq@vision.anyware:/usr/obj/usr/src/sys/VISION i386 >Description: This is an update of www/cocoon to version 2.1.9. Be careful, a new patch is added. Thanks in advance! >How-To-Repeat: >Fix: diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile ./Makefile --- /usr/ports/www/cocoon/Makefile Tue Nov 22 00:07:06 2005 +++ ./Makefile Tue Apr 11 17:25:57 2006 @@ -6,7 +6,7 @@ # PORTNAME= cocoon -PORTVERSION= 2.1.8 +PORTVERSION= 2.1.9 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile.options ./Makefile.options --- /usr/ports/www/cocoon/Makefile.options Tue Nov 22 00:07:06 2005 +++ ./Makefile.options Tue Apr 11 17:41:09 2006 @@ -10,6 +10,7 @@ OPTIONS+= CHAPERON 'Enable the chaperon block' on OPTIONS+= DATABASES 'Enable the databases block' on OPTIONS+= FOP 'Enable the fop block' on +OPTIONS+= FORMS 'Enable the forms block' on OPTIONS+= HSQLDB 'Enable the hsqldb block' on OPTIONS+= HTML 'Enable the html block' on OPTIONS+= ITEXT 'Enable the itext block' on @@ -43,9 +44,9 @@ OPTIONS+= DELI 'Enable the deli block' on OPTIONS+= EVENTCACHE 'Enable the eventcache block' on OPTIONS+= FACES 'Enable the faces block' on -OPTIONS+= FORMS 'Enable the forms block' on +OPTIONS+= IMAGEOP 'Enable the imageop block' off OPTIONS+= JAVAFLOW 'Enable the javaflow block' on -OPTIONS+= JCR 'Enable the jcr block' on +OPTIONS+= JCR 'Enable the jcr block' off OPTIONS+= JMS 'Enable the jms block' on OPTIONS+= LINOTYPE 'Enable the linotype block' on OPTIONS+= MAIL 'Enable the mail block' on @@ -59,6 +60,7 @@ OPTIONS+= SLOP 'Enable the slop block' on OPTIONS+= STX 'Enable the stx block' on OPTIONS+= TAGLIB 'Enable the taglib block' on +OPTIONS+= TEMPLATE 'Enable the template block' off OPTIONS+= TOUR 'Enable the tour block' on OPTIONS+= VALIDATION 'Enable the validation block' on OPTIONS+= WEBDAV 'Enable the webdav block' on diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile.test-options ./Makefile.test-options --- /usr/ports/www/cocoon/Makefile.test-options Tue Nov 22 00:07:06 2005 +++ ./Makefile.test-options Tue Apr 11 17:26:13 2006 @@ -26,6 +26,11 @@ BLOCKS+= batik .endif +.if defined(WITH_FORMS) +BLOCKS+= forms +BLOCKS+= ajax +.endif + .if defined(WITH_HSQLDB) BLOCKS+= hsqldb BLOCKS+= databases @@ -202,9 +207,8 @@ BLOCKS+= xsp .endif -.if defined(WITH_FORMS) -BLOCKS+= forms -BLOCKS+= ajax +.if defined(WITH_IMAGEOP) +BLOCKS+= imageop .endif .if defined(WITH_JAVAFLOW) @@ -302,6 +306,10 @@ .if defined(WITH_TAGLIB) BLOCKS+= taglib +.endif + +.if defined(WITH_TEMPLATE) +BLOCKS+= template .endif .if defined(WITH_TOUR) diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/distinfo ./distinfo --- /usr/ports/www/cocoon/distinfo Wed Jan 25 00:15:10 2006 +++ ./distinfo Tue Apr 11 17:34:41 2006 @@ -1,3 +1,3 @@ -MD5 (cocoon-2.1.8-src.tar.gz) = 98ecb00c42ed41525cb6f098eacf76e5 -SHA256 (cocoon-2.1.8-src.tar.gz) = 3dd4987ee1f9f59476fab478feb890ff3b5c8bf01a5d09ef441952b42724fcb5 -SIZE (cocoon-2.1.8-src.tar.gz) = 44885682 +MD5 (cocoon-2.1.9-src.tar.gz) = f69fb596d50f7942a22c81d9c6061b29 +SHA256 (cocoon-2.1.9-src.tar.gz) = 0ff238cd5c1b20dcbd3459c74a5395a0cdc8ee636e204f1eaa0155b7dd48a6f2 +SIZE (cocoon-2.1.9-src.tar.gz) = 46893866 diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/patch-cocoon.sh ./files/patch-cocoon.sh --- /usr/ports/www/cocoon/files/patch-cocoon.sh Fri Jul 2 00:30:19 2004 +++ ./files/patch-cocoon.sh Thu Feb 23 15:49:22 2006 @@ -30,12 +30,3 @@ fi fi echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory" -@@ -111,7 +110,7 @@ - - # ----- Set Local Variables ( used to minimize cut/paste) --------------------- - --JAVA="$JAVA_HOME/bin/java" -+JAVA="exec $JAVA_HOME/bin/java" - ENDORSED_LIBS="$COCOON_HOME/lib/endorsed" - ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS" - PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/patch-src-blocks-ajax-samples ./files/patch-src-blocks-ajax-samples --- /usr/ports/www/cocoon/files/patch-src-blocks-ajax-samples Thu Jan 1 01:00:00 1970 +++ ./files/patch-src-blocks-ajax-samples Tue Apr 11 18:05:55 2006 @@ -0,0 +1,16 @@ +--- src/blocks/ajax/samples/sitemap.xmap.orig Tue Apr 11 18:05:10 2006 ++++ src/blocks/ajax/samples/sitemap.xmap Tue Apr 11 18:05:18 2006 +@@ -19,13 +19,6 @@ + @version $Id: sitemap.xmap 385331 2006-03-12 18:25:56Z sylvain $ + --> + +- +- +- +- +- +- +- + + + >Release-Note: >Audit-Trail: >Unformatted: