From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 21 15:00:32 2005 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 BDD6F16A470 for ; Mon, 21 Nov 2005 15:00:32 +0000 (GMT) (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 2F5A843D49 for ; Mon, 21 Nov 2005 15:00:32 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jALF0V7Z029182 for ; Mon, 21 Nov 2005 15:00:31 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jALF0Vdo029177; Mon, 21 Nov 2005 15:00:31 GMT (envelope-from gnats) Resent-Date: Mon, 21 Nov 2005 15:00:31 GMT Resent-Message-Id: <200511211500.jALF0Vdo029177@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 C768E16A4C8 for ; Mon, 21 Nov 2005 14:54:54 +0000 (GMT) (envelope-from jbq@caraldi.com) Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA17643D58 for ; Mon, 21 Nov 2005 14:54:52 +0000 (GMT) (envelope-from jbq@caraldi.com) Received: from caraldi.com (localhost [127.0.0.1]) by caraldi.com (Postfix) with ESMTP id 3D9266114 for ; Mon, 21 Nov 2005 15:54:51 +0100 (CET) Received: (from jbq@localhost) by caraldi.com (8.13.1/8.13.1/Submit) id jALEso90007194; Mon, 21 Nov 2005 15:54:50 +0100 (CET) (envelope-from jbq) Message-Id: <200511211454.jALEso90007194@caraldi.com> Date: Mon, 21 Nov 2005 15:54:50 +0100 (CET) From: Jean-Baptiste Quenot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89371: Maintainer update: www/cocoon 2.1.8 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: Mon, 21 Nov 2005 15:00:32 -0000 >Number: 89371 >Category: ports >Synopsis: Maintainer update: www/cocoon 2.1.8 >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: Mon Nov 21 15:00:31 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jean-Baptiste Quenot >Release: FreeBSD 5.3-RELEASE i386 >Organization: >Environment: System: FreeBSD caraldi.com 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: This is an update of www/cocoon to version 2.1.8. Thanks in advance! >How-To-Repeat: >Fix: diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile ./Makefile --- /usr/ports/www/cocoon/Makefile Fri Jul 29 00:32:24 2005 +++ ./Makefile Mon Nov 21 15:39:37 2005 @@ -6,7 +6,7 @@ # PORTNAME= cocoon -PORTVERSION= 2.1.7 +PORTVERSION= 2.1.8 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -142,7 +142,7 @@ @${SED} ${SUBSTITUTIONS} ${MASTERDIR}/pkg-message > ${PKGMESSAGE} @${ECHO_CMD} @${ECHO_CMD} "********************************************************************************" - @${CAT} ${PKGMESSAGE} | fmt -w 80 + @${FMT} -w80 ${PKGMESSAGE} @${ECHO_CMD} "********************************************************************************" @${ECHO_CMD} diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile.options ./Makefile.options --- /usr/ports/www/cocoon/Makefile.options Mon Apr 4 00:42:08 2005 +++ ./Makefile.options Sun Nov 20 18:30:13 2005 @@ -17,6 +17,7 @@ OPTIONS+= JSP 'Enable the jsp block' on OPTIONS+= LINKREWRITER 'Enable the linkrewriter block' on OPTIONS+= LUCENE 'Enable the lucene block' on +OPTIONS+= MIDI 'Enable the midi block' on OPTIONS+= NAMING 'Enable the naming block' on OPTIONS+= OJB 'Enable the ojb block' on OPTIONS+= PARANOID 'Enable the paranoid block' on @@ -33,19 +34,21 @@ OPTIONS+= PORTAL_FW 'Enable the portal-fw block' off OPTIONS+= SWF 'Enable the swf block' off OPTIONS+= WOODY 'Enable the woody block' off +OPTIONS+= AJAX 'Enable the ajax block' on OPTIONS+= APPLES 'Enable the apples block' on OPTIONS+= ASCIIART 'Enable the asciiart block' on OPTIONS+= AXIS 'Enable the axis block' on +OPTIONS+= CAPTCHA 'Enable the captcha block' on OPTIONS+= CRON 'Enable the cron block' on 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+= JAVAFLOW 'Enable the javaflow block' on +OPTIONS+= JCR 'Enable the jcr block' on OPTIONS+= JMS 'Enable the jms block' on OPTIONS+= LINOTYPE 'Enable the linotype block' on OPTIONS+= MAIL 'Enable the mail block' on -OPTIONS+= MIDI 'Enable the midi block' on OPTIONS+= PETSTORE 'Enable the petstore block' on OPTIONS+= PROXY 'Enable the proxy block' on OPTIONS+= QDOX 'Enable the qdox block' on @@ -57,4 +60,6 @@ OPTIONS+= STX 'Enable the stx block' on OPTIONS+= TAGLIB 'Enable the taglib block' on OPTIONS+= TOUR 'Enable the tour block' on +OPTIONS+= VALIDATION 'Enable the validation block' on OPTIONS+= WEBDAV 'Enable the webdav block' on +OPTIONS+= XSLTAL 'Enable the xsltal block' on diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile.test-options ./Makefile.test-options --- /usr/ports/www/cocoon/Makefile.test-options Mon Apr 4 00:42:08 2005 +++ ./Makefile.test-options Sun Nov 20 18:30:45 2005 @@ -38,6 +38,7 @@ .if defined(WITH_ITEXT) BLOCKS+= itext +BLOCKS+= xsp .endif .if defined(WITH_JFOR) @@ -57,12 +58,17 @@ BLOCKS+= lucene .endif +.if defined(WITH_MIDI) +BLOCKS+= midi +.endif + .if defined(WITH_NAMING) BLOCKS+= naming .endif .if defined(WITH_OJB) BLOCKS+= ojb +BLOCKS+= ajax BLOCKS+= databases BLOCKS+= forms BLOCKS+= hsqldb @@ -79,9 +85,13 @@ .if defined(WITH_PORTAL) BLOCKS+= portal +BLOCKS+= ajax BLOCKS+= authentication-fw BLOCKS+= cron +BLOCKS+= databases BLOCKS+= forms +BLOCKS+= hsqldb +BLOCKS+= ojb BLOCKS+= session-fw BLOCKS+= xsp .endif @@ -138,8 +148,13 @@ BLOCKS+= xsp .endif +.if defined(WITH_AJAX) +BLOCKS+= ajax +.endif + .if defined(WITH_APPLES) BLOCKS+= apples +BLOCKS+= ajax BLOCKS+= forms .endif @@ -151,6 +166,10 @@ BLOCKS+= axis .endif +.if defined(WITH_CAPTCHA) +BLOCKS+= captcha +.endif + .if defined(WITH_CRON) BLOCKS+= cron .endif @@ -161,6 +180,7 @@ .if defined(WITH_EVENTCACHE) BLOCKS+= eventcache +BLOCKS+= cron BLOCKS+= databases BLOCKS+= hsqldb BLOCKS+= jms @@ -169,9 +189,13 @@ .if defined(WITH_FACES) BLOCKS+= faces +BLOCKS+= ajax BLOCKS+= authentication-fw BLOCKS+= cron +BLOCKS+= databases BLOCKS+= forms +BLOCKS+= hsqldb +BLOCKS+= ojb BLOCKS+= portal BLOCKS+= session-fw BLOCKS+= taglib @@ -180,10 +204,12 @@ .if defined(WITH_FORMS) BLOCKS+= forms +BLOCKS+= ajax .endif .if defined(WITH_JAVAFLOW) BLOCKS+= javaflow +BLOCKS+= ajax BLOCKS+= databases BLOCKS+= forms BLOCKS+= hsqldb @@ -191,8 +217,13 @@ BLOCKS+= xsp .endif +.if defined(WITH_JCR) +BLOCKS+= jcr +.endif + .if defined(WITH_JMS) BLOCKS+= jms +BLOCKS+= cron BLOCKS+= databases BLOCKS+= hsqldb BLOCKS+= xsp @@ -207,12 +238,9 @@ BLOCKS+= asciiart .endif -.if defined(WITH_MIDI) -BLOCKS+= midi -.endif - .if defined(WITH_PETSTORE) BLOCKS+= petstore +BLOCKS+= ajax BLOCKS+= databases BLOCKS+= forms BLOCKS+= hsqldb @@ -230,6 +258,7 @@ .if defined(WITH_QUERYBEAN) BLOCKS+= querybean +BLOCKS+= ajax BLOCKS+= databases BLOCKS+= forms BLOCKS+= hsqldb @@ -240,6 +269,7 @@ .if defined(WITH_REPOSITORY) BLOCKS+= repository +BLOCKS+= cron BLOCKS+= databases BLOCKS+= eventcache BLOCKS+= hsqldb @@ -253,6 +283,7 @@ .if defined(WITH_SLIDE) BLOCKS+= slide +BLOCKS+= cron BLOCKS+= databases BLOCKS+= eventcache BLOCKS+= hsqldb @@ -275,18 +306,29 @@ .if defined(WITH_TOUR) BLOCKS+= tour +BLOCKS+= ajax BLOCKS+= batik BLOCKS+= fop BLOCKS+= forms +BLOCKS+= slop +.endif + +.if defined(WITH_VALIDATION) +BLOCKS+= validation .endif .if defined(WITH_WEBDAV) BLOCKS+= webdav +BLOCKS+= cron BLOCKS+= databases BLOCKS+= eventcache BLOCKS+= hsqldb BLOCKS+= jms BLOCKS+= repository BLOCKS+= xsp +.endif + +.if defined(WITH_XSLTAL) +BLOCKS+= xsltal .endif diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/distinfo ./distinfo --- /usr/ports/www/cocoon/distinfo Mon Apr 4 00:42:08 2005 +++ ./distinfo Sun Nov 20 17:18:46 2005 @@ -1,2 +1,2 @@ -MD5 (cocoon-2.1.7-src.tar.gz) = 423209dad3650e4f4fb1d76bd64a4747 -SIZE (cocoon-2.1.7-src.tar.gz) = 41950734 +MD5 (cocoon-2.1.8-src.tar.gz) = 98ecb00c42ed41525cb6f098eacf76e5 +SIZE (cocoon-2.1.8-src.tar.gz) = 44885682 diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/cocoonctl ./files/cocoonctl --- /usr/ports/www/cocoon/files/cocoonctl Mon Apr 4 00:42:08 2005 +++ ./files/cocoonctl Fri Oct 14 11:25:30 2005 @@ -141,19 +141,20 @@ APP_HOME = "%%APP_HOME%%" PID_FILE = "%%PID_FILE%%" COMMAND = "%%PREFIX%%/sbin/%%APP_NAME%%.sh" + os.environ["JAVA_OPTIONS"] = " ".join(sys.argv[1:-1]) ARGS = [COMMAND, "servlet"] - if len(sys.argv) != 2: + if len(sys.argv) < 2: usage() sys.exit(1) - if sys.argv[1] == "start": + if sys.argv[-1] == "start": start() - elif sys.argv[1] == "stop": + elif sys.argv[-1] == "stop": stop() - elif sys.argv[1] == "restart": + elif sys.argv[-1] == "restart": stop() start() diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/pkg-deinstall ./files/pkg-deinstall --- /usr/ports/www/cocoon/files/pkg-deinstall Mon Apr 4 00:42:08 2005 +++ ./files/pkg-deinstall Mon Nov 21 13:44:23 2005 @@ -43,11 +43,13 @@ fi fi - echo -n ">> Removing log file (${LOG_FILE})..." - if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then - echo " [ DONE ]" - else - echo " [ FAILED ]" + if [ -e ${LOG_FILE} ] ; then + echo -n ">> Removing log file (${LOG_FILE})..." + if rm ${LOG_FILE} > /dev/null 2> /dev/null ; then + echo " [ DONE ]" + else + echo " [ FAILED ]" + fi fi fi diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/pkg-message ./pkg-message --- /usr/ports/www/cocoon/pkg-message Wed Jul 21 22:01:31 2004 +++ ./pkg-message Mon Nov 21 13:49:14 2005 @@ -3,10 +3,43 @@ In order to be able to run Cocoon, please add the following line to /etc/rc.conf: -%%APP_NAME%%_enable="YES" + %%APP_NAME%%_enable="YES" If you wish to start cocoon right now, invoke the startup script with `%%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start' and point your web browser to the default home page at http://localhost:%%PORT%%/ where you may read the documentation and test the samples. + +For this control script to run seamlessly, it is recommended to increase the +maximum length of commands displayed by ps(1). Please append the following +setting to /etc/sysctl.conf: + + # Do not truncate command line arguments in ps(1) listing + kern.ps_arg_cache_limit=10000 + +This setting will take effect at next reboot, however it is possible to have +immediate effect with the following command as root: + + # sysctl kern.ps_arg_cache_limit=10000 + +If you wish to skip this setting, please note that the `stop', `restart' and +`status' will not function properly with %%APP_NAME%%.sh. + + +Enjoy! + +-------------------------------------------------------------------------------- +ADVANCED USAGE + +If you need to pass special options to Java, please set the +%%APP_NAME%%_flags option in /etc/rc.conf, see examples below: + + # Prevent Java from opening an X11 display + %%APP_NAME%%_flags="-Djava.awt.headless=true" + + # Increase memory limit of the Java virtual machine + %%APP_NAME%%_flags="-Xms32m -Xmx256m" + + # Run Java virtual machine with remote debugging turned on on port 8000 + %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" >Release-Note: >Audit-Trail: >Unformatted: