Update cocoon to version 1.8.

This cocoon version supports the latest Xerces and Xalan versions, and the next-to-latest
FOP version, so I have imported these.

Changes since cocoon-1.7.4:

Cleaned up docs, especially how-it-works and FAQ; added new questions
and answers to FAQ.

Changed XSPPage to only clone nodes where necessary, enhancing performance
for complex pages.

Changed <xsp:pi> back to use target= instead of name= in order
not to break existing users' code (which there is a lot of!).
Changed XSP docs to reflect correct usage.

Added very primitive profiler (see cocoon.properties)

Fixed some synchronization errors in Engine. You can now call a Cocoon
page from a Cocoon page, if you really want (this is inefficient and a
bad architecture, but it's possible.)

Made response taglib work on Servlet API 2.0 engines

Added xspdoc comments to esql logicsheet and added xspdoc to document convertor in the xml.apache.org site skin directory. god only knows how i'm supposed to add
it to the build procedure... help

Added error handling to esql logicsheet and documented its use in esql sample.

Added esql logicsheet

Added installation instructions for iPlanet.

Added namespace preservation to Java code-generation taglib

Added java compiler abstraction for XSP compilation (now we can use Jikes to improve XSP compilation speed).

Implemented blocking in Engine to make Cocoon run better under heavy load.

Made XSP SQL processor do array to string conversion when using a Format object on a text column

Brought XInclude processor into conformance (mostly) with the 2000-07-17 version of the working draft.

Included FP form-handling taglib for XSP.

Updated Cocoon installation case document.

Removed normalize-space from sql logicsheet's get-nested-string template

Changed turbine libraries to just include connection pool stuff, added connection pool docs

Added connection pool (and turbine) to sql logicsheet

Added support for site-absolute links in xinclude processor

Patched sql processor documentation to be fully up to date! Hoorah!

Added connection cache to sql processor

Disabled "created by cocoon" comment for HTTP HEAD requests.

Added HTTP method to Utils.encode so HEAD and GET are distinguishable

XIncludeProcessor now strips document type nodes from included documents

Added new installation case that should provide insights for newbies.

Added printer friendly skin so the documentation can now be generated to
be printer friendly when needed. (stylesheets are pretty crappy right now, but hopefully
some nice guy will improve them)

1 files changed, 16 insertions, 12 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 62ad499fbdb..97bc5a4a9fa 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2000/06/22 14:23:24 jwise Exp $
-#
-# Note: we currently use the pre-built (-bin) distribution of Xerces-J,
-# because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
-# required to build it.
+# $NetBSD: Makefile,v 1.4 2000/10/19 23:23:34 jwise Exp $
 
-DISTNAME=	Cocoon-1.7.4
-PKGNAME=	cocoon-1.7.4
+DISTNAME=	Cocoon-1.8
+PKGNAME=	cocoon-1.8
 CATEGORIES=	www
 MASTER_SITES=	http://xml.apache.org/dist/cocoon/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://xml.apache.org/cocoon/
 
-DEPENDS+=	xalan-j-*:../../textproc/xalan-j
-DEPENDS+=	fop-*:../../textproc/fop
+# These are exact version requirements intentionally, and will need to remain
+# so until the interfaces stabilize more.  Until then, new versions of these
+# libraries will be tested heavily with cocoon, and if not usable will be
+# imported as -current packages.
+DEPENDS+=	xalan-j-1.2:../../textproc/xalan-j
+DEPENDS+=	fop-0.13.0:../../textproc/fop
 DEPENDS+=	jakarta-tomcat-*:../../www/jakarta-tomcat
 
 # In addition to the above requirements, cocoon will build in support for the
@@ -34,8 +34,9 @@ USE_JAVA=	yes
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-extract:
-	${RM} ${WRKSRC}/lib/fop_0_12_1.jar ${WRKSRC}/lib/servlet_2_2.jar \
-		${WRKSRC}/lib/xalan_1_0_1.jar ${WRKSRC}/lib/xerces_1_0_3.jar
+	${RM} ${WRKSRC}/lib/fop_0_13_0.jar ${WRKSRC}/lib/servlet_2_2.jar \
+		${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \
+		${WRKSRC}/lib/bsf.jar ${WRKSRC}/lib/bsfengines.jar
 	${SED} -e s,@PREFIX@,${PREFIX},g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 # Yes -- you have to run build.sh _twice_.  The first time triggers a bug in JDK-1.1 javac,
@@ -50,8 +51,11 @@ do-build:
 	-(cd ${WRKSRC} && ${SH} build.sh)
 	cd ${WRKSRC} && ${SH} build.sh
 
+# For now, we install the turbine-pool.jar which ships with cocoon.  When there is an actual
+# release of Turbine, we will have a package for it, which cocoon will depend on.
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/cocoon.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/lib/turbine-pool.jar ${PREFIX}/lib/java
 	${MKDIR} ${PREFIX}/share/doc/java/cocoon
 	cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/cocoon ; ${GTAR} pvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/cocoon
@@ -63,4 +67,4 @@ do-install:
 
 .include "../../mk/bsd.pkg.mk"
 
-CLASSPATH:=${CLASSPATH}:${LOCALBASE}/lib/java/fop.jar:${LOCALBASE}/lib/java/xalan.jar:${LOCALBASE}/lib/java/xerces.jar:${LOCALBASE}/jakarta/tomcat/lib/servlet.jar
+CLASSPATH:=${CLASSPATH}:${LOCALBASE}/lib/java/fop.jar:${LOCALBASE}/lib/java/xalan.jar:${LOCALBASE}/lib/java/bsf.jar:${LOCALBASE}/lib/java/xerces.jar:${LOCALBASE}/jakarta/tomcat/lib/servlet.jar