From jonc@chen.org.nz  Tue Jan 13 20:47:52 2009
Return-Path: <jonc@chen.org.nz>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 771F51065673
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Jan 2009 20:47:52 +0000 (UTC)
	(envelope-from jonc@chen.org.nz)
Received: from chen.org.nz (ip-58-28-152-174.static-xdsl.xnet.co.nz [58.28.152.174])
	by mx1.freebsd.org (Postfix) with ESMTP id 19CDF8FC2D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Jan 2009 20:47:52 +0000 (UTC)
	(envelope-from jonc@chen.org.nz)
Received: by chen.org.nz (Postfix, from userid 1000)
	id 48C2D2840D; Wed, 14 Jan 2009 09:28:13 +1300 (NZDT)
Message-Id: <20090113202813.48C2D2840D@chen.org.nz>
Date: Wed, 14 Jan 2009 09:28:13 +1300 (NZDT)
From: Jonathan Chen <jonc@chen.org.nz>
Reply-To: Jonathan Chen <jonc@chen.org.nz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Enable rcordering for www/geronimo
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         130514
>Category:       ports
>Synopsis:       Enable rcordering for www/geronimo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 13 20:50:03 UTC 2009
>Closed-Date:    Wed Jan 14 20:35:06 UTC 2009
>Last-Modified:  Wed Jan 14 20:40:02 UTC 2009
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Tue Jan 13 21:26:27 UTC 2009 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130514 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Wed Jan 14 20:34:51 UTC 2009 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130514 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/130514: commit references a PR
Date: Wed, 14 Jan 2009 20:34:24 +0000 (UTC)

 beech       2009-01-14 20:34:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/geronimo         Makefile 
     www/geronimo/files   geronimo2.sh.in 
   Log:
   - Enable rcorder tags for geronimo2.sh.in.
   - Bump portrevision
   
   PR:             ports/130514
   Submitted by:   Jonathan Chen <jonc@chen.org.nz> (maintainer)
   
   Revision  Changes    Path
   1.11      +5 -12     ports/www/geronimo/Makefile
   1.4       +5 -1      ports/www/geronimo/files/geronimo2.sh.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
