From f286a4a0151a6df46e396fb27bc80942eab59cb9 Mon Sep 17 00:00:00 2001 From: znerd Date: Wed, 15 May 2002 07:43:11 +0000 Subject: Using bin/run.jar for startup. Now the control program no longer reports an error at startup. Bumped PORTREVISION. PR: 38069 --- java/jboss2/Makefile | 6 +++--- java/jboss3/Makefile | 6 +++--- java/jboss4/Makefile | 6 +++--- java/jboss5/Makefile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'java') diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile index cc60f4b..2e9f3dc 100644 --- a/java/jboss2/Makefile +++ b/java/jboss2/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -43,7 +43,7 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \ ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \ ${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh -JAR_FILE= ${APP_SHORTNAME}.jar +JAR_FILE= bin/run.jar WRKDIR?= ${.CURDIR}/work .include @@ -65,7 +65,7 @@ post-patch: -e "/%%GROUP%%/s//${GROUP}/g" \ -e "/%%JAVA_CMD%%/s//bin\/java/g" \ -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ - -e "/%%JAR_FILE%%/s//${JAR_FILE}/g" \ + -e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \ -e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \ -e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \ -e "/%%PORTNAME%%/s//${PORTNAME}/g" \ diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile index cc60f4b..2e9f3dc 100644 --- a/java/jboss3/Makefile +++ b/java/jboss3/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -43,7 +43,7 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \ ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \ ${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh -JAR_FILE= ${APP_SHORTNAME}.jar +JAR_FILE= bin/run.jar WRKDIR?= ${.CURDIR}/work .include @@ -65,7 +65,7 @@ post-patch: -e "/%%GROUP%%/s//${GROUP}/g" \ -e "/%%JAVA_CMD%%/s//bin\/java/g" \ -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ - -e "/%%JAR_FILE%%/s//${JAR_FILE}/g" \ + -e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \ -e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \ -e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \ -e "/%%PORTNAME%%/s//${PORTNAME}/g" \ diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile index cc60f4b..2e9f3dc 100644 --- a/java/jboss4/Makefile +++ b/java/jboss4/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -43,7 +43,7 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \ ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \ ${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh -JAR_FILE= ${APP_SHORTNAME}.jar +JAR_FILE= bin/run.jar WRKDIR?= ${.CURDIR}/work .include @@ -65,7 +65,7 @@ post-patch: -e "/%%GROUP%%/s//${GROUP}/g" \ -e "/%%JAVA_CMD%%/s//bin\/java/g" \ -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ - -e "/%%JAR_FILE%%/s//${JAR_FILE}/g" \ + -e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \ -e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \ -e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \ -e "/%%PORTNAME%%/s//${PORTNAME}/g" \ diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile index cc60f4b..2e9f3dc 100644 --- a/java/jboss5/Makefile +++ b/java/jboss5/Makefile @@ -7,7 +7,7 @@ PORTNAME= ${APP_TITLE:L} PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -43,7 +43,7 @@ PID_FILE= /var/run/${APP_SHORTNAME}.pid REPLACE_FILES= ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \ ${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \ ${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh -JAR_FILE= ${APP_SHORTNAME}.jar +JAR_FILE= bin/run.jar WRKDIR?= ${.CURDIR}/work .include @@ -65,7 +65,7 @@ post-patch: -e "/%%GROUP%%/s//${GROUP}/g" \ -e "/%%JAVA_CMD%%/s//bin\/java/g" \ -e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \ - -e "/%%JAR_FILE%%/s//${JAR_FILE}/g" \ + -e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \ -e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \ -e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \ -e "/%%PORTNAME%%/s//${PORTNAME}/g" \ -- cgit v1.1