From owner-cvs-all@FreeBSD.ORG Sun May 15 19:16:55 2011 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id F06BF106564A; Sun, 15 May 2011 19:16:55 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 65-241-43-5.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 7FB2314D850; Sun, 15 May 2011 19:16:54 +0000 (UTC) Message-ID: <4DD026A5.8030900@FreeBSD.org> Date: Sun, 15 May 2011 12:16:53 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.17) Gecko/20110429 Thunderbird/3.1.10 MIME-Version: 1.0 To: Jui-Nan Lin References: <201105131353.p4DDrtms046413@repoman.freebsd.org> <4DCF0192.6030808@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------070901090302030102030909" Cc: Greg Larkin , cvs-ports@freebsd.org, Erik Steigler , cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/net/scribe Makefile ports/net/scribe/files scribe.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 19:16:56 -0000 This is a multi-part message in MIME format. --------------070901090302030102030909 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 05/14/2011 23:14, Jui-Nan Lin wrote: > Hello, > > This patch does not work on my installation. Thanks for testing, the attached patch works, I've actually tested this one. :) > jnlin@Florence [2:14pm] [W2] ~> sudo /usr/local/etc/rc.d/scribe onestart > Starting scribe. > jnlin@Florence [2:14pm] [W2] ~> sudo cat /var/run/scribe.pid&& echo FYI, the echo there is not necessary. Also FYI, the py-thrift dependency is not being detected properly if it's already installed, you might want to take a look at that as well. hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ --------------070901090302030102030909 Content-Type: text/plain; name="scribe2.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="scribe2.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/scribe/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 13 May 2011 13:53:55 -0000 1.6 +++ Makefile 15 May 2011 19:14:56 -0000 @@ -6,7 +6,7 @@ PORTNAME= scribe PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://cloud.github.com/downloads/facebook/scribe/ Index: files/scribe.in =================================================================== RCS file: /home/pcvs/ports/net/scribe/files/scribe.in,v retrieving revision 1.3 diff -u -r1.3 scribe.in --- files/scribe.in 15 May 2011 02:49:11 -0000 1.3 +++ files/scribe.in 15 May 2011 19:14:56 -0000 @@ -1,32 +1,30 @@ #!/bin/sh -# + # $FreeBSD: ports/net/scribe/files/scribe.in,v 1.3 2011/05/15 02:49:11 dougb Exp $ # - # PROVIDE: scribe -# REQUIRE: DAEMON +# REQUIRE: LOGIN +# KEYWORD: shutdown . /etc/rc.subr name="scribe" rcvar=`set_rcvar` + pidfile="/var/run/${name}.pid" -command="%%PREFIX%%/bin/scribed" +command="/usr/sbin/daemon" +procname="%%PREFIX%%/bin/scribed" -start_cmd=scribe_start stop_postcmd=scribe_cleanup +scribe_cleanup() { + [ -e "$pidfile" ] && /bin/unlink $pidfile +} + load_rc_config "$name" -: ${scribe_enable="NO"} -scribe_start() -{ - echo "Starting ${name}." - /usr/sbin/daemon -cf -p ${pidfile} ${command} ${scribe_flags} -} +: ${scribe_enable="NO"} -scribe_cleanup() { - [ -f ${pidfile} ] && %%RM%% ${pidfile} -} +command_args="-cf -p $pidfile %%PREFIX%%/bin/scribed" run_rc_command "$1" --------------070901090302030102030909--