- add options to choose use jetty or tomcat

- update to 2.0-M5
 - change stop function which in rc script

Approved by:	delphij (mentor)

www/geronimo/Makefile

@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	geronimo
-PORTVERSION=	2.0.M3
-PORTREVISION=	1
+PORTVERSION=	2.0.M5
 CATEGORIES=	www devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	geronimo/${PORTVERSION:C/\.M/-M/}
-DISTNAME=	${PORTNAME}-tomcat6-jee5-${PORTVERSION:C/\.M/-M/}-bin
+DISTNAME=	${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION:C/\.M/-M/}-bin
 
 MAINTAINER=	nemoliu@FreeBSD.org
 COMMENT=	Open-source Java EE 5 application server
@@ -23,19 +22,60 @@ NO_BUILD=	YES
 USE_RC_SUBR=	geronimo2.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
-MAJOR_VER=	${PORTVERSION:S/.0.M3//}
-APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:S/.0.M3//}
+OPTIONS=	JETTY6 "Use Jetty6 as web server" on \
+		TOMCAT6 "Use Tomcat as web server" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_JETTY6) && 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
+.endif
+
+MAJOR_VER=	${PORTVERSION:S/.0.M5//}
+APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:S/.0.M5//}
 LOG_DIR=	${APP_HOME}/var/log
 APP_TITLE=	Geronimo
-APP_SHORTNAME=	geronimo${MAJOR_VER:S/.0.M3//}
+APP_SHORTNAME=	geronimo${MAJOR_VER:S/.0.M5//}
 GERONIMO_USER?=	www
 GERONIMO_GROUP?=www
 GERONIMO_OUT=	${LOG_DIR}/geronimo.out
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC=		${WRKDIR}/${PORTNAME}-tomcat6-jee5-${PORTVERSION:C/\.M/-M/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${WEBSERVER}-jee5-${PORTVERSION:C/\.M/-M/}
 JAR_FILE=	bin/server.jar
-PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
+WEBPATHV=	${WEBSERVER}
+WEBPATHNV=	jetty
+TCOMMENT=	"@comment "
+JCOMMENT=	"@comment "
+.if ${WEBSERVER} != "jetty6"
+WEBPATHV=	tomcat
+WEBPATHNV=	tomcat
+TCOMMENT=
+.else
+WEBPATHNV=	jetty
+JCOMMENT=
+.endif
+PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} \
+		WWWOWN=${TOMCAT_USER} \
+		WWWGRP=${TOMCAT_GROUP} \
+		PVER=${PORTVERSION:C/\.M/-M/} \
+		WEBPATHV=${WEBPATHV} \
+		WEBPATHNV=${WEBPATHNV} \
+		WEBPATHV=${WEBPATHV} \
+		WEBPATHNV=${WEBPATHNV} \
+		TCOMMENT=${TCOMMENT} \
+		JCOMMENT=${JCOMMENT} \
+		JCOMMENTD=${JCOMMENTD} \
+		TCOMMENTD=${TCOMMENTD}
 LATEST_LINK=	${APP_SHORTNAME}
 
 SUB_LIST=	GERONIMO_HOME=${APP_HOME} \
@@ -51,8 +91,6 @@ SUB_LIST=	GERONIMO_HOME=${APP_HOME} \
 		GERONIMO_OUT=${GERONIMO_OUT} \
 		JAVA_HOME=${JAVA_HOME}
 
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"

www/geronimo/distinfo

@@ -1,3 +1,6 @@
-MD5 (geronimo-tomcat6-jee5-2.0-M3-bin.tar.gz) = 30f304ac0a31f5aa182b09d78caa3a87
-SHA256 (geronimo-tomcat6-jee5-2.0-M3-bin.tar.gz) = 56b929c61cc9a10f924b30845150f26efd70d4c679a4191a1ce88697e133898f
-SIZE (geronimo-tomcat6-jee5-2.0-M3-bin.tar.gz) = 64471847
+MD5 (geronimo-jetty6-jee5-2.0-M5-bin.tar.gz) = 89de5124a13a1daeb0b9bc531e82ae39
+SHA256 (geronimo-jetty6-jee5-2.0-M5-bin.tar.gz) = c1c1a96a1bf313dc75dc692fadc4555b9914ae2c231e81cc5731d9bd92d34245
+SIZE (geronimo-jetty6-jee5-2.0-M5-bin.tar.gz) = 58109543
+MD5 (geronimo-tomcat6-jee5-2.0-M5-bin.tar.gz) = 2df6096bdb0428d73679474c16f63bbc
+SHA256 (geronimo-tomcat6-jee5-2.0-M5-bin.tar.gz) = acb417be521fc533e6050b921db92338cd9f34fac89b8a71dc3b2ffde24a646d
+SIZE (geronimo-tomcat6-jee5-2.0-M5-bin.tar.gz) = 58878193

www/geronimo/files/geronimo2.sh.in

@@ -148,7 +148,7 @@ geronimo%%GERONIMO_VERSION%%_stop() {
 	fi
 	
 	echo "Stopping ${name}."
-	${java_stop_command}
+	kill ${rc_pid} 2> /dev/null
 	geronimo_wait_max_for_pid ${geronimo%%GERONIMO_VERSION%%_stop_timeout} ${rc_pid}
 	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
 	echo -n > ${pidfile}