ports/73427: Maintainer update: www/cocoon fix blocks dependencies

[Jean-Baptiste Quenot]

>Number:         73427
>Category:       ports
>Synopsis:       Maintainer update: www/cocoon fix blocks dependencies
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 02 18:20:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Baptiste Quenot
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Mar 26 17:43:44 CET 2004 jbq at anyware12.anyware:/usr/obj/usr/src/sys/ANYWARE12 i386
>Description:
This revision fixes blocks dependencies.
>How-To-Repeat:
Select the webdav block: compilation fails, as eventcache block is missing.
>Fix:
diff -ruN --exclude=.svn --exclude=admin --exclude=.*.swp --exclude=work --exclude=README.html /usr/ports/www/cocoon/Makefile ./Makefile
--- /usr/ports/www/cocoon/Makefile	Tue Aug 10 00:07:25 2004
+++ ./Makefile	Tue Nov  2 19:15:32 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	cocoon
 PORTVERSION=	2.1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
 DISTNAME=	${PDISTNAME}-src
diff -ruN --exclude=.svn --exclude=admin --exclude=.*.swp --exclude=work --exclude=README.html /usr/ports/www/cocoon/Makefile.test-options ./Makefile.test-options
--- /usr/ports/www/cocoon/Makefile.test-options	Mon Aug  9 16:19:38 2004
+++ ./Makefile.test-options	Tue Nov  2 18:28:22 2004
@@ -1,7 +1,7 @@
 .if defined(WITH_AUTHENTICATION_FW)
 BLOCKS+=	authentication-fw
 BLOCKS+=	session-fw
-WITH_SESSION_FW=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_BATIK)
@@ -15,25 +15,22 @@
 .if defined(WITH_CHAPERON)
 BLOCKS+=	chaperon
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_DATABASES)
 BLOCKS+=	databases
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_FOP)
 BLOCKS+=	fop
 BLOCKS+=	batik
-WITH_BATIK=	YES
 .endif
 
 .if defined(WITH_HSQLDB)
 BLOCKS+=	hsqldb
 BLOCKS+=	databases
-WITH_DATABASES=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_HTML)
@@ -55,7 +52,6 @@
 .if defined(WITH_LINKREWRITER)
 BLOCKS+=	linkrewriter
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_LUCENE)
@@ -81,9 +77,8 @@
 .if defined(WITH_PORTAL_FW)
 BLOCKS+=	portal-fw
 BLOCKS+=	authentication-fw
-WITH_AUTHENTICATION_FW=	YES
 BLOCKS+=	session-fw
-WITH_SESSION_FW=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_PROFILER)
@@ -93,13 +88,11 @@
 .if defined(WITH_PYTHON)
 BLOCKS+=	python
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_SESSION_FW)
 BLOCKS+=	session-fw
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_SWF)
@@ -117,7 +110,7 @@
 .if defined(WITH_XMLDB)
 BLOCKS+=	xmldb
 BLOCKS+=	databases
-WITH_DATABASES=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_XSP)
@@ -127,7 +120,7 @@
 .if defined(WITH_APPLES)
 BLOCKS+=	apples
 BLOCKS+=	forms
-WITH_FORMS=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_ASCIIART)
@@ -149,31 +142,27 @@
 .if defined(WITH_EVENTCACHE)
 BLOCKS+=	eventcache
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_FORMS)
 BLOCKS+=	forms
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_JAVAFLOW)
 BLOCKS+=	javaflow
+BLOCKS+=	databases
 BLOCKS+=	forms
-WITH_FORMS=	YES
 BLOCKS+=	ojb
-WITH_OJB=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_JMS)
 BLOCKS+=	jms
 BLOCKS+=	databases
-WITH_DATABASES=	YES
 BLOCKS+=	eventcache
-WITH_EVENTCACHE=	YES
 BLOCKS+=	hsqldb
-WITH_HSQLDB=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_LINOTYPE)
@@ -183,9 +172,11 @@
 .if defined(WITH_MAIL)
 BLOCKS+=	mail
 BLOCKS+=	asciiart
-WITH_ASCIIART=	YES
+BLOCKS+=	batik
+BLOCKS+=	cron
 BLOCKS+=	scratchpad
-WITH_SCRATCHPAD=	YES
+BLOCKS+=	velocity
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_MIDI)
@@ -195,31 +186,25 @@
 .if defined(WITH_OJB)
 BLOCKS+=	ojb
 BLOCKS+=	databases
-WITH_DATABASES=	YES
 BLOCKS+=	forms
-WITH_FORMS=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_PETSTORE)
 BLOCKS+=	petstore
 BLOCKS+=	databases
-WITH_DATABASES=	YES
 BLOCKS+=	forms
-WITH_FORMS=	YES
 BLOCKS+=	hsqldb
-WITH_HSQLDB=	YES
 BLOCKS+=	velocity
-WITH_VELOCITY=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_PORTAL)
 BLOCKS+=	portal
 BLOCKS+=	authentication-fw
-WITH_AUTHENTICATION_FW=	YES
 BLOCKS+=	html
-WITH_HTML=	YES
 BLOCKS+=	session-fw
-WITH_SESSION_FW=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_PROXY)
@@ -233,21 +218,16 @@
 .if defined(WITH_REPOSITORY)
 BLOCKS+=	repository
 BLOCKS+=	databases
-WITH_DATABASES=	YES
 BLOCKS+=	eventcache
-WITH_EVENTCACHE=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_SCRATCHPAD)
 BLOCKS+=	scratchpad
 BLOCKS+=	batik
-WITH_BATIK=	YES
 BLOCKS+=	cron
-WITH_CRON=	YES
 BLOCKS+=	velocity
-WITH_VELOCITY=	YES
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_SERIALIZERS)
@@ -256,10 +236,12 @@
 
 .if defined(WITH_SLIDE)
 BLOCKS+=	slide
+BLOCKS+=	databases
+BLOCKS+=	eventcache
+BLOCKS+=	hsqldb
 BLOCKS+=	jms
-WITH_JMS=	YES
 BLOCKS+=	repository
-WITH_REPOSITORY=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_SLOP)
@@ -277,22 +259,21 @@
 .if defined(WITH_TOUR)
 BLOCKS+=	tour
 BLOCKS+=	batik
-WITH_BATIK=	YES
 BLOCKS+=	fop
-WITH_FOP=	YES
 BLOCKS+=	forms
-WITH_FORMS=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_WEBDAV)
 BLOCKS+=	webdav
+BLOCKS+=	databases
+BLOCKS+=	eventcache
 BLOCKS+=	repository
-WITH_REPOSITORY=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_WOODY)
 BLOCKS+=	woody
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
>Release-Note:
>Audit-Trail:
>Unformatted: