Attachment #47967 for bug #73427

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

Lines 7-13 Link Here

(-)./Makefile (-1 / +1 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	PORTREVISION= 2
11	CATEGORIES= www java	11	CATEGORIES= www java
12	MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}	12	MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%,${PORTNAME},}
13	DISTNAME= ${PDISTNAME}-src	13	DISTNAME= ${PDISTNAME}-src




.if defined(WITH_AUTHENTICATION_FW)
BLOCKS+=	authentication-fw
BLOCKS+=	session-fw
BLOCKS+=	xsp
.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
BLOCKS+=	xsp
.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
BLOCKS+=	xsp
.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
BLOCKS+=	xsp
.endif

.if defined(WITH_XSP)

.if defined(WITH_APPLES)
BLOCKS+=	apples
BLOCKS+=	forms
BLOCKS+=	xsp
.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+=	databases
BLOCKS+=	forms
WITH_FORMS=	YES
BLOCKS+=	ojb
BLOCKS+=	xsp
.endif

.if defined(WITH_JMS)
BLOCKS+=	jms
BLOCKS+=	databases
WITH_DATABASES=	YES
BLOCKS+=	eventcache
WITH_EVENTCACHE=	YES
BLOCKS+=	hsqldb
BLOCKS+=	xsp
.endif

.if defined(WITH_LINOTYPE)

.if defined(WITH_MAIL)
BLOCKS+=	mail
BLOCKS+=	asciiart
BLOCKS+=	batik
BLOCKS+=	cron
BLOCKS+=	scratchpad
BLOCKS+=	velocity
BLOCKS+=	xsp
.endif

.if defined(WITH_MIDI)

.if defined(WITH_OJB)
BLOCKS+=	ojb
BLOCKS+=	databases
WITH_DATABASES=	YES
BLOCKS+=	forms
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
BLOCKS+=	xsp
.endif

.if defined(WITH_PORTAL)
BLOCKS+=	portal
BLOCKS+=	authentication-fw
WITH_AUTHENTICATION_FW=	YES
BLOCKS+=	html
WITH_HTML=	YES
BLOCKS+=	session-fw
BLOCKS+=	xsp
.endif

.if defined(WITH_PROXY)

.if defined(WITH_REPOSITORY)
BLOCKS+=	repository
BLOCKS+=	databases
WITH_DATABASES=	YES
BLOCKS+=	eventcache
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)


.if defined(WITH_SLIDE)
BLOCKS+=	slide
BLOCKS+=	databases
BLOCKS+=	eventcache
BLOCKS+=	hsqldb
BLOCKS+=	jms
WITH_JMS=	YES
BLOCKS+=	repository
BLOCKS+=	xsp
.endif

.if defined(WITH_SLOP)

.if defined(WITH_TOUR)
BLOCKS+=	tour
BLOCKS+=	batik
WITH_BATIK=	YES
BLOCKS+=	fop
WITH_FOP=	YES
BLOCKS+=	forms
BLOCKS+=	xsp
.endif

.if defined(WITH_WEBDAV)
BLOCKS+=	webdav
BLOCKS+=	databases
BLOCKS+=	eventcache
BLOCKS+=	repository
BLOCKS+=	xsp
.endif

.if defined(WITH_WOODY)
BLOCKS+=	woody
BLOCKS+=	xsp
WITH_XSP=	YES
.endif

Return to bug 73427

Lines 1-7 Link Here

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