cvs commit: ports/net/scribe Makefile ports/net/scribe/files scribe.in

[Doug Barton]

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 at Florence [2:14pm] [W2] ~>  sudo /usr/local/etc/rc.d/scribe onestart
> Starting scribe.
> jnlin at 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/

-------------- next part --------------
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"