From owner-svn-ports-all@FreeBSD.ORG Sun Aug 5 20:46:41 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 22220106566C; Sun, 5 Aug 2012 20:46:41 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02CBB8FC08; Sun, 5 Aug 2012 20:46:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75KkeLm024965; Sun, 5 Aug 2012 20:46:40 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75Kkevi024960; Sun, 5 Aug 2012 20:46:40 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201208052046.q75Kkevi024960@svn.freebsd.org> From: Doug Barton Date: Sun, 5 Aug 2012 20:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302134 - in head/devel/linux-js: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Aug 2012 20:46:41 -0000 Author: dougb Date: Sun Aug 5 20:46:40 2012 New Revision: 302134 URL: http://svn.freebsd.org/changeset/ports/302134 Log: Remove a bogus use of USE_RCORDER, and while I'm here move the files *.sh.in -> *.in, and tune them up. Added: head/devel/linux-js/files/jscal.in - copied, changed from r302130, head/devel/linux-js/files/jscal.sh.in head/devel/linux-js/files/linux_js.in - copied, changed from r302130, head/devel/linux-js/files/linux_js.sh.in Deleted: head/devel/linux-js/files/jscal.sh.in head/devel/linux-js/files/linux_js.sh.in Modified: head/devel/linux-js/Makefile Modified: head/devel/linux-js/Makefile ============================================================================== --- head/devel/linux-js/Makefile Sun Aug 5 20:38:10 2012 (r302133) +++ head/devel/linux-js/Makefile Sun Aug 5 20:46:40 2012 (r302134) @@ -19,7 +19,7 @@ PROGRAMS= jscal jstest MAN1= ${PROGRAMS:S|$|.1|} MAN4= linux_js.4 PORTDOCS= joystick-api.txt -USE_RCORDER= jscal.sh linux_js.sh +USE_RC_SUBR= jscal linux_js OPTIONS_DEFINE= LINUX JOY UHID DOCS OPTIONS_DEFAULT= LINUX JOY UHID Copied and modified: head/devel/linux-js/files/jscal.in (from r302130, head/devel/linux-js/files/jscal.sh.in) ============================================================================== --- head/devel/linux-js/files/jscal.sh.in Sun Aug 5 19:37:05 2012 (r302130, copy source) +++ head/devel/linux-js/files/jscal.in Sun Aug 5 20:46:40 2012 (r302134) @@ -1,18 +1,22 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD$ +# # PROVIDE: jscal # REQUIRE: linux_js # KEYWORD: shutdown -jscal_enable=${jscal_enable-"NO"} -jscal_devices="${jscal_devices:-/dev/input/js*}" -jscal_state="${jscal_state:-/var/db/jscal-state}" - . /etc/rc.subr -name="jscal" +name=jscal rcvar=jscal_enable + +load_rc_config $name + +jscal_enable=${jscal_enable:-"NO"} +jscal_devices="${jscal_devices:-/dev/input/js*}" +jscal_state="${jscal_state:-/var/db/jscal-state}" + command="%%PREFIX%%/bin/jscal" start_cmd="jscal_start" stop_cmd="jscal_stop" @@ -38,5 +42,4 @@ jscal_stop() done } -load_rc_config $name run_rc_command "$1" Copied and modified: head/devel/linux-js/files/linux_js.in (from r302130, head/devel/linux-js/files/linux_js.sh.in) ============================================================================== --- head/devel/linux-js/files/linux_js.sh.in Sun Aug 5 19:37:05 2012 (r302130, copy source) +++ head/devel/linux-js/files/linux_js.in Sun Aug 5 20:46:40 2012 (r302134) @@ -1,23 +1,22 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD$ +# # PROVIDE: linux_js +# REQUIRE: LOGIN # KEYWORD: shutdown -linux_js_enable=${linux_js_enable-"NO"} - . /etc/rc.subr -name="linux_js" +name=linux_js rcvar=linux_js_enable -start_cmd="linux_js_start" -stop_cmd="linux_js_stop" -linux_js_start() -{ - echo "Starting ${name}." - kldload linux_js -} +load_rc_config $name + +linux_js_enable=${linux_js_enable:-"NO"} + +start_cmd="load_kld -m linux_js" +stop_cmd="linux_js_stop" linux_js_stop() { @@ -25,5 +24,4 @@ linux_js_stop() kldunload linux_js } -load_rc_config $name run_rc_command "$1"