9 files changed, 80 insertions, 50 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 660aa081aa0c..23aa3307afe0 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -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 @@ APP_HOME?=		${PREFIX}/${APP_NAME}
 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 @@ SUB_FILES=	\
 		${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"
@@ -114,14 +116,21 @@ post-build:
 	@${ECHO_MSG} "===> Building packing list"
 	@> ${PLIST}
 
-	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} -type f \
+	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} -not -type d \
 	| ${SED} -e "s|^|${APP_NAME}/|" >> ${PLIST}
 
+	@cd ${WRKSRC} && ${FIND} -H -d ${COPYDIRS} -type d -empty \
+	| ${SED} -e "s|^|@exec mkdir -p %D/${APP_NAME}/|" >> ${PLIST}
+
 	@cd ${WRKSRC} && ${FIND} -H -d ${COPYDIRS} -type d \
 	| ${SED} -e "s|^|@dirrm ${APP_NAME}/|" >> ${PLIST}
 
 	@${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}
@@ -131,14 +140,11 @@ do-install:
 	@${ECHO_MSG} "===> Installing into ${PREFIX}/sbin"
 	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
 
-	@${ECHO_MSG} "===> Installing ${PREFIX}/etc/rc.d/${APP_NAME}.sh"
-	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/etc/rc.d
-
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_CMD}
 	@${ECHO_CMD} "********************************************************************************"
-	@${FMT} -w80 ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} "********************************************************************************"
 	@${ECHO_CMD}
 
diff --git a/www/cocoon/Makefile.options b/www/cocoon/Makefile.options
index a930d70fb3e7..16381bb1ec21 100644
--- a/www/cocoon/Makefile.options
+++ b/www/cocoon/Makefile.options
@@ -23,7 +23,7 @@ OPTIONS+=	NAMING	'Enable the naming block'	on
 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+=	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+=	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+=	SLIDE	'Enable the slide block'	on
 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 --git a/www/cocoon/Makefile.test-options b/www/cocoon/Makefile.test-options
index 091917d6023f..15fedce397b4 100644
--- a/www/cocoon/Makefile.test-options
+++ b/www/cocoon/Makefile.test-options
@@ -24,11 +24,13 @@ BLOCKS+=	xsp
 .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+=	ajax
 BLOCKS+=	databases
 BLOCKS+=	forms
 BLOCKS+=	hsqldb
+BLOCKS+=	template
 BLOCKS+=	xsp
 .endif
 
@@ -91,6 +94,7 @@ BLOCKS+=	poi
 .if defined(WITH_PORTAL)
 BLOCKS+=	portal
 BLOCKS+=	ajax
+BLOCKS+=	auth
 BLOCKS+=	authentication-fw
 BLOCKS+=	cron
 BLOCKS+=	databases
@@ -98,11 +102,13 @@ BLOCKS+=	forms
 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 @@ BLOCKS+=	xsp
 
 .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 @@ BLOCKS+=	xsp
 .if defined(WITH_FACES)
 BLOCKS+=	faces
 BLOCKS+=	ajax
+BLOCKS+=	auth
 BLOCKS+=	authentication-fw
 BLOCKS+=	cron
 BLOCKS+=	databases
@@ -204,6 +219,7 @@ BLOCKS+=	ojb
 BLOCKS+=	portal
 BLOCKS+=	session-fw
 BLOCKS+=	taglib
+BLOCKS+=	template
 BLOCKS+=	xsp
 .endif
 
@@ -218,6 +234,7 @@ BLOCKS+=	databases
 BLOCKS+=	forms
 BLOCKS+=	hsqldb
 BLOCKS+=	ojb
+BLOCKS+=	template
 BLOCKS+=	xsp
 .endif
 
@@ -248,6 +265,7 @@ BLOCKS+=	ajax
 BLOCKS+=	databases
 BLOCKS+=	forms
 BLOCKS+=	hsqldb
+BLOCKS+=	template
 BLOCKS+=	velocity
 BLOCKS+=	xsp
 .endif
@@ -268,6 +286,7 @@ BLOCKS+=	forms
 BLOCKS+=	hsqldb
 BLOCKS+=	lucene
 BLOCKS+=	ojb
+BLOCKS+=	template
 BLOCKS+=	xsp
 .endif
 
@@ -319,6 +338,8 @@ BLOCKS+=	batik
 BLOCKS+=	fop
 BLOCKS+=	forms
 BLOCKS+=	slop
+BLOCKS+=	template
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_VALIDATION)
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index b23dcd852878..cca4a29ff11d 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -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 --git a/www/cocoon/files/cocoon.sh.in b/www/cocoon/files/cocoon.sh.in
index f9badad030c4..0203d1d4d432 100644
--- a/www/cocoon/files/cocoon.sh.in
+++ b/www/cocoon/files/cocoon.sh.in
@@ -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 @@ procname=%%JAVA%%
 %%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 --git a/www/cocoon/files/message-advanced.in b/www/cocoon/files/message-advanced.in
new file mode 100644
index 000000000000..60f676a9c59a
--- /dev/null
+++ b/www/cocoon/files/message-advanced.in
@@ -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 --git a/www/cocoon/files/pkg-message.in b/www/cocoon/files/message.in
index 9c639a676013..6bf8f769ec8c 100644
--- a/www/cocoon/files/pkg-message.in
+++ b/www/cocoon/files/message.in
@@ -28,18 +28,3 @@ If you wish to skip this setting, please note that the `stop', `restart' and
 
 
 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"
diff --git a/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml b/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml
deleted file mode 100644
index 4ee45440e99e..000000000000
--- a/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml
+++ /dev/null
@@ -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 --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index a279b5005e69..a555f00b93b3 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 sbin/cocoonctl
-etc/rc.d/cocoon.sh
 cocoon/cocoon.sh
 @dirrm cocoon/tools
 @dirrm cocoon