diff options
Diffstat (limited to '')
-rw-r--r-- | java/jboss2/Makefile | 1 | ||||
-rw-r--r-- | java/jboss3/Makefile | 1 | ||||
-rw-r--r-- | java/jboss4/Makefile | 1 | ||||
-rw-r--r-- | java/jboss5/Makefile | 1 | ||||
-rw-r--r-- | www/jakarta-tomcat3/Makefile | 2 | ||||
-rw-r--r-- | www/jakarta-tomcat4/Makefile | 2 | ||||
-rw-r--r-- | www/jakarta-tomcat4/files/daemonctl.c | 12 | ||||
-rw-r--r-- | www/jakarta-tomcat41/Makefile | 2 | ||||
-rw-r--r-- | www/jakarta-tomcat41/files/daemonctl.c | 12 | ||||
-rw-r--r-- | www/orion-devel/Makefile | 2 | ||||
-rw-r--r-- | www/orion/Makefile | 2 | ||||
-rw-r--r-- | www/tomcat41/Makefile | 2 | ||||
-rw-r--r-- | www/tomcat41/files/daemonctl.c | 12 |
13 files changed, 43 insertions, 9 deletions
diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile index aafad6d7191f..cc60f4b4c64b 100644 --- a/java/jboss2/Makefile +++ b/java/jboss2/Makefile @@ -7,6 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 +PORTREVISION= 2 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile index aafad6d7191f..cc60f4b4c64b 100644 --- a/java/jboss3/Makefile +++ b/java/jboss3/Makefile @@ -7,6 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 +PORTREVISION= 2 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile index aafad6d7191f..cc60f4b4c64b 100644 --- a/java/jboss4/Makefile +++ b/java/jboss4/Makefile @@ -7,6 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 +PORTREVISION= 2 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile index aafad6d7191f..cc60f4b4c64b 100644 --- a/java/jboss5/Makefile +++ b/java/jboss5/Makefile @@ -7,6 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 +PORTREVISION= 2 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile index dcf26407f61e..d689af27e2c3 100644 --- a/www/jakarta-tomcat3/Makefile +++ b/www/jakarta-tomcat3/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-tomcat PORTVERSION= 3.3.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile index ef5efb825a57..04457e0d8f66 100644 --- a/www/jakarta-tomcat4/Makefile +++ b/www/jakarta-tomcat4/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-tomcat PORTVERSION= 4.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ diff --git a/www/jakarta-tomcat4/files/daemonctl.c b/www/jakarta-tomcat4/files/daemonctl.c index f1af9317edf7..43d72b03c805 100644 --- a/www/jakarta-tomcat4/files/daemonctl.c +++ b/www/jakarta-tomcat4/files/daemonctl.c @@ -4,7 +4,7 @@ * * Daemon control program. * - * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/daemonctl.c,v 1.5 2002-04-08 21:50:22 znerd Exp $ + * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat4/files/Attic/daemonctl.c,v 1.6 2002-05-08 22:00:04 znerd Exp $ */ #include <assert.h> @@ -36,6 +36,7 @@ #define ERR_ALREADY_RUNNING 6 #define ERR_NOT_RUNNING 7 #define ERR_CHDIR_TO_APP_HOME 8 +#define ERR_ACCESS_JAR_FILE 17 #define ERR_STDOUT_LOGFILE_OPEN 9 #define ERR_STDERR_LOGFILE_OPEN 10 #define ERR_FORK_FAILED 11 @@ -370,6 +371,15 @@ void start(void) { exit(ERR_CHDIR_TO_APP_HOME); } + /* See if the JAR file exists */ + result = access("%%APP_HOME%%/%%JAR_FILE%%", R_OK); + if (result < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access JAR file %%APP_HOME%%/%%JAR_FILE%%: "); + perror(NULL); + exit(ERR_ACCESS_JAR_FILE); + } + /* Open the stdout log file */ stdoutLogFile = open("%%STDOUT_LOG%%", O_WRONLY); if (stdoutLogFile < 0) { diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile index ef5efb825a57..04457e0d8f66 100644 --- a/www/jakarta-tomcat41/Makefile +++ b/www/jakarta-tomcat41/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-tomcat PORTVERSION= 4.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ diff --git a/www/jakarta-tomcat41/files/daemonctl.c b/www/jakarta-tomcat41/files/daemonctl.c index 2143d525fceb..3ddbdb98edf7 100644 --- a/www/jakarta-tomcat41/files/daemonctl.c +++ b/www/jakarta-tomcat41/files/daemonctl.c @@ -4,7 +4,7 @@ * * Daemon control program. * - * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/daemonctl.c,v 1.5 2002-04-08 21:50:22 znerd Exp $ + * $FreeBSD: /tmp/pcvs/ports/www/jakarta-tomcat41/files/Attic/daemonctl.c,v 1.6 2002-05-08 22:00:04 znerd Exp $ */ #include <assert.h> @@ -36,6 +36,7 @@ #define ERR_ALREADY_RUNNING 6 #define ERR_NOT_RUNNING 7 #define ERR_CHDIR_TO_APP_HOME 8 +#define ERR_ACCESS_JAR_FILE 17 #define ERR_STDOUT_LOGFILE_OPEN 9 #define ERR_STDERR_LOGFILE_OPEN 10 #define ERR_FORK_FAILED 11 @@ -370,6 +371,15 @@ void start(void) { exit(ERR_CHDIR_TO_APP_HOME); } + /* See if the JAR file exists */ + result = access("%%APP_HOME%%/%%JAR_FILE%%", R_OK); + if (result < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access JAR file %%APP_HOME%%/%%JAR_FILE%%: "); + perror(NULL); + exit(ERR_ACCESS_JAR_FILE); + } + /* Open the stdout log file */ stdoutLogFile = open("%%STDOUT_LOG%%", O_WRONLY); if (stdoutLogFile < 0) { diff --git a/www/orion-devel/Makefile b/www/orion-devel/Makefile index 9e7c2a8eacee..1a7aa7c0f138 100644 --- a/www/orion-devel/Makefile +++ b/www/orion-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.orionserver.com/distributions/ \ http://www.atlassian.com/software/orion/downloads/ \ diff --git a/www/orion/Makefile b/www/orion/Makefile index 9e7c2a8eacee..1a7aa7c0f138 100644 --- a/www/orion/Makefile +++ b/www/orion/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.orionserver.com/distributions/ \ http://www.atlassian.com/software/orion/downloads/ \ diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile index ef5efb825a57..04457e0d8f66 100644 --- a/www/tomcat41/Makefile +++ b/www/tomcat41/Makefile @@ -7,7 +7,7 @@ PORTNAME= jakarta-tomcat PORTVERSION= 4.0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www java MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/release/v${PORTVERSION}/bin/ \ http://www.metaverse.nl/~ernst/ \ diff --git a/www/tomcat41/files/daemonctl.c b/www/tomcat41/files/daemonctl.c index 6e9a6b25b4b7..5a3684a39d82 100644 --- a/www/tomcat41/files/daemonctl.c +++ b/www/tomcat41/files/daemonctl.c @@ -4,7 +4,7 @@ * * Daemon control program. * - * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.5 2002-04-08 21:50:22 znerd Exp $ + * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.6 2002-05-08 22:00:04 znerd Exp $ */ #include <assert.h> @@ -36,6 +36,7 @@ #define ERR_ALREADY_RUNNING 6 #define ERR_NOT_RUNNING 7 #define ERR_CHDIR_TO_APP_HOME 8 +#define ERR_ACCESS_JAR_FILE 17 #define ERR_STDOUT_LOGFILE_OPEN 9 #define ERR_STDERR_LOGFILE_OPEN 10 #define ERR_FORK_FAILED 11 @@ -370,6 +371,15 @@ void start(void) { exit(ERR_CHDIR_TO_APP_HOME); } + /* See if the JAR file exists */ + result = access("%%APP_HOME%%/%%JAR_FILE%%", R_OK); + if (result < 0) { + printf(" [ FAILED ]\n"); + fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to access JAR file %%APP_HOME%%/%%JAR_FILE%%: "); + perror(NULL); + exit(ERR_ACCESS_JAR_FILE); + } + /* Open the stdout log file */ stdoutLogFile = open("%%STDOUT_LOG%%", O_WRONLY); if (stdoutLogFile < 0) { |