Upgrade to 1.8.2.

PR:		ports/24710
Submitted by:	kunishi@c.oka-pu.ac.jp

8 files changed, 174 insertions, 58 deletions

diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index c195ec955aa6..dace16283c53 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION= 	1.8
+PORTVERSION= 	1.8.2
 CATEGORIES=	textproc www java
 MASTER_SITES=	http://xml.apache.org/cocoon/dist/
 DISTNAME=	Cocoon-${PORTVERSION}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 JDK_VERSION=	1.1.8
 CLASSPATH=	${LOCALBASE}/jdk${JDK_VERSION}/lib/classes.zip
-LIBS=		fop_0_13_0.jar xalan_1_2_D02.jar xerces_1_2.jar
+LIBS=		fop_0_15_0.jar xalan_1_2_D02.jar xerces_1_2.jar
 JDIR=		${PREFIX}/share/java/classes
 CDIR=		${PREFIX}/etc/apache/cocoon
 SDIR=		${PREFIX}/share/java/cocoon
diff --git a/textproc/cocoon/distinfo b/textproc/cocoon/distinfo
index b8a79445ff66..8aabb61e5f0f 100644
--- a/textproc/cocoon/distinfo
+++ b/textproc/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon-1.8.tar.gz) = 7fa79afbb60ab210752f34636c124dd1
+MD5 (Cocoon-1.8.2.tar.gz) = 86310bec24d5b6b35b6965410c19024c
diff --git a/textproc/cocoon/pkg-message b/textproc/cocoon/pkg-message
index d5b436f736d6..8c85ef885630 100644
--- a/textproc/cocoon/pkg-message
+++ b/textproc/cocoon/pkg-message
@@ -9,7 +9,7 @@ To activate Cocoon:
 	"wrapper.classpath=/usr/local/share/java/classes/cocoon.jar"
 	"wrapper.classpath=/usr/local/share/java/classes/xerces_1_2.jar"
 	"wrapper.classpath=/usr/local/share/java/classes/xalan_1_2_D02.jar"
-	"wrapper.classpath=/usr/local/share/java/classes/fop_0_13_0.jar"
+	"wrapper.classpath=/usr/local/share/java/classes/fop_0_15_0.jar"
 
 (3) Add following line into zone.properties.
 
diff --git a/textproc/cocoon/pkg-plist b/textproc/cocoon/pkg-plist
index 612f79f5d018..a380371af204 100644
--- a/textproc/cocoon/pkg-plist
+++ b/textproc/cocoon/pkg-plist
@@ -3,7 +3,7 @@ etc/apache/cocoon/cocoon.properties.default
 @exec [ ! -f %B/cocoon.properties ] && cp %B/%f %B/cocoon.properties
 @unexec rmdir %D/etc/apache/cocoon > /dev/null 2>&1 || true
 share/java/classes/cocoon.jar
-share/java/classes/fop_0_13_0.jar
+share/java/classes/fop_0_15_0.jar
 share/java/classes/xalan_1_2_D02.jar
 share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/LICENSE
@@ -33,6 +33,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/Predicate.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/DefaultDCPProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/ServletDCPProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-frame.html
@@ -56,9 +60,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/AbstractActor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Actor.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Cacheable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Changeable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurations.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/DestroyListener.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Director.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Factory.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/InitializationException.html
@@ -78,6 +84,13 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/InterpreterFactory.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/LanguageException.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Module.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptEvaluator.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInstance.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInterpreter.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptModule.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInstance.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInterpreter.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaModule.html
@@ -99,10 +112,12 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/AbstractParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/Parser.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/SunXMLParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/XercesParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/LinkEncodingProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/PINotFoundException.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/Processor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorException.html
@@ -196,6 +211,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/HttpServletResponseFacade.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/RedirectException.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/MemoryStore.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/Store.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-frame.html
@@ -203,9 +223,14 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/Transformer.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XalanTransformer.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XTTransformer.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/XMLFragment.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/XPathAPI.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-summary.html
@@ -216,13 +241,20 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/package-list
 %%PORTDOCS%%share/java/cocoon/docs/api/packages.html
 %%PORTDOCS%%share/java/cocoon/docs/api/serialized-form.html
+%%PORTDOCS%%share/java/cocoon/docs/caching.html
 %%PORTDOCS%%share/java/cocoon/docs/changes.html
 %%PORTDOCS%%share/java/cocoon/docs/cocoon2.html
 %%PORTDOCS%%share/java/cocoon/docs/connection-pool.html
+%%PORTDOCS%%share/java/cocoon/docs/contrib.html
 %%PORTDOCS%%share/java/cocoon/docs/dcp.html
 %%PORTDOCS%%share/java/cocoon/docs/dynamic.html
+%%PORTDOCS%%share/java/cocoon/docs/esql.html
 %%PORTDOCS%%share/java/cocoon/docs/faqs.html
 %%PORTDOCS%%share/java/cocoon/docs/fp.html
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-label-2.jpg
@@ -235,6 +267,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-label-2.jpg
@@ -243,18 +279,34 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-label-2.jpg
@@ -279,14 +331,6 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-header.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-header.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-label-2.jpg
@@ -303,6 +347,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-label-2.jpg
@@ -327,6 +375,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-label-2.jpg
@@ -347,17 +399,19 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/index.html
 %%PORTDOCS%%share/java/cocoon/docs/infrastructure.html
 %%PORTDOCS%%share/java/cocoon/docs/install.html
-%%PORTDOCS%%share/java/cocoon/docs/install-case-solaris.html
-%%PORTDOCS%%share/java/cocoon/docs/install-case-windows.html
 %%PORTDOCS%%share/java/cocoon/docs/ldap.html
 %%PORTDOCS%%share/java/cocoon/docs/license.html
 %%PORTDOCS%%share/java/cocoon/docs/livesites.html
+%%PORTDOCS%%share/java/cocoon/docs/mail-archives.html
 %%PORTDOCS%%share/java/cocoon/docs/mail-lists.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/caching.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/changes.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/cocoon2.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/connection-pool.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/contrib.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/dcp.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/dynamic.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/esql.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/faqs.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/fp.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/guide.html
@@ -375,12 +429,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/printer/images/update.jpg
 %%PORTDOCS%%share/java/cocoon/docs/printer/index.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/infrastructure.html
-%%PORTDOCS%%share/java/cocoon/docs/printer/install-case-solaris.html
-%%PORTDOCS%%share/java/cocoon/docs/printer/install-case-windows.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/install.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/ldap.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/license.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/livesites.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/mail-archives.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/mail-lists.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/resources/simple.css
 %%PORTDOCS%%share/java/cocoon/docs/printer/sql.html
@@ -388,6 +441,7 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/printer/technologies.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/todo.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/wd-xsp.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/xmlfragment.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/xsp.html
 %%PORTDOCS%%share/java/cocoon/docs/resources/bar-border-bottom.gif
 %%PORTDOCS%%share/java/cocoon/docs/resources/bar-border-left.gif
@@ -419,12 +473,15 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/technologies.html
 %%PORTDOCS%%share/java/cocoon/docs/todo.html
 %%PORTDOCS%%share/java/cocoon/docs/wd-xsp.html
+%%PORTDOCS%%share/java/cocoon/docs/xmlfragment.html
 %%PORTDOCS%%share/java/cocoon/docs/xsp.html
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/collections
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/dcp
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/example
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/framework
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/logger
@@ -443,6 +500,7 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/producer
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/response
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/store
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/transformer
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/xml/util
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index c195ec955aa6..dace16283c53 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cocoon
-PORTVERSION= 	1.8
+PORTVERSION= 	1.8.2
 CATEGORIES=	textproc www java
 MASTER_SITES=	http://xml.apache.org/cocoon/dist/
 DISTNAME=	Cocoon-${PORTVERSION}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 JDK_VERSION=	1.1.8
 CLASSPATH=	${LOCALBASE}/jdk${JDK_VERSION}/lib/classes.zip
-LIBS=		fop_0_13_0.jar xalan_1_2_D02.jar xerces_1_2.jar
+LIBS=		fop_0_15_0.jar xalan_1_2_D02.jar xerces_1_2.jar
 JDIR=		${PREFIX}/share/java/classes
 CDIR=		${PREFIX}/etc/apache/cocoon
 SDIR=		${PREFIX}/share/java/cocoon
diff --git a/www/cocoon/distinfo b/www/cocoon/distinfo
index b8a79445ff66..8aabb61e5f0f 100644
--- a/www/cocoon/distinfo
+++ b/www/cocoon/distinfo
@@ -1 +1 @@
-MD5 (Cocoon-1.8.tar.gz) = 7fa79afbb60ab210752f34636c124dd1
+MD5 (Cocoon-1.8.2.tar.gz) = 86310bec24d5b6b35b6965410c19024c
diff --git a/www/cocoon/pkg-message b/www/cocoon/pkg-message
index d5b436f736d6..8c85ef885630 100644
--- a/www/cocoon/pkg-message
+++ b/www/cocoon/pkg-message
@@ -9,7 +9,7 @@ To activate Cocoon:
 	"wrapper.classpath=/usr/local/share/java/classes/cocoon.jar"
 	"wrapper.classpath=/usr/local/share/java/classes/xerces_1_2.jar"
 	"wrapper.classpath=/usr/local/share/java/classes/xalan_1_2_D02.jar"
-	"wrapper.classpath=/usr/local/share/java/classes/fop_0_13_0.jar"
+	"wrapper.classpath=/usr/local/share/java/classes/fop_0_15_0.jar"
 
 (3) Add following line into zone.properties.
 
diff --git a/www/cocoon/pkg-plist b/www/cocoon/pkg-plist
index 612f79f5d018..a380371af204 100644
--- a/www/cocoon/pkg-plist
+++ b/www/cocoon/pkg-plist
@@ -3,7 +3,7 @@ etc/apache/cocoon/cocoon.properties.default
 @exec [ ! -f %B/cocoon.properties ] && cp %B/%f %B/cocoon.properties
 @unexec rmdir %D/etc/apache/cocoon > /dev/null 2>&1 || true
 share/java/classes/cocoon.jar
-share/java/classes/fop_0_13_0.jar
+share/java/classes/fop_0_15_0.jar
 share/java/classes/xalan_1_2_D02.jar
 share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/LICENSE
@@ -33,6 +33,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/cache/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/Predicate.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/collections/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/DefaultDCPProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/ServletDCPProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/dcp/package-frame.html
@@ -56,9 +60,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/formatter/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/AbstractActor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Actor.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Cacheable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Changeable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurable.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Configurations.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/DestroyListener.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Director.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/Factory.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/framework/InitializationException.html
@@ -78,6 +84,13 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/InterpreterFactory.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/LanguageException.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/Module.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptEvaluator.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInstance.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptInterpreter.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/EcmaScriptModule.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInstance.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaInterpreter.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java/JavaModule.html
@@ -99,10 +112,12 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/AbstractParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/Parser.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/SunXMLParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/XercesParser.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/parser/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/LinkEncodingProcessor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/PINotFoundException.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/Processor.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/processor/ProcessorException.html
@@ -196,6 +211,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/producer/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/HttpServletResponseFacade.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/RedirectException.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/response/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/MemoryStore.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/Store.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-frame.html
@@ -203,9 +223,14 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/store/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/Transformer.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XalanTransformer.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/XTTransformer.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-summary.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/transformer/package-tree.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/XMLFragment.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-frame.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-summary.html
+%%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/package-tree.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/XPathAPI.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-frame.html
 %%PORTDOCS%%share/java/cocoon/docs/api/org/apache/cocoon/xml/util/package-summary.html
@@ -216,13 +241,20 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/api/package-list
 %%PORTDOCS%%share/java/cocoon/docs/api/packages.html
 %%PORTDOCS%%share/java/cocoon/docs/api/serialized-form.html
+%%PORTDOCS%%share/java/cocoon/docs/caching.html
 %%PORTDOCS%%share/java/cocoon/docs/changes.html
 %%PORTDOCS%%share/java/cocoon/docs/cocoon2.html
 %%PORTDOCS%%share/java/cocoon/docs/connection-pool.html
+%%PORTDOCS%%share/java/cocoon/docs/contrib.html
 %%PORTDOCS%%share/java/cocoon/docs/dcp.html
 %%PORTDOCS%%share/java/cocoon/docs/dynamic.html
+%%PORTDOCS%%share/java/cocoon/docs/esql.html
 %%PORTDOCS%%share/java/cocoon/docs/faqs.html
 %%PORTDOCS%%share/java/cocoon/docs/fp.html
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/caching-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/changes-label-2.jpg
@@ -235,6 +267,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/connection-pool-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/contrib-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dcp-label-2.jpg
@@ -243,18 +279,34 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/dynamic-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-48-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-68-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-70-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-74-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/esql-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-26-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-56-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-58-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-62-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-80-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-84-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-88-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/ext-86-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/faqs-label-2.jpg
@@ -279,14 +331,6 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/infrastructure-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-header.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-solaris-label-3.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-header.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-1.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-2.jpg
-%%PORTDOCS%%share/java/cocoon/docs/graphics/install-case-windows-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/install-label-2.jpg
@@ -303,6 +347,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/livesites-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/mail-archives-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/mail-lists-label-2.jpg
@@ -327,6 +375,10 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-2.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/wd-xsp-label-3.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-header.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-1.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-2.jpg
+%%PORTDOCS%%share/java/cocoon/docs/graphics/xmlfragment-label-3.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-header.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-label-1.jpg
 %%PORTDOCS%%share/java/cocoon/docs/graphics/xsp-label-2.jpg
@@ -347,17 +399,19 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/index.html
 %%PORTDOCS%%share/java/cocoon/docs/infrastructure.html
 %%PORTDOCS%%share/java/cocoon/docs/install.html
-%%PORTDOCS%%share/java/cocoon/docs/install-case-solaris.html
-%%PORTDOCS%%share/java/cocoon/docs/install-case-windows.html
 %%PORTDOCS%%share/java/cocoon/docs/ldap.html
 %%PORTDOCS%%share/java/cocoon/docs/license.html
 %%PORTDOCS%%share/java/cocoon/docs/livesites.html
+%%PORTDOCS%%share/java/cocoon/docs/mail-archives.html
 %%PORTDOCS%%share/java/cocoon/docs/mail-lists.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/caching.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/changes.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/cocoon2.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/connection-pool.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/contrib.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/dcp.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/dynamic.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/esql.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/faqs.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/fp.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/guide.html
@@ -375,12 +429,11 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/printer/images/update.jpg
 %%PORTDOCS%%share/java/cocoon/docs/printer/index.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/infrastructure.html
-%%PORTDOCS%%share/java/cocoon/docs/printer/install-case-solaris.html
-%%PORTDOCS%%share/java/cocoon/docs/printer/install-case-windows.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/install.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/ldap.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/license.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/livesites.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/mail-archives.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/mail-lists.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/resources/simple.css
 %%PORTDOCS%%share/java/cocoon/docs/printer/sql.html
@@ -388,6 +441,7 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/printer/technologies.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/todo.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/wd-xsp.html
+%%PORTDOCS%%share/java/cocoon/docs/printer/xmlfragment.html
 %%PORTDOCS%%share/java/cocoon/docs/printer/xsp.html
 %%PORTDOCS%%share/java/cocoon/docs/resources/bar-border-bottom.gif
 %%PORTDOCS%%share/java/cocoon/docs/resources/bar-border-left.gif
@@ -419,12 +473,15 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%share/java/cocoon/docs/technologies.html
 %%PORTDOCS%%share/java/cocoon/docs/todo.html
 %%PORTDOCS%%share/java/cocoon/docs/wd-xsp.html
+%%PORTDOCS%%share/java/cocoon/docs/xmlfragment.html
 %%PORTDOCS%%share/java/cocoon/docs/xsp.html
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/cache
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/collections
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/dcp
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/example
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/formatter
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/framework
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/ecmascript
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter/java
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/interpreter
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/logger
@@ -443,6 +500,7 @@ share/java/classes/xerces_1_2.jar
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor/xsp
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/processor
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/producer
+%%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/response
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/store
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/transformer
 %%PORTDOCS%%@dirrm share/java/cocoon/docs/api/org/apache/cocoon/xml/util