9 files changed, 18 insertions, 10 deletions
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 3b718497cac5..dcf26407f61e 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	3.3.1
-PORTREVISION=	12
+PORTREVISION=	13
 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 7a2878d7e125..ef5efb825a57 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 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/startup.sh b/www/jakarta-tomcat4/files/startup.sh
index b27dea9f7de5..edd373ee1478 100644
--- a/www/jakarta-tomcat4/files/startup.sh
+++ b/www/jakarta-tomcat4/files/startup.sh
@@ -13,15 +13,17 @@ MYSELF=`basename $0`
 
 case "$1" in
 	start)
+		echo -n ' '
 		truncate -s 0 %%PID_FILE%%
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start" >/dev/null && echo -n '%%APP_SHORTNAME%%'
 		;;
 	stop)
+		echo -n ' '
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop" >/dev/null 2>&1 ; echo -n '%%APP_SHORTNAME%%'
 		;;
 	*)
 		echo ""
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 7a2878d7e125..ef5efb825a57 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 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/startup.sh b/www/jakarta-tomcat41/files/startup.sh
index b27dea9f7de5..edd373ee1478 100644
--- a/www/jakarta-tomcat41/files/startup.sh
+++ b/www/jakarta-tomcat41/files/startup.sh
@@ -13,15 +13,17 @@ MYSELF=`basename $0`
 
 case "$1" in
 	start)
+		echo -n ' '
 		truncate -s 0 %%PID_FILE%%
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start" >/dev/null && echo -n '%%APP_SHORTNAME%%'
 		;;
 	stop)
+		echo -n ' '
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop" >/dev/null 2>&1 ; echo -n '%%APP_SHORTNAME%%'
 		;;
 	*)
 		echo ""
diff --git a/www/orion-devel/Makefile b/www/orion-devel/Makefile
index 7dffb7f192c3..9e7c2a8eacee 100644
--- a/www/orion-devel/Makefile
+++ b/www/orion-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orion
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 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 7dffb7f192c3..9e7c2a8eacee 100644
--- a/www/orion/Makefile
+++ b/www/orion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orion
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 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 7a2878d7e125..ef5efb825a57 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 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/startup.sh b/www/tomcat41/files/startup.sh
index b27dea9f7de5..edd373ee1478 100644
--- a/www/tomcat41/files/startup.sh
+++ b/www/tomcat41/files/startup.sh
@@ -13,15 +13,17 @@ MYSELF=`basename $0`
 
 case "$1" in
 	start)
+		echo -n ' '
 		truncate -s 0 %%PID_FILE%%
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% start" >/dev/null && echo -n '%%APP_SHORTNAME%%'
 		;;
 	stop)
+		echo -n ' '
 		chown %%USER%%:%%GROUP%% %%PID_FILE%%
 		chmod 600 %%PID_FILE%%
-		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop > /dev/null" && echo -n ' %%APP_SHORTNAME%%'
+		su -f -m %%USER%% -c "exec %%CONTROL_SCRIPT%% stop" >/dev/null 2>&1 ; echo -n '%%APP_SHORTNAME%%'
 		;;
 	*)
 		echo ""