Attachment 92786 Details for Bug 130514 – file.diff

[patch] file.diff

file.diff (text/plain), 1.32 KB, created by Jonathan Chen on 2009-01-13 20:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Chen

Created: 2009-01-13 20:50:03 UTC

Size: 1.32 KB

patch

obsolete

>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:
> #

Actions: View | Diff

Attachments on bug 130514: 92786