ports/130514: Enable rcordering for www/geronimo

[Jonathan Chen]

>Number:         130514
>Category:       ports
>Synopsis:       Enable rcordering for www/geronimo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 13 20:50:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Chen
>Release:        FreeBSD 7.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD osiris.chen.org.nz 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Dec 27 10:16:51 NZDT 2008 root at osiris.chen.org.nz:/usr/obj/usr/src/sys/OSIRIS amd64
>Description:

Enable rcorder tags for geronimo2.sh.in.
Simplify OPTIONS (maintaining backward compatibility).

I don't believe a portrevision bump is required, but feel free to disagree.

>How-To-Repeat:
>Fix:

diff -ruN /usr/ports/www/geronimo/Makefile ./Makefile
--- /usr/ports/www/geronimo/Makefile	2008-12-19 13:19:29.000000000 +1300
+++ ./Makefile	2009-01-14 09:15:09.000000000 +1300
@@ -22,22 +22,14 @@
 USE_RC_SUBR=	geronimo2.sh
 SUB_FILES=	pkg-install pkg-deinstall
 
-OPTIONS=	JETTY6 "Use Jetty6 as web server" on \
-		TOMCAT6 "Use Tomcat as web server" off
+OPTIONS=	TOMCAT6 "Use Tomcat instead of default Jetty" 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)
+.if defined(WITH_TOMCAT6)
 WEBSERVER=	tomcat6
+.else
+WEBSERVER=	jetty6
 .endif
 
 MAJOR_VER=	${PORTVERSION:C/\..*//}
diff -ruN /usr/ports/www/geronimo/files/geronimo2.sh.in ./files/geronimo2.sh.in
--- /usr/ports/www/geronimo/files/geronimo2.sh.in	2008-05-23 00:26:08.000000000 +1200
+++ ./files/geronimo2.sh.in	2009-01-14 09:13:10.000000000 +1300
@@ -3,6 +3,10 @@
 # $FreeBSD: ports/www/geronimo/files/geronimo2.sh.in,v 1.3 2008/05/22 12:26:08 nemoliu Exp $
 #
 
+# PROVIDE: %%APP_SHORTNAME%%
+# REQUIRE: NETWORKING SERVERS
+# KEYWORD: shutdown
+
 #
 # Configuration settings for geronimo%%GERONIMO_VERSION%% in /etc/rc.conf:
 #
>Release-Note:
>Audit-Trail:
>Unformatted: