From owner-freebsd-rc@FreeBSD.ORG Thu Mar 15 18:10:59 2012 Return-Path: Delivered-To: freebsd-rc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4D1371065675 for ; Thu, 15 Mar 2012 18:10:59 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 13D198FC0A for ; Thu, 15 Mar 2012 18:10:57 +0000 (UTC) Received: by dald2 with SMTP id d2so5024883dal.13 for ; Thu, 15 Mar 2012 11:10:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:x-operating-system:organization :x-living-the-dream:x-pgp-fingerprint:x-pgp-key:user-agent :x-gm-message-state; bh=sjN5qJfXrMQhRHoBhlG2HUZc6A7SLsK7pO0ZVCEkUWM=; b=kw5FSqThMGtE1MqAYYsekmLIgi14EYVwUVzFZCGmj2jVswoF/C/Kd6LlzsIrcaZjSG QIvzSz3GnnLsJrIndGeARzW5pk6SzaY+eSuXnBXYX8g2BQF2drh4lJTeWiya9njXAlPc qEpEJS8usWC9AVk+nPNwVl28Pb3lnH28S8SYI+7SqGxAHEpdXB4zye3eyyCHDB9v0C/5 artV9xBfeggL6etAw02OjKwzqiJI9qo1ry+rEQU8M7ld+FfUL0mAEyk2BiRT/Qe0Ui5V 2r20G8NwcLxneTvrW+U+osKZpR8S0cFd+lciLnUfaY0/Ty8mTHqOmobURd26gQ3FV7o4 FiyQ== Received: by 10.68.219.41 with SMTP id pl9mr6630436pbc.122.1331835051598; Thu, 15 Mar 2012 11:10:51 -0700 (PDT) Received: from dormouse.experts-exchange.com ([72.29.164.238]) by mx.google.com with ESMTPS id m7sm2378711pba.30.2012.03.15.11.10.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Mar 2012 11:10:50 -0700 (PDT) Sender: Jason Helfman Date: Thu, 15 Mar 2012 11:10:01 -0700 From: Jason Helfman To: freebsd-rc@freebsd.org Message-ID: <20120315181001.GA44984@dormouse.experts-exchange.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline X-Operating-System: FreeBSD 8.2-RELEASE amd64 Organization: The FreeBSD Project, http://www.freebsd.org X-Living-The-Dream: I love the SLO Life! X-PGP-FingerPrint: 8E0D C457 9A0F C91C 23F3 0454 2059 9A63 4150 D3DC X-PGP-Key: http://people.freebsd.org/~jgh/jgh.asc User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmGtwsu5gfHMb4vgw+U6Em7CMcKnVTaZ/xffNJRrilLRu8ZFCD39aztMjtavOYyCcJrYOK8 Cc: dougb@freebsd.org Subject: resin rc script X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Discussion related to /etc/rc.d design and implementation." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2012 18:10:59 -0000 --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Hi, It was requested that I revamp www/resin3 rc script. Here is my patch. I tried to set command_interpreter= python, but it passed a warning on start: /usr/local/etc/rc.d/resin3: WARNING: no shebang line in /usr/local/openjdk6/bin/java Starting resin3. APP_NAME is a standardly used variable for java related programs, that ends up being reused throughout the port in various files. In this case, APP_NAME becomes resin3 Thanks, Jason -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="resin.txt" ? work Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/resin3/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- Makefile 14 Mar 2012 18:09:37 -0000 1.46 +++ Makefile 15 Mar 2012 18:06:35 -0000 @@ -7,6 +7,7 @@ PORTNAME= resin PORTVERSION= 3.1.12 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ @@ -44,7 +45,7 @@ # Other settings APXS?= ${LOCALBASE}/sbin/apxs SUB_FILES= pkg-message resin3ctl -USE_RC_SUBR= resin3.sh +USE_RC_SUBR= resin3 .include Index: files/resin3.in =================================================================== RCS file: files/resin3.in diff -N files/resin3.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/resin3.in 15 Mar 2012 18:06:35 -0000 @@ -0,0 +1,43 @@ +#!/bin/sh +# +# $FreeBSD: ports/www/resin3/files/resin3.sh.in,v 1.1 2012/03/13 16:29:23 jgh Exp $ +# + +# PROVIDE: %%APP_NAME%% +# REQUIRE: LOGIN NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable %%APP_NAME%%: +# +# %%APP_NAME%%_enable="YES" +# + + +%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"} +%%APP_NAME%%_user=${%%APP_NAME%%_user:-"%%USERS%%"} +%%APP_NAME%%_group=${%%APP_NAME%%_group:-"%%GROUPS%%"} + +. /etc/rc.subr + +name=%%APP_NAME%% +rcvar=%%APP_NAME%%_enable + +load_rc_config ${name} + +command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" +command_args="start" +pidfile=%%PID_FILE%% + +if test -n "${%%APP_NAME%%_java_version}" ; then + JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) + procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) +else + JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) + procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) +fi + +export JAVA_HOME + +run_rc_command "$1" Index: files/resin3.sh.in =================================================================== RCS file: files/resin3.sh.in diff -N files/resin3.sh.in --- files/resin3.sh.in 13 Mar 2012 16:29:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/www/resin3/files/resin3.sh.in,v 1.1 2012/03/13 16:29:23 jgh Exp $ -# - -# PROVIDE: %%APP_NAME%% -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable %%APP_NAME%%: -# -# %%APP_NAME%%_enable="YES" -# - -. /etc/rc.subr - -name=%%APP_NAME%% -rcvar=%%APP_NAME%%_enable - -command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" -command_args="start" -pidfile=%%PID_FILE%% - -# set defaults - -%%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"} -%%APP_NAME%%_user=${%%APP_NAME%%_user:-"%%USERS%%"} -%%APP_NAME%%_group=${%%APP_NAME%%_group:-"%%GROUPS%%"} - -load_rc_config ${name} - -if test -n "${%%APP_NAME%%_java_version}" ; then - JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) - procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) -else - JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2) - procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2) -fi - -export JAVA_HOME - -run_rc_command "$1" --+HP7ph2BbKc20aGI--