ports/166445: [PATCH] www/resin3: reorganize rc script
Jason Helfman
jgh at FreeBSD.org
Tue Mar 27 17:40:08 UTC 2012
>Number: 166445
>Category: ports
>Synopsis: [PATCH] www/resin3: reorganize rc script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 27 17:40:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
Modifications were requested to the resin rc script from dougb@
I am putting this pr in for approval and review
Added file(s):
- files/resin3.in
Removed file(s):
- files/resin3.sh.in
Port maintainer (5u623l20 at gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_5 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- resin-3.1.12_1.patch begins here ---
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 27 Mar 2012 17:24:38 -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 <bsd.port.pre.mk>
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 27 Mar 2012 17:24:38 -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"
--- resin-3.1.12_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list