Attachment #92786 for bug #130514

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




USE_RC_SUBR=	geronimo2.sh
SUB_FILES=	pkg-install pkg-deinstall

OPTIONS=	TOMCAT6 "Use Tomcat instead of default Jetty" off
		TOMCAT6 "Use Tomcat as web server" off

.include <bsd.port.pre.mk>

.if defined(WITH_TOMCAT6)
BROKEN=		Choose only one web server
.endif
.if defined(WITHOUT_JETTY6) && defined(WITHOUT_TOMCAT6)
BROKEN=		Choose one web server
.endif

.if defined(WITH_JETTY6)
WEBSERVER=	jetty6
.elif defined(WITH_TOMCAT6)
WEBSERVER=	tomcat6
.else
WEBSERVER=	jetty6
.endif

MAJOR_VER=	${PORTVERSION:C/\..*//}

Lines 3-8 Link Here

(-)./files/geronimo2.sh.in (+4 lines)
3	# $FreeBSD: ports/www/geronimo/files/geronimo2.sh.in,v 1.3 2008/05/22 12:26:08 nemoliu Exp $	3	# $FreeBSD: ports/www/geronimo/files/geronimo2.sh.in,v 1.3 2008/05/22 12:26:08 nemoliu Exp $
4	#	4	#
5		5
		6	# PROVIDE: %%APP_SHORTNAME%%
		7	# REQUIRE: NETWORKING SERVERS
		8	# KEYWORD: shutdown
		9
6	#	10	#
7	# Configuration settings for geronimo%%GERONIMO_VERSION%% in /etc/rc.conf:	11	# Configuration settings for geronimo%%GERONIMO_VERSION%% in /etc/rc.conf:
8	#	12	#

Return to bug 130514

Lines 22-43 Link Here

(-)./Makefile (-12 / +4 lines)
22	USE_RC_SUBR= geronimo2.sh	22	USE_RC_SUBR= geronimo2.sh
23	SUB_FILES= pkg-install pkg-deinstall	23	SUB_FILES= pkg-install pkg-deinstall
24		24
25	OPTIONS= JETTY6 "Use Jetty6 as web server" on \	25	OPTIONS= TOMCAT6 "Use Tomcat instead of default Jetty" off
26	TOMCAT6 "Use Tomcat as web server" off
27		26
28	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
29		28
30	.if defined(WITH_JETTY6) && defined(WITH_TOMCAT6)	29	.if defined(WITH_TOMCAT6)
31	BROKEN= Choose only one web server
32	.endif
33	.if defined(WITHOUT_JETTY6) && defined(WITHOUT_TOMCAT6)
34	BROKEN= Choose one web server
35	.endif
36
37	.if defined(WITH_JETTY6)
38	WEBSERVER= jetty6
39	.elif defined(WITH_TOMCAT6)
40	WEBSERVER= tomcat6	30	WEBSERVER= tomcat6
		31	.else
		32	WEBSERVER= jetty6
41	.endif	33	.endif
42		34
43	MAJOR_VER= ${PORTVERSION:C/\..*//}	35	MAJOR_VER= ${PORTVERSION:C/\..*//}