* Handle recursive dependencies when dealing with blocks selected by the user.

* Handle deprecated blocks.
* Select all non-deprecated blocks by default.

PR:		ports/69944
Submitted by:	Jean-Baptiste Quenot (maintainer)

3 files changed, 105 insertions, 55 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 473c1ed08c8d..f05f7ae7de3d 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cocoon
 PORTVERSION=	2.1.5.1
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
 DISTNAME=	${PDISTNAME}-src
@@ -66,12 +67,12 @@ SUBSTITUTIONS=	\
 .include "${MASTERDIR}/Makefile.test-options"
 
 .for BLOCK in ${BLOCKS}
-BLOCKSEXP+=	-e 's/^include.block.${BLOCK}/\#include.block.${BLOCK}/'
+BLOCKSEXP+=	-e 's/^include.block.${BLOCK}=.*$$/include.block.${BLOCK}=true/'
 .endfor
 
 post-patch:
 	@${ECHO_MSG} "===> Configuring blocks: ${BLOCKS}"
-	${SED} -e 's/^#include.block/include.block/' < ${WRKSRC}/blocks.properties | \
+	${SED} -e 's/.*include.block\(.*\)=.*$$/include.block\1=false/' < ${WRKSRC}/blocks.properties | \
 	${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties
 .if (! defined(WITH_DOCS))
 	${SED} -e 's/^#exclude/exclude/' < ${WRKSRC}/build.properties \
diff --git a/www/cocoon/Makefile.options b/www/cocoon/Makefile.options
index 1b84a4effba1..4ad158d4fa71 100644
--- a/www/cocoon/Makefile.options
+++ b/www/cocoon/Makefile.options
@@ -1,56 +1,57 @@
 # ex:ts=22
 #
-OPTIONS+=	DOCS	'Include the documentation and samples'	off
+OPTIONS+=	DOCS	'Include the documentation and samples'	on
 
-OPTIONS+=	AUTHENTICATION_FW	'Enable the authentication-fw block'	off
-OPTIONS+=	BATIK	'Enable the Batik block'	off
-OPTIONS+=	BSF	'Enable the bsf block'	off
-OPTIONS+=	CHAPERON	'Enable the chaperon block'	off
-OPTIONS+=	DATABASES	'Enable the databases block'	off
-OPTIONS+=	FOP	'Enable the FOP Block (implies BATIK)'	off
-OPTIONS+=	HSQLDB	'Enable the hsqldb block'	off
-OPTIONS+=	HTML	'Enable the html block'	off
-OPTIONS+=	ITEXT	'Enable the itext block'	off
-OPTIONS+=	JFOR	'Enable the JFOR Block'	off
-OPTIONS+=	JSP	'Enable the jsp block'	off
-OPTIONS+=	LINKREWRITER	'Enable the linkrewriter block'	off
-OPTIONS+=	LUCENE	'Enable the lucene block'	off
-OPTIONS+=	NAMING	'Enable the naming block'	off
-OPTIONS+=	PARANOID	'Enable the Paranoid Cocoon Servlet'	off
-OPTIONS+=	PHP	'Enable the php block'	off
-OPTIONS+=	POI	'Enable the poi block'	off
-OPTIONS+=	PORTAL_FW	'Enable the portal-fw block'	off
-OPTIONS+=	PROFILER	'Enable the profiler block'	off
-OPTIONS+=	PYTHON	'Enable the python block'	off
-OPTIONS+=	SESSION_FW	'Enable the session-fw block'	off
-OPTIONS+=	SWF	'Enable the swf block'	off
-OPTIONS+=	VELOCITY	'Enable the velocity block'	off
-OPTIONS+=	WEB3	'Enable the web3 block'	off
-OPTIONS+=	XMLDB	'Enable the xmldb block'	off
-OPTIONS+=	XSP	'Enable the xsp block'	off
-OPTIONS+=	APPLES	'Enable the apples block'	off
-OPTIONS+=	ASCIIART	'Enable the asciiart block'	off
-OPTIONS+=	AXIS	'Enable the axis block'	off
-OPTIONS+=	CRON	'Enable the cron block'	off
-OPTIONS+=	DELI	'Enable the deli block'	off
-OPTIONS+=	EVENTCACHE	'Enable the eventcache block'	off
-OPTIONS+=	FORMS	'Enable the forms block'	off
-OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	off
-OPTIONS+=	JMS	'Enable the jms block'	off
-OPTIONS+=	LINOTYPE	'Enable the linotype block'	off
-OPTIONS+=	MAIL	'Enable the mail block'	off
-OPTIONS+=	MIDI	'Enable the midi block'	off
-OPTIONS+=	OJB	'Enable the ojb block'	off
-OPTIONS+=	PETSTORE	'Enable the petstore block'	off
-OPTIONS+=	PORTAL	'Enable the portal block'	off
-OPTIONS+=	PROXY	'Enable the proxy block'	off
-OPTIONS+=	QDOX	'Enable the qdox block'	off
-OPTIONS+=	REPOSITORY	'Enable the repository block'	off
-OPTIONS+=	SCRATCHPAD	'Enable the scratchpad block'	off
-OPTIONS+=	SERIALIZERS	'Enable the serializers block'	off
-OPTIONS+=	SLIDE	'Enable the slide block'	off
-OPTIONS+=	SLOP	'Enable the slop block'	off
-OPTIONS+=	STX	'Enable the stx block'	off
-OPTIONS+=	TAGLIB	'Enable the taglib block'	off
-OPTIONS+=	TOUR	'Enable the tour block'	off
-OPTIONS+=	WEBDAV	'Enable the webdav block'	off
+OPTIONS+=	AUTHENTICATION_FW	'Enable the authentication-fw block'	on
+OPTIONS+=	BATIK	'Enable the Batik block'	on
+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 (implies BATIK)'	on
+OPTIONS+=	HSQLDB	'Enable the hsqldb block'	on
+OPTIONS+=	HTML	'Enable the html block'	on
+OPTIONS+=	ITEXT	'Enable the itext block'	on
+OPTIONS+=	JFOR	'Enable the JFOR Block'	on
+OPTIONS+=	JSP	'Enable the jsp block'	on
+OPTIONS+=	LINKREWRITER	'Enable the linkrewriter block'	on
+OPTIONS+=	LUCENE	'Enable the lucene block'	on
+OPTIONS+=	NAMING	'Enable the naming block'	on
+OPTIONS+=	PARANOID	'Enable the Paranoid Cocoon Servlet'	on
+OPTIONS+=	PHP	'Enable the php block'	on
+OPTIONS+=	POI	'Enable the poi block'	on
+OPTIONS+=	PORTAL_FW	'Enable the portal-fw 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
+OPTIONS+=	SWF	'Enable the swf block'	on
+OPTIONS+=	VELOCITY	'Enable the velocity block'	on
+OPTIONS+=	WEB3	'Enable the web3 block'	on
+OPTIONS+=	XMLDB	'Enable the xmldb block'	on
+OPTIONS+=	XSP	'Enable the xsp block'	on
+OPTIONS+=	APPLES	'Enable the apples block'	on
+OPTIONS+=	ASCIIART	'Enable the asciiart block'	on
+OPTIONS+=	AXIS	'Enable the axis block'	on
+OPTIONS+=	CRON	'Enable the cron block'	on
+OPTIONS+=	DELI	'Enable the deli block'	on
+OPTIONS+=	EVENTCACHE	'Enable the eventcache block'	on
+OPTIONS+=	FORMS	'Enable the forms block'	on
+OPTIONS+=	JAVAFLOW	'Enable the javaflow block'	on
+OPTIONS+=	JMS	'Enable the jms block'	on
+OPTIONS+=	LINOTYPE	'Enable the linotype block'	on
+OPTIONS+=	MAIL	'Enable the mail block'	on
+OPTIONS+=	MIDI	'Enable the midi block'	on
+OPTIONS+=	OJB	'Enable the ojb block'	on
+OPTIONS+=	PETSTORE	'Enable the petstore block'	on
+OPTIONS+=	PORTAL	'Enable the portal block'	on
+OPTIONS+=	PROXY	'Enable the proxy block'	on
+OPTIONS+=	QDOX	'Enable the qdox block'	on
+OPTIONS+=	REPOSITORY	'Enable the repository block'	on
+OPTIONS+=	SCRATCHPAD	'Enable the scratchpad block'	on
+OPTIONS+=	SERIALIZERS	'Enable the serializers block'	on
+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+=	TOUR	'Enable the tour block'	on
+OPTIONS+=	WEBDAV	'Enable the webdav block'	on
+OPTIONS+=	WOODY	'Enable the woody block'	off
diff --git a/www/cocoon/Makefile.test-options b/www/cocoon/Makefile.test-options
index 0df6408d0f16..e5c1994465a7 100644
--- a/www/cocoon/Makefile.test-options
+++ b/www/cocoon/Makefile.test-options
@@ -1,6 +1,7 @@
 .if defined(WITH_AUTHENTICATION_FW)
 BLOCKS+=	authentication-fw
 BLOCKS+=	session-fw
+WITH_SESSION_FW=	YES
 .endif
 
 .if defined(WITH_BATIK)
@@ -14,21 +15,25 @@ BLOCKS+=	bsf
 .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
 .endif
 
 .if defined(WITH_HTML)
@@ -50,6 +55,7 @@ BLOCKS+=	jsp
 .if defined(WITH_LINKREWRITER)
 BLOCKS+=	linkrewriter
 BLOCKS+=	xsp
+WITH_XSP=	YES
 .endif
 
 .if defined(WITH_LUCENE)
@@ -75,7 +81,9 @@ BLOCKS+=	poi
 .if defined(WITH_PORTAL_FW)
 BLOCKS+=	portal-fw
 BLOCKS+=	authentication-fw
+WITH_AUTHENTICATION_FW=	YES
 BLOCKS+=	session-fw
+WITH_SESSION_FW=	YES
 .endif
 
 .if defined(WITH_PROFILER)
@@ -85,11 +93,13 @@ BLOCKS+=	profiler
 .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)
@@ -107,6 +117,7 @@ BLOCKS+=	web3
 .if defined(WITH_XMLDB)
 BLOCKS+=	xmldb
 BLOCKS+=	databases
+WITH_DATABASES=	YES
 .endif
 
 .if defined(WITH_XSP)
@@ -116,6 +127,7 @@ BLOCKS+=	xsp
 .if defined(WITH_APPLES)
 BLOCKS+=	apples
 BLOCKS+=	forms
+WITH_FORMS=	YES
 .endif
 
 .if defined(WITH_ASCIIART)
@@ -137,24 +149,31 @@ BLOCKS+=	deli
 .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+=	forms
+WITH_FORMS=	YES
 BLOCKS+=	ojb
+WITH_OJB=	YES
 .endif
 
 .if defined(WITH_JMS)
 BLOCKS+=	jms
 BLOCKS+=	databases
+WITH_DATABASES=	YES
 BLOCKS+=	eventcache
+WITH_EVENTCACHE=	YES
 BLOCKS+=	hsqldb
+WITH_HSQLDB=	YES
 .endif
 
 .if defined(WITH_LINOTYPE)
@@ -164,7 +183,9 @@ BLOCKS+=	linotype
 .if defined(WITH_MAIL)
 BLOCKS+=	mail
 BLOCKS+=	asciiart
+WITH_ASCIIART=	YES
 BLOCKS+=	scratchpad
+WITH_SCRATCHPAD=	YES
 .endif
 
 .if defined(WITH_MIDI)
@@ -174,22 +195,31 @@ BLOCKS+=	midi
 .if defined(WITH_OJB)
 BLOCKS+=	ojb
 BLOCKS+=	databases
+WITH_DATABASES=	YES
 BLOCKS+=	forms
+WITH_FORMS=	YES
 .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
 .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
 .endif
 
 .if defined(WITH_PROXY)
@@ -203,15 +233,21 @@ BLOCKS+=	qdox
 .if defined(WITH_REPOSITORY)
 BLOCKS+=	repository
 BLOCKS+=	databases
+WITH_DATABASES=	YES
 BLOCKS+=	eventcache
+WITH_EVENTCACHE=	YES
 .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)
@@ -221,7 +257,9 @@ BLOCKS+=	serializers
 .if defined(WITH_SLIDE)
 BLOCKS+=	slide
 BLOCKS+=	jms
+WITH_JMS=	YES
 BLOCKS+=	repository
+WITH_REPOSITORY=	YES
 .endif
 
 .if defined(WITH_SLOP)
@@ -239,12 +277,22 @@ BLOCKS+=	taglib
 .if defined(WITH_TOUR)
 BLOCKS+=	tour
 BLOCKS+=	batik
+WITH_BATIK=	YES
 BLOCKS+=	fop
+WITH_FOP=	YES
 BLOCKS+=	forms
+WITH_FORMS=	YES
 .endif
 
 .if defined(WITH_WEBDAV)
 BLOCKS+=	webdav
 BLOCKS+=	repository
+WITH_REPOSITORY=	YES
+.endif
+
+.if defined(WITH_WOODY)
+BLOCKS+=	woody
+BLOCKS+=	xsp
+WITH_XSP=	YES
 .endif