Attachment #45354 for bug #69944

View | Details | Raw Unified | Return to bug 69944
Collapse All | Expand All





PORTNAME=	cocoon
PORTVERSION=	2.1.5.1
PORTREVISION=	1
CATEGORIES=	www java
MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
DISTNAME=	${PDISTNAME}-src

.include "${MASTERDIR}/Makefile.test-options"

.for BLOCK in ${BLOCKS}
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\1=false/' < ${WRKSRC}/blocks.properties | \
	${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties
.if (! defined(WITH_DOCS))
	${SED} -e 's/^#exclude/exclude/' < ${WRKSRC}/build.properties \




# ex:ts=22
#
OPTIONS+=	DOCS	'Include the documentation and samples'	on

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




.if defined(WITH_AUTHENTICATION_FW)
BLOCKS+=	authentication-fw
BLOCKS+=	session-fw
WITH_SESSION_FW=	YES
.endif

.if defined(WITH_BATIK)

.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)

.if defined(WITH_LINKREWRITER)
BLOCKS+=	linkrewriter
BLOCKS+=	xsp
WITH_XSP=	YES
.endif

.if defined(WITH_LUCENE)

.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)

.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)

.if defined(WITH_XMLDB)
BLOCKS+=	xmldb
BLOCKS+=	databases
WITH_DATABASES=	YES
.endif

.if defined(WITH_XSP)

.if defined(WITH_APPLES)
BLOCKS+=	apples
BLOCKS+=	forms
WITH_FORMS=	YES
.endif

.if defined(WITH_ASCIIART)

.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)

.if defined(WITH_MAIL)
BLOCKS+=	mail
BLOCKS+=	asciiart
WITH_ASCIIART=	YES
BLOCKS+=	scratchpad
WITH_SCRATCHPAD=	YES
.endif

.if defined(WITH_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)

.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)

.if defined(WITH_SLIDE)
BLOCKS+=	slide
BLOCKS+=	jms
WITH_JMS=	YES
BLOCKS+=	repository
WITH_REPOSITORY=	YES
.endif

.if defined(WITH_SLOP)

.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

Return to bug 69944

Lines 7-12 Link Here

(-)cocoon/Makefile (-2 / +3 lines)
7		7
8	PORTNAME= cocoon	8	PORTNAME= cocoon
9	PORTVERSION= 2.1.5.1	9	PORTVERSION= 2.1.5.1
		10	PORTREVISION= 1
10	CATEGORIES= www java	11	CATEGORIES= www java
11	MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}	12	MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
12	DISTNAME= ${PDISTNAME}-src	13	DISTNAME= ${PDISTNAME}-src
Lines 66-77 Link Here
66	.include "${MASTERDIR}/Makefile.test-options"	67	.include "${MASTERDIR}/Makefile.test-options"
67		68
68	.for BLOCK in ${BLOCKS}	69	.for BLOCK in ${BLOCKS}
69	BLOCKSEXP+= -e 's/^include.block.${BLOCK}/\#include.block.${BLOCK}/'	70	BLOCKSEXP+= -e 's/^include.block.${BLOCK}=.*$$/include.block.${BLOCK}=true/'
70	.endfor	71	.endfor
71		72
72	post-patch:	73	post-patch:
73	@${ECHO_MSG} "===> Configuring blocks: ${BLOCKS}"	74	@${ECHO_MSG} "===> Configuring blocks: ${BLOCKS}"
74	${SED} -e 's/^#include.block/include.block/' < ${WRKSRC}/blocks.properties \| \	75	${SED} -e 's/.include.block\(.\)=.*$$/include.block\1=false/' < ${WRKSRC}/blocks.properties \| \
75	${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties	76	${SED} ${BLOCKSEXP} > ${WRKSRC}/local.blocks.properties
76	.if (! defined(WITH_DOCS))	77	.if (! defined(WITH_DOCS))
77	${SED} -e 's/^#exclude/exclude/' < ${WRKSRC}/build.properties \	78	${SED} -e 's/^#exclude/exclude/' < ${WRKSRC}/build.properties \

Lines 1-56 Link Here

(-)cocoon/Makefile.options (-53 / +54 lines)
1	# ex:ts=22	1	# ex:ts=22
2	#	2	#
3	OPTIONS+= DOCS 'Include the documentation and samples' off	3	OPTIONS+= DOCS 'Include the documentation and samples' on
4		4
5	OPTIONS+= AUTHENTICATION_FW 'Enable the authentication-fw block' off	5	OPTIONS+= AUTHENTICATION_FW 'Enable the authentication-fw block' on
6	OPTIONS+= BATIK 'Enable the Batik block' off	6	OPTIONS+= BATIK 'Enable the Batik block' on
7	OPTIONS+= BSF 'Enable the bsf block' off	7	OPTIONS+= BSF 'Enable the bsf block' on
8	OPTIONS+= CHAPERON 'Enable the chaperon block' off	8	OPTIONS+= CHAPERON 'Enable the chaperon block' on
9	OPTIONS+= DATABASES 'Enable the databases block' off	9	OPTIONS+= DATABASES 'Enable the databases block' on
10	OPTIONS+= FOP 'Enable the FOP Block (implies BATIK)' off	10	OPTIONS+= FOP 'Enable the FOP Block (implies BATIK)' on
11	OPTIONS+= HSQLDB 'Enable the hsqldb block' off	11	OPTIONS+= HSQLDB 'Enable the hsqldb block' on
12	OPTIONS+= HTML 'Enable the html block' off	12	OPTIONS+= HTML 'Enable the html block' on
13	OPTIONS+= ITEXT 'Enable the itext block' off	13	OPTIONS+= ITEXT 'Enable the itext block' on
14	OPTIONS+= JFOR 'Enable the JFOR Block' off	14	OPTIONS+= JFOR 'Enable the JFOR Block' on
15	OPTIONS+= JSP 'Enable the jsp block' off	15	OPTIONS+= JSP 'Enable the jsp block' on
16	OPTIONS+= LINKREWRITER 'Enable the linkrewriter block' off	16	OPTIONS+= LINKREWRITER 'Enable the linkrewriter block' on
17	OPTIONS+= LUCENE 'Enable the lucene block' off	17	OPTIONS+= LUCENE 'Enable the lucene block' on
18	OPTIONS+= NAMING 'Enable the naming block' off	18	OPTIONS+= NAMING 'Enable the naming block' on
19	OPTIONS+= PARANOID 'Enable the Paranoid Cocoon Servlet' off	19	OPTIONS+= PARANOID 'Enable the Paranoid Cocoon Servlet' on
20	OPTIONS+= PHP 'Enable the php block' off	20	OPTIONS+= PHP 'Enable the php block' on
21	OPTIONS+= POI 'Enable the poi block' off	21	OPTIONS+= POI 'Enable the poi block' on
22	OPTIONS+= PORTAL_FW 'Enable the portal-fw block' off	22	OPTIONS+= PORTAL_FW 'Enable the portal-fw block' on
23	OPTIONS+= PROFILER 'Enable the profiler block' off	23	OPTIONS+= PROFILER 'Enable the profiler block' on
24	OPTIONS+= PYTHON 'Enable the python block' off	24	OPTIONS+= PYTHON 'Enable the python block' on
25	OPTIONS+= SESSION_FW 'Enable the session-fw block' off	25	OPTIONS+= SESSION_FW 'Enable the session-fw block' on
26	OPTIONS+= SWF 'Enable the swf block' off	26	OPTIONS+= SWF 'Enable the swf block' on
27	OPTIONS+= VELOCITY 'Enable the velocity block' off	27	OPTIONS+= VELOCITY 'Enable the velocity block' on
28	OPTIONS+= WEB3 'Enable the web3 block' off	28	OPTIONS+= WEB3 'Enable the web3 block' on
29	OPTIONS+= XMLDB 'Enable the xmldb block' off	29	OPTIONS+= XMLDB 'Enable the xmldb block' on
30	OPTIONS+= XSP 'Enable the xsp block' off	30	OPTIONS+= XSP 'Enable the xsp block' on
31	OPTIONS+= APPLES 'Enable the apples block' off	31	OPTIONS+= APPLES 'Enable the apples block' on
32	OPTIONS+= ASCIIART 'Enable the asciiart block' off	32	OPTIONS+= ASCIIART 'Enable the asciiart block' on
33	OPTIONS+= AXIS 'Enable the axis block' off	33	OPTIONS+= AXIS 'Enable the axis block' on
34	OPTIONS+= CRON 'Enable the cron block' off	34	OPTIONS+= CRON 'Enable the cron block' on
35	OPTIONS+= DELI 'Enable the deli block' off	35	OPTIONS+= DELI 'Enable the deli block' on
36	OPTIONS+= EVENTCACHE 'Enable the eventcache block' off	36	OPTIONS+= EVENTCACHE 'Enable the eventcache block' on
37	OPTIONS+= FORMS 'Enable the forms block' off	37	OPTIONS+= FORMS 'Enable the forms block' on
38	OPTIONS+= JAVAFLOW 'Enable the javaflow block' off	38	OPTIONS+= JAVAFLOW 'Enable the javaflow block' on
39	OPTIONS+= JMS 'Enable the jms block' off	39	OPTIONS+= JMS 'Enable the jms block' on
40	OPTIONS+= LINOTYPE 'Enable the linotype block' off	40	OPTIONS+= LINOTYPE 'Enable the linotype block' on
41	OPTIONS+= MAIL 'Enable the mail block' off	41	OPTIONS+= MAIL 'Enable the mail block' on
42	OPTIONS+= MIDI 'Enable the midi block' off	42	OPTIONS+= MIDI 'Enable the midi block' on
43	OPTIONS+= OJB 'Enable the ojb block' off	43	OPTIONS+= OJB 'Enable the ojb block' on
44	OPTIONS+= PETSTORE 'Enable the petstore block' off	44	OPTIONS+= PETSTORE 'Enable the petstore block' on
45	OPTIONS+= PORTAL 'Enable the portal block' off	45	OPTIONS+= PORTAL 'Enable the portal block' on
46	OPTIONS+= PROXY 'Enable the proxy block' off	46	OPTIONS+= PROXY 'Enable the proxy block' on
47	OPTIONS+= QDOX 'Enable the qdox block' off	47	OPTIONS+= QDOX 'Enable the qdox block' on
48	OPTIONS+= REPOSITORY 'Enable the repository block' off	48	OPTIONS+= REPOSITORY 'Enable the repository block' on
49	OPTIONS+= SCRATCHPAD 'Enable the scratchpad block' off	49	OPTIONS+= SCRATCHPAD 'Enable the scratchpad block' on
50	OPTIONS+= SERIALIZERS 'Enable the serializers block' off	50	OPTIONS+= SERIALIZERS 'Enable the serializers block' on
51	OPTIONS+= SLIDE 'Enable the slide block' off	51	OPTIONS+= SLIDE 'Enable the slide block' on
52	OPTIONS+= SLOP 'Enable the slop block' off	52	OPTIONS+= SLOP 'Enable the slop block' on
53	OPTIONS+= STX 'Enable the stx block' off	53	OPTIONS+= STX 'Enable the stx block' on
54	OPTIONS+= TAGLIB 'Enable the taglib block' off	54	OPTIONS+= TAGLIB 'Enable the taglib block' on
55	OPTIONS+= TOUR 'Enable the tour block' off	55	OPTIONS+= TOUR 'Enable the tour block' on
56	OPTIONS+= WEBDAV 'Enable the webdav block' off	56	OPTIONS+= WEBDAV 'Enable the webdav block' on
		57	OPTIONS+= WOODY 'Enable the woody block' off

Lines 1-6 Link Here

(-)cocoon/Makefile.test-options (+48 lines)
1	.if defined(WITH_AUTHENTICATION_FW)	1	.if defined(WITH_AUTHENTICATION_FW)
2	BLOCKS+= authentication-fw	2	BLOCKS+= authentication-fw
3	BLOCKS+= session-fw	3	BLOCKS+= session-fw
		4	WITH_SESSION_FW= YES
4	.endif	5	.endif
5		6
6	.if defined(WITH_BATIK)	7	.if defined(WITH_BATIK)
Lines 14-34 Link Here
14	.if defined(WITH_CHAPERON)	15	.if defined(WITH_CHAPERON)
15	BLOCKS+= chaperon	16	BLOCKS+= chaperon
16	BLOCKS+= xsp	17	BLOCKS+= xsp
		18	WITH_XSP= YES
17	.endif	19	.endif
18		20
19	.if defined(WITH_DATABASES)	21	.if defined(WITH_DATABASES)
20	BLOCKS+= databases	22	BLOCKS+= databases
21	BLOCKS+= xsp	23	BLOCKS+= xsp
		24	WITH_XSP= YES
22	.endif	25	.endif
23		26
24	.if defined(WITH_FOP)	27	.if defined(WITH_FOP)
25	BLOCKS+= fop	28	BLOCKS+= fop
26	BLOCKS+= batik	29	BLOCKS+= batik
		30	WITH_BATIK= YES
27	.endif	31	.endif
28		32
29	.if defined(WITH_HSQLDB)	33	.if defined(WITH_HSQLDB)
30	BLOCKS+= hsqldb	34	BLOCKS+= hsqldb
31	BLOCKS+= databases	35	BLOCKS+= databases
		36	WITH_DATABASES= YES
32	.endif	37	.endif
33		38
34	.if defined(WITH_HTML)	39	.if defined(WITH_HTML)
Lines 50-55 Link Here
50	.if defined(WITH_LINKREWRITER)	55	.if defined(WITH_LINKREWRITER)
51	BLOCKS+= linkrewriter	56	BLOCKS+= linkrewriter
52	BLOCKS+= xsp	57	BLOCKS+= xsp
		58	WITH_XSP= YES
53	.endif	59	.endif
54		60
55	.if defined(WITH_LUCENE)	61	.if defined(WITH_LUCENE)
Lines 75-81 Link Here
75	.if defined(WITH_PORTAL_FW)	81	.if defined(WITH_PORTAL_FW)
76	BLOCKS+= portal-fw	82	BLOCKS+= portal-fw
77	BLOCKS+= authentication-fw	83	BLOCKS+= authentication-fw
		84	WITH_AUTHENTICATION_FW= YES
78	BLOCKS+= session-fw	85	BLOCKS+= session-fw
		86	WITH_SESSION_FW= YES
79	.endif	87	.endif
80		88
81	.if defined(WITH_PROFILER)	89	.if defined(WITH_PROFILER)
Lines 85-95 Link Here
85	.if defined(WITH_PYTHON)	93	.if defined(WITH_PYTHON)
86	BLOCKS+= python	94	BLOCKS+= python
87	BLOCKS+= xsp	95	BLOCKS+= xsp
		96	WITH_XSP= YES
88	.endif	97	.endif
89		98
90	.if defined(WITH_SESSION_FW)	99	.if defined(WITH_SESSION_FW)
91	BLOCKS+= session-fw	100	BLOCKS+= session-fw
92	BLOCKS+= xsp	101	BLOCKS+= xsp
		102	WITH_XSP= YES
93	.endif	103	.endif
94		104
95	.if defined(WITH_SWF)	105	.if defined(WITH_SWF)
Lines 107-112 Link Here
107	.if defined(WITH_XMLDB)	117	.if defined(WITH_XMLDB)
108	BLOCKS+= xmldb	118	BLOCKS+= xmldb
109	BLOCKS+= databases	119	BLOCKS+= databases
		120	WITH_DATABASES= YES
110	.endif	121	.endif
111		122
112	.if defined(WITH_XSP)	123	.if defined(WITH_XSP)
Lines 116-121 Link Here
116	.if defined(WITH_APPLES)	127	.if defined(WITH_APPLES)
117	BLOCKS+= apples	128	BLOCKS+= apples
118	BLOCKS+= forms	129	BLOCKS+= forms
		130	WITH_FORMS= YES
119	.endif	131	.endif
120		132
121	.if defined(WITH_ASCIIART)	133	.if defined(WITH_ASCIIART)
Lines 137-160 Link Here
137	.if defined(WITH_EVENTCACHE)	149	.if defined(WITH_EVENTCACHE)
138	BLOCKS+= eventcache	150	BLOCKS+= eventcache
139	BLOCKS+= xsp	151	BLOCKS+= xsp
		152	WITH_XSP= YES
140	.endif	153	.endif
141		154
142	.if defined(WITH_FORMS)	155	.if defined(WITH_FORMS)
143	BLOCKS+= forms	156	BLOCKS+= forms
144	BLOCKS+= xsp	157	BLOCKS+= xsp
		158	WITH_XSP= YES
145	.endif	159	.endif
146		160
147	.if defined(WITH_JAVAFLOW)	161	.if defined(WITH_JAVAFLOW)
148	BLOCKS+= javaflow	162	BLOCKS+= javaflow
149	BLOCKS+= forms	163	BLOCKS+= forms
		164	WITH_FORMS= YES
150	BLOCKS+= ojb	165	BLOCKS+= ojb
		166	WITH_OJB= YES
151	.endif	167	.endif
152		168
153	.if defined(WITH_JMS)	169	.if defined(WITH_JMS)
154	BLOCKS+= jms	170	BLOCKS+= jms
155	BLOCKS+= databases	171	BLOCKS+= databases
		172	WITH_DATABASES= YES
156	BLOCKS+= eventcache	173	BLOCKS+= eventcache
		174	WITH_EVENTCACHE= YES
157	BLOCKS+= hsqldb	175	BLOCKS+= hsqldb
		176	WITH_HSQLDB= YES
158	.endif	177	.endif
159		178
160	.if defined(WITH_LINOTYPE)	179	.if defined(WITH_LINOTYPE)
Lines 164-170 Link Here
164	.if defined(WITH_MAIL)	183	.if defined(WITH_MAIL)
165	BLOCKS+= mail	184	BLOCKS+= mail
166	BLOCKS+= asciiart	185	BLOCKS+= asciiart
		186	WITH_ASCIIART= YES
167	BLOCKS+= scratchpad	187	BLOCKS+= scratchpad
		188	WITH_SCRATCHPAD= YES
168	.endif	189	.endif
169		190
170	.if defined(WITH_MIDI)	191	.if defined(WITH_MIDI)
Lines 174-195 Link Here
174	.if defined(WITH_OJB)	195	.if defined(WITH_OJB)
175	BLOCKS+= ojb	196	BLOCKS+= ojb
176	BLOCKS+= databases	197	BLOCKS+= databases
		198	WITH_DATABASES= YES
177	BLOCKS+= forms	199	BLOCKS+= forms
		200	WITH_FORMS= YES
178	.endif	201	.endif
179		202
180	.if defined(WITH_PETSTORE)	203	.if defined(WITH_PETSTORE)
181	BLOCKS+= petstore	204	BLOCKS+= petstore
182	BLOCKS+= databases	205	BLOCKS+= databases
		206	WITH_DATABASES= YES
183	BLOCKS+= forms	207	BLOCKS+= forms
		208	WITH_FORMS= YES
184	BLOCKS+= hsqldb	209	BLOCKS+= hsqldb
		210	WITH_HSQLDB= YES
185	BLOCKS+= velocity	211	BLOCKS+= velocity
		212	WITH_VELOCITY= YES
186	.endif	213	.endif
187		214
188	.if defined(WITH_PORTAL)	215	.if defined(WITH_PORTAL)
189	BLOCKS+= portal	216	BLOCKS+= portal
190	BLOCKS+= authentication-fw	217	BLOCKS+= authentication-fw
		218	WITH_AUTHENTICATION_FW= YES
191	BLOCKS+= html	219	BLOCKS+= html
		220	WITH_HTML= YES
192	BLOCKS+= session-fw	221	BLOCKS+= session-fw
		222	WITH_SESSION_FW= YES
193	.endif	223	.endif
194		224
195	.if defined(WITH_PROXY)	225	.if defined(WITH_PROXY)
Lines 203-217 Link Here
203	.if defined(WITH_REPOSITORY)	233	.if defined(WITH_REPOSITORY)
204	BLOCKS+= repository	234	BLOCKS+= repository
205	BLOCKS+= databases	235	BLOCKS+= databases
		236	WITH_DATABASES= YES
206	BLOCKS+= eventcache	237	BLOCKS+= eventcache
		238	WITH_EVENTCACHE= YES
207	.endif	239	.endif
208		240
209	.if defined(WITH_SCRATCHPAD)	241	.if defined(WITH_SCRATCHPAD)
210	BLOCKS+= scratchpad	242	BLOCKS+= scratchpad
211	BLOCKS+= batik	243	BLOCKS+= batik
		244	WITH_BATIK= YES
212	BLOCKS+= cron	245	BLOCKS+= cron
		246	WITH_CRON= YES
213	BLOCKS+= velocity	247	BLOCKS+= velocity
		248	WITH_VELOCITY= YES
214	BLOCKS+= xsp	249	BLOCKS+= xsp
		250	WITH_XSP= YES
215	.endif	251	.endif
216		252
217	.if defined(WITH_SERIALIZERS)	253	.if defined(WITH_SERIALIZERS)
Lines 221-227 Link Here
221	.if defined(WITH_SLIDE)	257	.if defined(WITH_SLIDE)
222	BLOCKS+= slide	258	BLOCKS+= slide
223	BLOCKS+= jms	259	BLOCKS+= jms
		260	WITH_JMS= YES
224	BLOCKS+= repository	261	BLOCKS+= repository
		262	WITH_REPOSITORY= YES
225	.endif	263	.endif
226		264
227	.if defined(WITH_SLOP)	265	.if defined(WITH_SLOP)
Lines 239-250 Link Here
239	.if defined(WITH_TOUR)	277	.if defined(WITH_TOUR)
240	BLOCKS+= tour	278	BLOCKS+= tour
241	BLOCKS+= batik	279	BLOCKS+= batik
		280	WITH_BATIK= YES
242	BLOCKS+= fop	281	BLOCKS+= fop
		282	WITH_FOP= YES
243	BLOCKS+= forms	283	BLOCKS+= forms
		284	WITH_FORMS= YES
244	.endif	285	.endif
245		286
246	.if defined(WITH_WEBDAV)	287	.if defined(WITH_WEBDAV)
247	BLOCKS+= webdav	288	BLOCKS+= webdav
248	BLOCKS+= repository	289	BLOCKS+= repository
		290	WITH_REPOSITORY= YES
		291	.endif
		292
		293	.if defined(WITH_WOODY)
		294	BLOCKS+= woody
		295	BLOCKS+= xsp
		296	WITH_XSP= YES
249	.endif	297	.endif