diff options
| author | beech <beech@FreeBSD.org> | 2009-01-15 04:34:14 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2009-01-15 04:34:14 +0800 |
| commit | c15a1f53b3ed64cfbaad0d9bdc1f000526502688 (patch) | |
| tree | 1a205a9f6d114f8444e43ca643fb3d28f9dad253 | |
| parent | 42077ec9eb97f8c801a4f39b197143bb15e7b2f5 (diff) | |
| download | freebsd-ports-gnome-c15a1f53b3ed64cfbaad0d9bdc1f000526502688.tar.gz freebsd-ports-gnome-c15a1f53b3ed64cfbaad0d9bdc1f000526502688.tar.zst freebsd-ports-gnome-c15a1f53b3ed64cfbaad0d9bdc1f000526502688.zip | |
- Enable rcorder tags for geronimo2.sh.in.
- Bump portrevision
PR: ports/130514
Submitted by: Jonathan Chen <jonc@chen.org.nz> (maintainer)
| -rw-r--r-- | www/geronimo/Makefile | 17 | ||||
| -rw-r--r-- | www/geronimo/files/geronimo2.sh.in | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile index f01c369e95f8..0ede839f6948 100644 --- a/www/geronimo/Makefile +++ b/www/geronimo/Makefile @@ -7,6 +7,7 @@ PORTNAME= geronimo PORTVERSION= 2.1.3 +PORTREVISION= 1 CATEGORIES= www devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= geronimo/${PORTVERSION} @@ -22,22 +23,14 @@ NO_BUILD= YES 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 --git a/www/geronimo/files/geronimo2.sh.in b/www/geronimo/files/geronimo2.sh.in index 4de7fa330ff5..ade5d67c92eb 100644 --- a/www/geronimo/files/geronimo2.sh.in +++ b/www/geronimo/files/geronimo2.sh.in @@ -3,6 +3,10 @@ # $FreeBSD$ # +# PROVIDE: %%APP_SHORTNAME%% +# REQUIRE: NETWORKING SERVERS +# KEYWORD: shutdown + # # Configuration settings for geronimo%%GERONIMO_VERSION%% in /etc/rc.conf: # |