Date: Mon, 22 Jan 2007 18:00:43 GMT From: Jean-Baptiste Quenot <jb.quenot@caraldi.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/108195: Maintainer update: www/cocoon updated to 2.1.10 Message-ID: <200701221800.l0MI0h4e074309@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/108195; it has been noted by GNATS.
From: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/108195: Maintainer update: www/cocoon updated to 2.1.10
Date: Mon, 22 Jan 2007 18:20:21 +0100
--IS0zKkzwUGydFO0o
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Ehem, in fact it's me ;-)
Please find attached an updated patch that also changes the
maintainer email.
Thanks,
--
Jean-Baptiste Quenot
aka John Banana Qwerty
http://caraldi.com/jbq/
--IS0zKkzwUGydFO0o
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="cocoon-2.1.10.patch"
Content-Transfer-Encoding: 8bit
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile ./Makefile
--- /usr/ports/www/cocoon/Makefile Mon May 15 11:25:54 2006
+++ ./Makefile Mon Jan 22 18:17:51 2007
@@ -6,13 +6,13 @@
#
PORTNAME= cocoon
-PORTVERSION= 2.1.9
+PORTVERSION= 2.1.10
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PDISTNAME}-src
-MAINTAINER= jb.quenot@caraldi.com
+MAINTAINER= jbq@caraldi.com
COMMENT= XML Web Development Framework
USE_RC_SUBR= ${PORTNAME}.sh
@@ -26,6 +26,7 @@
LATEST_LINK= ${APP_NAME}
PLIST= ${WRKDIR}/pkg-plist
PDISTNAME= ${PORTNAME}-${PORTVERSION}
+PKGMESSAGE= ${WRKDIR}/pkg-message
COCOON_LIB= ${JAVASHAREDIR}/${APP_NAME}
PLIST_SUB+= "COCOON_LIB=${COCOON_LIB}"
@@ -62,7 +63,8 @@
${APP_NAME}ctl \
${APP_NAME}.sh \
upstreams-cocoon.sh \
- pkg-message
+ message \
+ message-advanced
# Load options (before including bsd.port.pre.mk)
.include "${.CURDIR}/Makefile.options"
@@ -122,6 +124,10 @@
@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}
+pre-install:
+ @${FMT} -w80 ${WRKDIR}/message > ${PKGMESSAGE}
+ @${CAT} ${WRKDIR}/message-advanced >> ${PKGMESSAGE}
+
do-install:
@${ECHO_MSG} "===> Installing ${COPYDIRS}"
@${MKDIR} ${APP_HOME}
@@ -138,7 +144,7 @@
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_CMD}
@${ECHO_CMD} "********************************************************************************"
- @${FMT} -w80 ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
@${ECHO_CMD} "********************************************************************************"
@${ECHO_CMD}
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/Makefile.options ./Makefile.options
--- /usr/ports/www/cocoon/Makefile.options Sun May 7 00:13:07 2006
+++ ./Makefile.options Mon Jan 22 18:16:53 2007
@@ -23,7 +23,7 @@
OPTIONS+= OJB 'Enable the ojb block' on
OPTIONS+= PARANOID 'Enable the paranoid block' on
OPTIONS+= POI 'Enable the poi block' on
-OPTIONS+= PORTAL 'Enable the portal block' off
+OPTIONS+= PORTAL 'Enable the portal block' on
OPTIONS+= PROFILER 'Enable the profiler block' on
OPTIONS+= PYTHON 'Enable the python block' on
OPTIONS+= SESSION_FW 'Enable the session-fw block' on
@@ -38,13 +38,14 @@
OPTIONS+= AJAX 'Enable the ajax block' on
OPTIONS+= APPLES 'Enable the apples block' on
OPTIONS+= ASCIIART 'Enable the asciiart block' on
+OPTIONS+= AUTH 'Enable the auth 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+= IMAGEOP 'Enable the imageop block' off
+OPTIONS+= IMAGEOP 'Enable the imageop block' on
OPTIONS+= JAVAFLOW 'Enable the javaflow block' on
OPTIONS+= JCR 'Enable the jcr block' off
OPTIONS+= JMS 'Enable the jms block' on
@@ -60,7 +61,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+= TEMPLATE 'Enable the template block' on
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=.swp --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 Sun May 7 00:13:07 2006
+++ ./Makefile.test-options Mon Jan 22 18:16:53 2007
@@ -24,11 +24,13 @@
.if defined(WITH_FOP)
BLOCKS+= fop
BLOCKS+= batik
+BLOCKS+= xsp
.endif
.if defined(WITH_FORMS)
BLOCKS+= forms
BLOCKS+= ajax
+BLOCKS+= template
.endif
.if defined(WITH_HSQLDB)
@@ -77,6 +79,7 @@
BLOCKS+= databases
BLOCKS+= forms
BLOCKS+= hsqldb
+BLOCKS+= template
BLOCKS+= xsp
.endif
@@ -91,6 +94,7 @@
.if defined(WITH_PORTAL)
BLOCKS+= portal
BLOCKS+= ajax
+BLOCKS+= auth
BLOCKS+= authentication-fw
BLOCKS+= cron
BLOCKS+= databases
@@ -98,11 +102,13 @@
BLOCKS+= hsqldb
BLOCKS+= ojb
BLOCKS+= session-fw
+BLOCKS+= template
BLOCKS+= xsp
.endif
.if defined(WITH_PROFILER)
BLOCKS+= profiler
+BLOCKS+= auth
.endif
.if defined(WITH_PYTHON)
@@ -155,24 +161,32 @@
.if defined(WITH_AJAX)
BLOCKS+= ajax
+BLOCKS+= template
.endif
.if defined(WITH_APPLES)
BLOCKS+= apples
BLOCKS+= ajax
BLOCKS+= forms
+BLOCKS+= template
.endif
.if defined(WITH_ASCIIART)
BLOCKS+= asciiart
.endif
+.if defined(WITH_AUTH)
+BLOCKS+= auth
+.endif
+
.if defined(WITH_AXIS)
BLOCKS+= axis
+BLOCKS+= xsp
.endif
.if defined(WITH_CAPTCHA)
BLOCKS+= captcha
+BLOCKS+= template
.endif
.if defined(WITH_CRON)
@@ -195,6 +209,7 @@
.if defined(WITH_FACES)
BLOCKS+= faces
BLOCKS+= ajax
+BLOCKS+= auth
BLOCKS+= authentication-fw
BLOCKS+= cron
BLOCKS+= databases
@@ -204,6 +219,7 @@
BLOCKS+= portal
BLOCKS+= session-fw
BLOCKS+= taglib
+BLOCKS+= template
BLOCKS+= xsp
.endif
@@ -218,6 +234,7 @@
BLOCKS+= forms
BLOCKS+= hsqldb
BLOCKS+= ojb
+BLOCKS+= template
BLOCKS+= xsp
.endif
@@ -248,6 +265,7 @@
BLOCKS+= databases
BLOCKS+= forms
BLOCKS+= hsqldb
+BLOCKS+= template
BLOCKS+= velocity
BLOCKS+= xsp
.endif
@@ -268,6 +286,7 @@
BLOCKS+= hsqldb
BLOCKS+= lucene
BLOCKS+= ojb
+BLOCKS+= template
BLOCKS+= xsp
.endif
@@ -319,6 +338,8 @@
BLOCKS+= fop
BLOCKS+= forms
BLOCKS+= slop
+BLOCKS+= template
+BLOCKS+= xsp
.endif
.if defined(WITH_VALIDATION)
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/distinfo ./distinfo
--- /usr/ports/www/cocoon/distinfo Sun May 7 00:13:07 2006
+++ ./distinfo Mon Jan 22 18:16:53 2007
@@ -1,3 +1,3 @@
-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
+MD5 (cocoon-2.1.10-src.tar.gz) = d073b36274ab359b59bbb760e083a934
+SHA256 (cocoon-2.1.10-src.tar.gz) = 326b591cb2b43a70f56eec825e6605c99bf283e0fc3be8fe5085e45bcaca3135
+SIZE (cocoon-2.1.10-src.tar.gz) = 49941251
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/cocoon.sh.in ./files/cocoon.sh.in
--- /usr/ports/www/cocoon/files/cocoon.sh.in Fri May 5 18:35:05 2006
+++ ./files/cocoon.sh.in Mon Jan 22 18:16:53 2007
@@ -4,6 +4,8 @@
#
# PROVIDE: %%APP_NAME%%
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable %%APP_NAME%%:
@@ -16,10 +18,9 @@
name=%%APP_NAME%%
rcvar=`set_rcvar`
-command=%%PREFIX%%/sbin/%%APP_NAME%%ctl
-command_args="$1"
+command="%%PREFIX%%/sbin/%%APP_NAME%%ctl"
+command_args="start"
pidfile=%%PID_FILE%%
-procname=%%JAVA%%
# set defaults
@@ -28,4 +29,15 @@
%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
load_rc_config ${name}
+
+if test -n "${%%APP_NAME%%_java_version}" ; then
+ JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
+ procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
+else
+ JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
+ procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
+fi
+
+export JAVA_HOME
+
run_rc_command "$1"
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/message-advanced.in ./files/message-advanced.in
--- /usr/ports/www/cocoon/files/message-advanced.in Thu Jan 1 01:00:00 1970
+++ ./files/message-advanced.in Mon Jan 22 18:16:53 2007
@@ -0,0 +1,23 @@
+
+--------------------------------------------------------------------------------
+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 with remote debugging turned on on port 8000
+
+ %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+
+To specify the java version to use, please use %%APP_NAME%%_java_version:
+
+ %%APP_NAME%%_java_version="1.4"
+
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/message.in ./files/message.in
--- /usr/ports/www/cocoon/files/message.in Thu Jan 1 01:00:00 1970
+++ ./files/message.in Mon Jan 22 18:16:53 2007
@@ -0,0 +1,30 @@
+Cocoon is now installed in %%APP_HOME%%.
+
+In order to be able to run Cocoon, please add the following line to
+/etc/rc.conf:
+
+ %%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!
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml ./files/patch-src-blocks-forms-samples-welcome.xml
--- /usr/ports/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml Fri May 5 18:35:05 2006
+++ ./files/patch-src-blocks-forms-samples-welcome.xml Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-Index: src/blocks/forms/samples/welcome.xml
-===================================================================
---- src/blocks/forms/samples/welcome.xml (revision 393856)
-+++ src/blocks/forms/samples/welcome.xml (working copy)
-@@ -21,12 +21,6 @@
- <group name="Back">
- <sample name="Back" href="../..">to Cocoon Samples main page</sample>
- <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
-- <note>
-- Cocoon Forms is the upcoming forms framework for Cocoon.
-- Although it is marked as unstable it is the *only* supported solution - all
-- other similar approaches will be deprecated soon.
-- Of course, your feedback is very much welcome on the Cocoon mailing lists.
-- </note>
- <sample name="Cocoon Forms Documentation" href="http://cocoon.apache.org/2.1/userdocs/basics/index.html">;
- Documentation is available on the Cocoon site.
- </sample>
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/cocoon/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/www/cocoon/files/pkg-message.in Fri May 5 18:35:05 2006
+++ ./files/pkg-message.in Thu Jan 1 01:00:00 1970
@@ -1,45 +0,0 @@
-Cocoon is now installed in %%APP_HOME%%.
-
-In order to be able to run Cocoon, please add the following line to
-/etc/rc.conf:
-
- %%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"
--IS0zKkzwUGydFO0o--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701221800.l0MI0h4e074309>