From 467a07aa3ae12ff7657b8ce67c66f145a27b25fa Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Tue, 13 Jun 2006 17:43:14 +0000 Subject: [PATCH] . Update to 4.0.4. PR: 97514 Submitted by: Jonathan Chen (maintainer) --- java/jboss4/Makefile | 8 +++----- java/jboss4/distinfo | 6 +++--- java/jboss4/files/startup.sh | 9 ++++++--- java/jboss5/Makefile | 8 +++----- java/jboss5/distinfo | 6 +++--- java/jboss5/files/startup.sh | 9 ++++++--- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile index 18efd547e1ed..fc38fc2f296a 100644 --- a/java/jboss4/Makefile +++ b/java/jboss4/Makefile @@ -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 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ USE_RC_SUBR= YES -USE_BZIP2= YES .if !defined(NOPORTDOCS) PORTDOCS= * @@ -37,9 +36,8 @@ APP_SHORTNAME= ${UNIQUENAME} 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 --git a/java/jboss4/distinfo b/java/jboss4/distinfo index 919d4f2869ac..199b0b680fa1 100644 --- a/java/jboss4/distinfo +++ b/java/jboss4/distinfo @@ -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 --git a/java/jboss4/files/startup.sh b/java/jboss4/files/startup.sh index bea0ed4d6174..be7cff4ca2c7 100644 --- a/java/jboss4/files/startup.sh +++ b/java/jboss4/files/startup.sh @@ -2,7 +2,7 @@ # # %%APP_TITLE%% startup script. # -# $FreeBSD: /tmp/pcvs/ports/java/jboss4/files/Attic/startup.sh,v 1.3 2004-12-22 20:44:23 hq Exp $ +# $FreeBSD: /tmp/pcvs/ports/java/jboss4/files/Attic/startup.sh,v 1.4 2006-06-13 17:43:14 glewis Exp $ # # PROVIDE: %%APP_SHORTNAME%% @@ -40,15 +40,18 @@ procname="%%JAVA%%" 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 diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile index 18efd547e1ed..fc38fc2f296a 100644 --- a/java/jboss5/Makefile +++ b/java/jboss5/Makefile @@ -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 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ USE_RC_SUBR= YES -USE_BZIP2= YES .if !defined(NOPORTDOCS) PORTDOCS= * @@ -37,9 +36,8 @@ APP_SHORTNAME= ${UNIQUENAME} 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 --git a/java/jboss5/distinfo b/java/jboss5/distinfo index 919d4f2869ac..199b0b680fa1 100644 --- a/java/jboss5/distinfo +++ b/java/jboss5/distinfo @@ -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 --git a/java/jboss5/files/startup.sh b/java/jboss5/files/startup.sh index 9ee364814b6b..ab89029ac91f 100644 --- a/java/jboss5/files/startup.sh +++ b/java/jboss5/files/startup.sh @@ -2,7 +2,7 @@ # # %%APP_TITLE%% startup script. # -# $FreeBSD: /tmp/pcvs/ports/java/jboss5/files/Attic/startup.sh,v 1.3 2004-12-22 20:44:23 hq Exp $ +# $FreeBSD: /tmp/pcvs/ports/java/jboss5/files/Attic/startup.sh,v 1.4 2006-06-13 17:43:14 glewis Exp $ # # PROVIDE: %%APP_SHORTNAME%% @@ -40,15 +40,18 @@ procname="%%JAVA%%" 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