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

[Jui-Nan Lin]

Hi,

It works :)

Please see the attached patch files, fixed dependency of py-thrift.

On Mon, May 16, 2011 at 3:16 AM, Doug Barton <dougb at freebsd.org> wrote:
> 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 --------------
diff -ruN --exclude=CVS /usr/ports/net/scribe/Makefile /home/users/jnlin/ports/scribe/Makefile
--- /usr/ports/net/scribe/Makefile	2011-05-13 21:53:55.000000000 +0800
+++ /home/users/jnlin/ports/scribe/Makefile	2011-05-16 21:43:59.436092720 +0800
@@ -6,7 +6,7 @@
 
 PORTNAME=	scribe
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://cloud.github.com/downloads/facebook/scribe/
 
@@ -19,7 +19,7 @@
 		thrift:${PORTSDIR}/devel/thrift
 RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
-		py-thrift>0:${PORTSDIR}/devel/py-thrift
+		${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift
 
 ACLOCAL_ARGS=	-I ./aclocal
 AUTOMAKE_ARGS=	-a
diff -ruN --exclude=CVS /usr/ports/net/scribe/files/scribe.in /home/users/jnlin/ports/scribe/files/scribe.in
--- /usr/ports/net/scribe/files/scribe.in	2011-05-16 21:42:18.943386384 +0800
+++ /home/users/jnlin/ports/scribe/files/scribe.in	2011-05-16 21:43:13.207774673 +0800
@@ -2,31 +2,29 @@
 #
 # $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"