Date: Sat, 24 Mar 2007 15:24:32 GMT From: Nemo Liu<nemoliu@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/110768: [UPDATE]java/jboss4:fix some FATAL error noticed by portlint -C Message-ID: <200703241524.l2OFOW3g046630@www.freebsd.org> Resent-Message-ID: <200703241530.l2OFU4kT069855@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110768 >Category: ports >Synopsis: [UPDATE]java/jboss4:fix some FATAL error noticed by portlint -C >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 24 15:30:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Nemo Liu >Release: 7-current >Organization: >Environment: FreeBSD tango.sina.com.cn 7.0-STOooRM FreeBSD 7.0-STOooRM #0: Mon Mar 19 12:20:35 CST 2007 liutong@tango.sina.com.cn:/usr/obj/usr/src/sys/TANGO amd64 >Description: Fix FATAL errors noticed by portlint -C: FATAL: Makefile: PORTVERSION looks illegal. You should modify "4.0.5.GA". FATAL: Makefile: The value of the USE_RC_SUBR variable should be the name of the intended rc.d script, and there should be a corresponding file in the files/ directory. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/jboss4/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- Makefile 8 Nov 2006 16:19:17 -0000 1.38 +++ Makefile 24 Mar 2007 14:50:32 -0000 @@ -2,16 +2,16 @@ # Date created: 16 April 2002 # Whom: Ernst de Haan <znerd@FreeBSD.org> # -# $FreeBSD: ports/java/jboss4/Makefile,v 1.38 2006/11/08 16:19:17 rafan Exp $ +# $FreeBSD$ # PORTNAME= ${APP_TITLE:L} -PORTVERSION= 4.0.5.GA +PORTVERSION= 4.0.5 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}.GA-src MAINTAINER= jonc@chen.org.nz COMMENT= Open-source J2EE application server (4.x family) @@ -22,7 +22,7 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ -USE_RC_SUBR= YES +USE_RC_SUBR= startup.sh .if !defined(NOPORTDOCS) PORTDOCS= * @@ -49,10 +49,10 @@ JAVA_CP= bin/run.jar:${JAVA_HOME}/lib/tools.jar JAVA_MAIN= org.jboss.Main DAEMONCTL_DIR= ${FILESDIR} -DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh pkg-message +DAEMONCTL_FILES=daemonctl.c daemonctl.1 startup.sh.in pkg-message MAN1= ${CONTROL_SCRIPT_NAME}.1 -JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:S/.s/SP/} +JBOSSOUTPUT= ${WRKSRC}/build/output/${PORTNAME}-${PORTVERSION:S/.s/SP/}.GA APP_HOME_FILES= bin client lib server PLIST_FILES= ${CONTROL_SCRIPT:S,^${PREFIX}/,,} \ Index: files/startup.sh =================================================================== RCS file: files/startup.sh diff -N files/startup.sh --- files/startup.sh 13 Jun 2006 17:43:14 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,61 +0,0 @@ -#!/bin/sh -# -# %%APP_TITLE%% startup script. -# -# $FreeBSD: ports/java/jboss4/files/startup.sh,v 1.4 2006/06/13 17:43:14 glewis Exp $ -# - -# PROVIDE: %%APP_SHORTNAME%% -# REQUIRE: NETWORKING SERVERS - -# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: -# %%APP_SHORTNAME%%_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable %%APP_SHORTNAME%% -# %%APP_SHORTNAME%%_flags (str): Set to "-server" by default. -# Extra JVM flags. -# %%APP_SHORTNAME%%_config (str): Set to "" by default -# JBoss server config, eg {all|default|minimal|standard} -# -. %%RC_SUBR%% - -name="%%APP_SHORTNAME%%" -rcvar=`set_rcvar` - -start_cmd="%%APP_SHORTNAME%%_start" -restart_cmd="%%APP_SHORTNAME%%_restart" -pidfile="%%PID_FILE%%" -procname="%%JAVA%%" - -[ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" -[ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" -[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" - -%%APP_SHORTNAME%%_start () -{ - checkyesno %%APP_SHORTNAME%%_enable && - { - if [ ! -f ${pidfile} ] - then - touch ${pidfile} - chown %%USER%%:%%GROUP%% ${pidfile} - fi - - 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 - -[ -n "${%%APP_SHORTNAME%%_config}" ] && %%APP_SHORTNAME%%_configflag="-config" - -run_rc_command "$1" Index: files/startup.sh.in =================================================================== RCS file: files/startup.sh.in diff -N files/startup.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/startup.sh.in 24 Mar 2007 14:50:41 -0000 @@ -0,0 +1,61 @@ +#!/bin/sh +# +# %%APP_TITLE%% startup script. +# +# $FreeBSD: ports/java/jboss4/files/startup.sh,v 1.4 2006/06/13 17:43:14 glewis Exp $ +# + +# PROVIDE: %%APP_SHORTNAME%% +# REQUIRE: NETWORKING SERVERS + +# Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: +# %%APP_SHORTNAME%%_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable %%APP_SHORTNAME%% +# %%APP_SHORTNAME%%_flags (str): Set to "-server" by default. +# Extra JVM flags. +# %%APP_SHORTNAME%%_config (str): Set to "" by default +# JBoss server config, eg {all|default|minimal|standard} +# +. %%RC_SUBR%% + +name="%%APP_SHORTNAME%%" +rcvar=`set_rcvar` + +start_cmd="%%APP_SHORTNAME%%_start" +restart_cmd="%%APP_SHORTNAME%%_restart" +pidfile="%%PID_FILE%%" +procname="%%JAVA%%" + +[ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" +[ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" +[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" + +%%APP_SHORTNAME%%_start () +{ + checkyesno %%APP_SHORTNAME%%_enable && + { + if [ ! -f ${pidfile} ] + then + touch ${pidfile} + chown %%USER%%:%%GROUP%% ${pidfile} + fi + + 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 + +[ -n "${%%APP_SHORTNAME%%_config}" ] && %%APP_SHORTNAME%%_configflag="-config" + +run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703241524.l2OFOW3g046630>