- Update to 2.1.9

- Use USE_RC_SUBR
- Use SUB_FILES
- Remove USE_REINPLACE

PR:		95627
Submitted by:	maintainer

14 files changed, 211 insertions, 47 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index f33a477..4bbc80c 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -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}
@@ -15,21 +15,17 @@ DISTNAME=	${PDISTNAME}-src
 MAINTAINER=	jb.quenot@caraldi.com
 COMMENT=	XML Web Development Framework
 
-USE_RC_SUBR=		yes
+USE_RC_SUBR=		${PORTNAME}.sh
 USE_JAVA=		yes
 JAVA_VERSION=		1.3+
 USE_PYTHON=		1.6+
-USE_REINPLACE=		YES
 MAKE_ENV=		JAVA_HOME=${JAVA_HOME}
 WRKSRC=			${WRKDIR}/${PDISTNAME}
 APP_NAME?=		${PORTNAME}
 APP_HOME?=		${PREFIX}/${APP_NAME}
 LATEST_LINK=		${APP_NAME}
 PLIST=			${WRKDIR}/pkg-plist
-PKGMESSAGE=		${WRKDIR}/pkg-message
 PDISTNAME=		${PORTNAME}-${PORTVERSION}
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 
 COCOON_LIB=	${JAVASHAREDIR}/${APP_NAME}
 PLIST_SUB+=	"COCOON_LIB=${COCOON_LIB}"
@@ -44,22 +40,29 @@ GROUP?=		www
 GID?=		80
 LOG_FILE?=	${APP_HOME}/${APP_NAME}.log
 
-SUBSTITUTIONS=	\
-	-e "s|%%APP_HOME%%|${APP_HOME}|g" \
-	-e "s|%%APP_NAME%%|${APP_NAME}|g" \
-	-e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
-	-e "s|%%PREFIX%%|${PREFIX}|g" \
-	-e "s|%%PORT%%|${PORT}|g" \
-	-e "s|%%COCOON_LIB%%|${COCOON_LIB}|g" \
-	-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
-	-e "s|%%JAVA%%|${JAVA}|g" \
-	-e "s|%%PID_FILE%%|${PID_FILE}|g" \
-	-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
-	-e "s|%%RUNASUID%%|${RUNASUID}|g" \
-	-e "s|%%GROUP%%|${GROUP}|g" \
-	-e "s|%%GID%%|${GID}|g" \
-	-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
-	-e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g"
+SUB_LIST=	\
+		APP_HOME=${APP_HOME} \
+		APP_NAME=${APP_NAME} \
+		RC_SUBR=${RC_SUBR} \
+		PREFIX=${PREFIX} \
+		PORT=${PORT} \
+		COCOON_LIB=${COCOON_LIB} \
+		JAVA_HOME=${JAVA_HOME} \
+		JAVA=${JAVA} \
+		PID_FILE=${PID_FILE} \
+		RUNASUSER=${RUNASUSER} \
+		RUNASUID=${RUNASUID} \
+		GROUP=${GROUP} \
+		GID=${GID} \
+		LOG_FILE=${LOG_FILE} \
+		PYTHON_CMD=${PYTHON_CMD}
+
+SUB_FILES=	\
+		pkg-install \
+		pkg-deinstall \
+		${APP_NAME}ctl \
+		${APP_NAME}.sh \
+		pkg-message
 
 # Load options (before including bsd.port.pre.mk)
 .include "${.CURDIR}/Makefile.options"
@@ -119,27 +122,20 @@ post-build:
 
 	@${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}
 
-	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/pkg-install > ${PKGINSTALL}
-	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/pkg-deinstall > ${PKGDEINSTALL}
-
 do-install:
 	@${ECHO_MSG} "===> Installing ${COPYDIRS}"
 	@${MKDIR} ${APP_HOME}
 	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${APP_HOME}
 
 	@${ECHO_MSG} "===> Installing into ${PREFIX}/sbin"
-	@${SED} ${SUBSTITUTIONS} ${WRKSRC}/cocoon.sh > ${WRKDIR}/${APP_NAME}.sh
 	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/sbin
-	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/${APP_NAME}ctl > ${WRKDIR}/${APP_NAME}ctl
 	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
 
 	@${ECHO_MSG} "===> Installing ${PREFIX}/etc/rc.d/${APP_NAME}.sh"
-	@${SED} ${SUBSTITUTIONS} ${FILESDIR}/${APP_NAME}.sh > ${WRKDIR}/${APP_NAME}.sh
 	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}.sh ${PREFIX}/etc/rc.d
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${SED} ${SUBSTITUTIONS} ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${ECHO_CMD} "********************************************************************************"
 	@${FMT} -w80 ${PKGMESSAGE}
diff --git a/www/cocoon/Makefile.options b/www/cocoon/Makefile.options
index 7d0c167..a930d70 100644
--- a/www/cocoon/Makefile.options
+++ b/www/cocoon/Makefile.options
@@ -10,6 +10,7 @@ OPTIONS+=	BSF	'Enable the bsf block'	on
 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+=	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+=	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+=	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+=	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 91b2773..091917d 100644
--- a/www/cocoon/Makefile.test-options
+++ b/www/cocoon/Makefile.test-options
@@ -26,6 +26,11 @@ BLOCKS+=	fop
 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+=	taglib
 BLOCKS+=	xsp
 .endif
 
-.if defined(WITH_FORMS)
-BLOCKS+=	forms
-BLOCKS+=	ajax
+.if defined(WITH_IMAGEOP)
+BLOCKS+=	imageop
 .endif
 
 .if defined(WITH_JAVAFLOW)
@@ -304,6 +308,10 @@ BLOCKS+=	stx
 BLOCKS+=	taglib
 .endif
 
+.if defined(WITH_TEMPLATE)
+BLOCKS+=	template
+.endif
+
 .if defined(WITH_TOUR)
 BLOCKS+=	tour
 BLOCKS+=	ajax
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index b829c44..b23dcd8 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -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 --git a/www/cocoon/files/cocoon.sh b/www/cocoon/files/cocoon.sh.in
index f9badad..f9badad 100644
--- a/www/cocoon/files/cocoon.sh
+++ b/www/cocoon/files/cocoon.sh.in
diff --git a/www/cocoon/files/cocoonctl b/www/cocoon/files/cocoonctl.in
index bfc05ad..bfc05ad 100644
--- a/www/cocoon/files/cocoonctl
+++ b/www/cocoon/files/cocoonctl.in
diff --git a/www/cocoon/files/patch-cocoon.sh b/www/cocoon/files/patch-cocoon.sh
index 93a669d..5cd6090 100644
--- a/www/cocoon/files/patch-cocoon.sh
+++ b/www/cocoon/files/patch-cocoon.sh
@@ -30,12 +30,3 @@ $FreeBSD$
    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 --git a/www/cocoon/files/patch-src-blocks-ajax-samples b/www/cocoon/files/patch-src-blocks-ajax-samples
new file mode 100644
index 0000000..92ccb02
--- /dev/null
+++ b/www/cocoon/files/patch-src-blocks-ajax-samples
@@ -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 $
+   -->
+ <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+-  <map:components>
+-    <map:generators>
+-	  <!-- use the new implementation of JX -->
+-	  <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator"/>
+-    </map:generators>
+-  </map:components>
+-
+  <map:resources>
+    <!-- this will later become a virtual transformer -->
+    <map:resource name="simple-page2html">
diff --git a/www/cocoon/files/patch-src-blocks-forms-samples b/www/cocoon/files/patch-src-blocks-forms-samples
new file mode 100644
index 0000000..6bfa833
--- /dev/null
+++ b/www/cocoon/files/patch-src-blocks-forms-samples
@@ -0,0 +1,134 @@
+Index: src/blocks/forms/samples/forms/inplace_edit_form.xml
+===================================================================
+--- src/blocks/forms/samples/forms/inplace_edit_form.xml	(revision 0)
++++ src/blocks/forms/samples/forms/inplace_edit_form.xml	(revision 393475)
+@@ -0,0 +1,51 @@
++<?xml version="1.0"?>
++<!--
++  Copyright 1999-2004 The Apache Software Foundation
++
++  Licensed under the Apache License, Version 2.0 (the "License");
++  you may not use this file except in compliance with the License.
++  You may obtain a copy of the License at
++
++      http://www.apache.org/licenses/LICENSE-2.0
++
++  Unless required by applicable law or agreed to in writing, software
++  distributed under the License is distributed on an "AS IS" BASIS,
++  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++  See the License for the specific language governing permissions and
++  limitations under the License.
++-->
++
++<!--
++  @version $Id: inplace_edit_form.xml 393475 2006-04-12 14:48:00Z jbq $
++-->
++
++<fd:form xmlns:fd="http://apache.org/cocoon/forms/1.0#definition">
++  <fd:widgets>
++
++	<fd:field id="name">
++	  <fd:datatype base="string"/>
++	  <fd:hint>Your name</fd:hint>
++	</fd:field>
++
++	<fd:field id="occupation">
++	  <fd:initial-value>Cocoon user</fd:initial-value>
++	  <fd:datatype base="string"/>
++	  <fd:hint>Occupation</fd:hint>
++	</fd:field>
++
++	<fd:field id="comments">
++	  <fd:datatype base="string"/>
++	  <fd:hint>Comments</fd:hint>
++	</fd:field>
++	
++	<fd:action id="check">
++	  <fd:label>Check</fd:label>
++	  <fd:hint>Redisplays the page so you can see the various renderings of inplace inputs depending on their values.</fd:hint>
++	</fd:action>
++
++	<fd:submit id="ok">
++	  <fd:label>OK</fd:label>
++	</fd:submit>
++
++  </fd:widgets>
++</fd:form>
+\ No newline at end of file
+Index: src/blocks/forms/samples/forms/inplace_edit_template.xml
+===================================================================
+--- src/blocks/forms/samples/forms/inplace_edit_template.xml	(revision 0)
++++ src/blocks/forms/samples/forms/inplace_edit_template.xml	(revision 393475)
+@@ -0,0 +1,72 @@
++<?xml version="1.0"?>
++<!--
++  Copyright 1999-2004 The Apache Software Foundation
++
++  Licensed under the Apache License, Version 2.0 (the "License");
++  you may not use this file except in compliance with the License.
++  You may obtain a copy of the License at
++
++      http://www.apache.org/licenses/LICENSE-2.0
++
++  Unless required by applicable law or agreed to in writing, software
++  distributed under the License is distributed on an "AS IS" BASIS,
++  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++  See the License for the specific language governing permissions and
++  limitations under the License.
++-->
++<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
++      xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
++      xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
++
++  <!-- Import the macros that define CForms template elements -->
++  <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
++  <h4 class="samplesGroup">Inline editing</h4>
++  <title>Inline editing</title>
++  <script type="text/javascript">
++     //cocoon.ajax.BrowserUpdater.highlight = cocoon.ajax.Fader.fade;
++  </script>
++  <content>
++    <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" ajax="true">
++      <p>The fields below show the various features of in-place editing. "In place" means that inputs are rendered as normal text, and become editable once you click on them.
++	  </p>
++	  <table width="100%" border="1">
++		<tbody>
++		  <tr>
++			<td>
++		      Your name:<br/>
++		      <small>An inplace input with no initial value. The displayed text is
++			         the input's hint</small>
++			</td>
++			<td>
++			  <ft:widget id="name" fi:type="inplace"/>
++			</td>
++		  </tr>
++		  <tr>
++			<td>
++		      Your occupation:<br/>
++		      <small>An inplace input with an initial value.</small>
++			</td>
++			<td>
++			  <ft:widget id="occupation" fi:type="inplace"/>
++			</td>
++		  </tr>
++		  <tr>
++			<td>
++		      Comments:<br/>
++		      <small>An multiline inplace input.</small>
++			</td>
++			<td>
++			  <ft:widget id="comments" fi:type="inplace-area"/>
++			</td>
++		  </tr>
++		</tbody>
++	  </table>
++	  <br/>
++	  <ft:widget id="check"/>
++      <ft:widget id="ok"/>
++      <br/>
++      <a href="./do-inplace.flow">Restart this sample</a> -  <a href="./">Back to Forms samples</a>
++
++    </ft:form-template>
++  </content>
++</page>
diff --git a/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml b/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml
new file mode 100644
index 0000000..4ee4544
--- /dev/null
+++ b/www/cocoon/files/patch-src-blocks-forms-samples-welcome.xml
@@ -0,0 +1,17 @@
+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/files/pkg-deinstall b/www/cocoon/files/pkg-deinstall.in
index fcfbbb0..fcfbbb0 100644
--- a/www/cocoon/files/pkg-deinstall
+++ b/www/cocoon/files/pkg-deinstall.in
diff --git a/www/cocoon/files/pkg-install b/www/cocoon/files/pkg-install.in
index afd4a73..afd4a73 100644
--- a/www/cocoon/files/pkg-install
+++ b/www/cocoon/files/pkg-install.in
diff --git a/www/cocoon/pkg-message b/www/cocoon/files/pkg-message.in
index 9c639a6..9c639a6 100644
--- a/www/cocoon/pkg-message
+++ b/www/cocoon/files/pkg-message.in
diff --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index e6530e7..9b45edb 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -1,4 +1,4 @@
-sbin/cocoon.sh
+@comment $FreeBSD$
 sbin/cocoonctl
 etc/rc.d/cocoon.sh
 @dirrm cocoon/tools