Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 03 Sep 2011 03:08:06 -0700
From:      Doug Barton <dougb@FreeBSD.org>
To:        Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Cc:        Radim Kolar <hsn@sendmail.cz>, cvs-ports@FreeBSD.org, Gea-Suan Lin <gslin@gslin.org>, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: cvs commit: ports/databases/cassandra Makefile distinfo pkg-deinstall pkg-install pkg-plist ports/databases/cassandra/files cassandra.in
Message-ID:  <4E61FC86.7000908@FreeBSD.org>
In-Reply-To: <201109030519.p835JK7G073466@repoman.freebsd.org>
References:  <201109030519.p835JK7G073466@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------040103080401010505060802
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

The rc.d script is ok, the only major problem is it needs REQUIRE:
LOGIN. The rest of the patch is to apply the more typical style.


hth,

Doug


On 09/02/2011 22:19, Sunpoet Po-Chuan Hsieh wrote:
> sunpoet     2011-09-03 05:19:20 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     databases/cassandra  Makefile distinfo pkg-plist 
>   Added files:
>     databases/cassandra  pkg-deinstall pkg-install 
>     databases/cassandra/files cassandra.in 
>   Log:
>   - Update to 0.8.4
>   - Add LICENSE
>   - Add rc.d script
>   - Do not remove configuration files during deinstallation
>   
>   Changes:        https://svn.apache.org/repos/asf/cassandra/tags/cassandra-0.8.4/CHANGES.txt
>   PR:             ports/160231  http://www.FreeBSD.org/cgi/query-pr.cgi?pr=160231
>   Submitted by:   Radim Kolar <hsn@sendmail.cz>
>   Approved by:    Gea-Suan Lin <gslin@gslin.org> (maintainer)
>   
>   Revision  Changes    Path
>   1.12      +17 -2     ports/databases/cassandra/Makefile
>   1.12      +2 -2      ports/databases/cassandra/distinfo
>   1.1       +49 -0     ports/databases/cassandra/files/cassandra.in (new)
>   1.1       +15 -0     ports/databases/cassandra/pkg-deinstall (new)
>   1.1       +16 -0     ports/databases/cassandra/pkg-install (new)
>   1.11      +104 -43   ports/databases/cassandra/pkg-plist
> 
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/Makefile.diff?&r1=1.11&r2=1.12&f=h
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/distinfo.diff?&r1=1.11&r2=1.12&f=h
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/files/cassandra.in
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/pkg-deinstall
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/pkg-install
> http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/cassandra/pkg-plist.diff?&r1=1.10&r2=1.11&f=h
> 



-- 

	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/


--------------040103080401010505060802
Content-Type: text/plain;
 name="cass-rcd.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="cass-rcd.diff"

Index: cassandra.in
===================================================================
RCS file: /home/pcvs/ports/databases/cassandra/files/cassandra.in,v
retrieving revision 1.1
diff -u -r1.1 cassandra.in
--- cassandra.in	3 Sep 2011 05:19:20 -0000	1.1
+++ cassandra.in	3 Sep 2011 10:06:23 -0000
@@ -25,6 +25,7 @@
 # DAMAGE. 
 
 # PROVIDE: cassandra
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # $FreeBSD: ports/databases/cassandra/files/cassandra.in,v 1.1 2011/09/03 05:19:20 sunpoet Exp $
@@ -32,18 +33,22 @@
 . /etc/rc.subr
 
 name="cassandra"
+rcvar=`set_rcvar`
+
+load_rc_config $name
 
 cassandra_enable=${cassandra_enable:-"NO"}
 cassandra_vmargs=${cassandra_vmargs:-"-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
 cassandra_memory=${cassandra_memory:-"1000m"}
 cassandra_newgen=${cassandra_newgen:-"300m"}
+
 command=%%DATADIR%%/bin/cassandra
 command_args="-p /var/run/cassandra.pid >/dev/null"
+
 procname="java"
 pidfile=/var/run/cassandra.pid
 
-rcvar=`set_rcvar`
-load_rc_config $name
 export MAX_HEAP_SIZE="$cassandra_memory"
 export HEAP_NEWSIZE="$cassandra_newgen"
+
 run_rc_command "$1"

--------------040103080401010505060802--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E61FC86.7000908>