- Fix block dependencies issue [1]

- Use MASTER_SITE_SUBDIR

PR:		73427 [1]
Submitted by:	maintainer [1]

2 files changed, 27 insertions, 45 deletions

diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index f05f7ae7de3d..c62e865bde66 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	cocoon
 PORTVERSION=	2.1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PDISTNAME}-src
 
 MAINTAINER=	jb.quenot@caraldi.com
diff --git a/www/cocoon/Makefile.test-options b/www/cocoon/Makefile.test-options
index e5c1994465a7..a3b70bd4b9ca 100644
--- a/www/cocoon/Makefile.test-options
+++ b/www/cocoon/Makefile.test-options
@@ -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 @@ 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
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_HTML)
@@ -55,7 +52,6 @@ BLOCKS+=	jsp
 .if defined(WITH_LINKREWRITER)
 BLOCKS+=	linkrewriter
 BLOCKS+=	xsp
-WITH_XSP=	YES
 .endif
 
 .if defined(WITH_LUCENE)
@@ -81,9 +77,8 @@ BLOCKS+=	poi
 .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 @@ 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)
@@ -117,7 +110,7 @@ BLOCKS+=	web3
 .if defined(WITH_XMLDB)
 BLOCKS+=	xmldb
 BLOCKS+=	databases
-WITH_DATABASES=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_XSP)
@@ -127,7 +120,7 @@ BLOCKS+=	xsp
 .if defined(WITH_APPLES)
 BLOCKS+=	apples
 BLOCKS+=	forms
-WITH_FORMS=	YES
+BLOCKS+=	xsp
 .endif
 
 .if defined(WITH_ASCIIART)
@@ -149,31 +142,27 @@ 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+=	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 @@ BLOCKS+=	linotype
 .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 @@ BLOCKS+=	midi
 .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 @@ BLOCKS+=	qdox
 .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 @@ BLOCKS+=	serializers
 
 .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 @@ BLOCKS+=	taglib
 .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