diff -ruN /usr/ports/java/jboss4/Makefile ./Makefile
--- /usr/ports/java/jboss4/Makefile	Tue May 16 16:27:23 2006
+++ ./Makefile	Fri May 19 15:59:02 2006
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	${APP_TITLE:L}
-PORTVERSION=	4.0.3.s1
+PORTVERSION=	4.0.4.GA
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.s/SP/}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Open-source J2EE application server (4.x family)
@@ -23,7 +23,6 @@
 JAVA_VERSION=	1.4+
 
 USE_RC_SUBR=	YES
-USE_BZIP2=	YES
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -37,9 +36,8 @@
 CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
 CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
 CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
-STARTUP_ORDER=	020
 STARTUP_SCRIPT_NAME=	${APP_SHORTNAME}.sh
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_SCRIPT_NAME}
 USER=		www
 GROUP=		www
 STDOUT_LOG=	${LOG_DIR}/stdout.log
diff -ruN /usr/ports/java/jboss4/distinfo ./distinfo
--- /usr/ports/java/jboss4/distinfo	Sun Jan  1 09:27:02 2006
+++ ./distinfo	Sat May 20 09:23:24 2006
@@ -1,3 +1,3 @@
-MD5 (jboss-4.0.3SP1-src.tar.bz2) = 366e67b69ee7f81eec33808a5708e5ac
-SHA256 (jboss-4.0.3SP1-src.tar.bz2) = db7bf82fd9c0d021428cb1a66933d0182c85a26a3fa9b5dbdc6d9ce3a2598624
-SIZE (jboss-4.0.3SP1-src.tar.bz2) = 55447207
+MD5 (jboss-4.0.4.GA-src.tar.gz) = 86fafd6fee8e6b658a617e8c8d8ae1c2
+SHA256 (jboss-4.0.4.GA-src.tar.gz) = 1c78c89e079cec297f14699158ec261b410811c4ca6301297f0d456a7d08daee
+SIZE (jboss-4.0.4.GA-src.tar.gz) = 70918978
diff -ruN /usr/ports/java/jboss4/files/startup.sh ./files/startup.sh
--- /usr/ports/java/jboss4/files/startup.sh	Mon Jan  3 17:13:21 2005
+++ ./files/startup.sh	Sat May 20 10:16:26 2006
@@ -40,15 +40,18 @@
 			chown %%USER%%:%%GROUP%% ${pidfile}
 		fi
 
-		%%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} start &&
-		echo -n " %%APP_SHORTNAME%%"
+		echo "Starting %%APP_SHORTNAME%%."
+		%%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} start
 	}
 }
 
 %%APP_SHORTNAME%%_restart ()
 {
 	checkyesno %%APP_SHORTNAME%%_enable &&
+	{
+		echo "Restarting %%APP_SHORTNAME%%."
 		%%CONTROL_SCRIPT%% -q ${%%APP_SHORTNAME%%_flags} ${%%APP_SHORTNAME%%_configflag} ${%%APP_SHORTNAME%%_config} restart
+	}
 }
 
 load_rc_config $name