Index: head/sysutils/riak-cs/Makefile
===================================================================
--- head/sysutils/riak-cs/Makefile	(revision 401094)
+++ head/sysutils/riak-cs/Makefile	(revision 401095)
@@ -1,84 +1,84 @@
 # $FreeBSD$
 
 PORTNAME=	riak-cs
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ \
 		http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Open source, distributed, S3 interface to Riak KV
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
 
 USES=		gmake readline shebangfix
 SHEBANG_FILES=	deps/eper/priv/bin/dtop \
 		deps/eper/priv/bin/ntop \
 		deps/eper/priv/bin/redbug
-USE_RC_SUBR=	riak-cs
+USE_RC_SUBR=	riak_cs
 
 USERS=		riakcs
 GROUPS=		riak
 
 RIAKCS_CONFDIR?=${PREFIX}/etc/riak-cs
 RIAKCS_DBDIR?=	/var/db/riak-cs
 RIAKCS_HOMEDIR?=${PREFIX}/lib/riak-cs
 RIAKCS_LIBDIR?=	${PREFIX}/lib/riak-cs/lib
 RIAKCS_LOGDIR?=	/var/log/riak-cs
 
 PLIST_SUB+=	RIAKCS_CONFDIR=${RIAKCS_CONFDIR} \
 	RIAKCS_DBDIR=${RIAKCS_DBDIR} \
 	RIAKCS_HOMEDIR=${RIAKCS_HOMEDIR} \
 	RIAKCS_LIBDIR=${RIAKCS_LIBDIR} \
 	RIAKCS_LOGDIR=${RIAKCS_LOGDIR} \
  	USERS=${USERS} \
 	GROUPS=${GROUPS}
 
 ALL_TARGET=	rel
 MAKE_JOBS_UNSAFE=yes
 MAKE_ENV=	PATH=${LOCALBASE}/lib/riak-erlang/bin:${PATH}
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
 
 do-install:
 	${MKDIR} ${STAGEDIR}${RIAKCS_CONFDIR}
 	${MKDIR} ${STAGEDIR}${RIAKCS_DBDIR}
 	${MKDIR} ${STAGEDIR}${RIAKCS_LOGDIR}
 	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/riak-cs.conf ${STAGEDIR}${RIAKCS_CONFDIR}/riak-cs.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/advanced.config ${STAGEDIR}${RIAKCS_CONFDIR}/advanced.config.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/cert.pem ${STAGEDIR}${RIAKCS_CONFDIR}/cert.pem.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/key.pem ${STAGEDIR}${RIAKCS_CONFDIR}/key.pem.sample
 	(cd ${WRKSRC}/rel/riak-cs/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAKCS_LIBDIR})
 	(cd ${WRKSRC}/rel/riak-cs/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
 	(cd ${WRKSRC}/rel/riak-cs/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_LIBDIR}/basho-patches)
 	(cd ${WRKSRC}/rel/riak-cs/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_HOMEDIR}/releases)
 	${CP} -R ${WRKSRC}/rel/riak-cs/erts-* ${STAGEDIR}${RIAKCS_HOMEDIR}
 
 post-install:
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} releases -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn  \
 		| ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type d -empty \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "@dir lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type d -empty \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "@dir lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
Index: head/sysutils/riak-cs/files/riak-cs.in
===================================================================
--- head/sysutils/riak-cs/files/riak-cs.in	(revision 401094)
+++ head/sysutils/riak-cs/files/riak-cs.in	(nonexistent)
@@ -1,84 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: riak-cs
-# REQUIRE: LOGIN cleanvar
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable riak-cs:
-# riak-cs_enable (bool):		Set to "NO" by default.
-#				Set it to "YES" to enable riak-cs on boot.
-#
-
-. /etc/rc.subr
-
-name="riak-cs"
-rcvar=riak_cs_enable
-
-pidfile=/var/run/riak-cs/riak-cs.pid
-
-start_cmd="riak-cs_start"
-stop_cmd="riak-cs_stop"
-restart_cdm="riak-cs_restart"
-status_cmd="riak-cs_status"
-command="%%PREFIX%%/sbin/riak-cs"
-
-load_rc_config $name
-
-# Read rc.d config and set defaults
-load_rc_config "$name"
-: ${riak-cs_enable="NO"}
-
-riak-cs_start()
-{
-	echo "Starting Riak."
-	%%PREFIX%%/sbin/riak-cs start
-	return 0
-}
-
-riak-cs_stop()
-{
-	echo "Stopping Riak processes"
-	%%PREFIX%%/sbin/riak-cs stop
-	killall -9 epmd
-	return 0
-}
-
-riak-cs_restart()
-{
-	riak-cs_stop
-	riak-cs_start
-	return 0
-}
-
-riak-cs_status()
-{
-	if riak-cs_running; then
-		echo "Riak is running."
-		return 0
-	else
-		echo "Riak is not running"
-		return 1
-	fi
-}
-
-riak-cs_running()
-{
-	local pid result ps
-	pid=`%%PREFIX%%/sbin/riak-cs getpid`
-	result=`echo $?`
-	if [ "$result" == 0 ]; then
-		ps=`ps -waux | grep ${pid} | grep riak-cs`
-		result=`echo $?`
-		if [ "$result" ]; then
-			return 0
-		else
-			return 1
-		fi
-	else
-		return 1
-	fi
-}
-
-run_rc_command "$1"

Property changes on: head/sysutils/riak-cs/files/riak-cs.in
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/riak-cs/files/riak_cs.in
===================================================================
--- head/sysutils/riak-cs/files/riak_cs.in	(nonexistent)
+++ head/sysutils/riak-cs/files/riak_cs.in	(revision 401095)
@@ -0,0 +1,84 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: riak-cs
+# REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable riak-cs:
+# riak-cs_enable (bool):		Set to "NO" by default.
+#				Set it to "YES" to enable riak-cs on boot.
+#
+
+. /etc/rc.subr
+
+name=riak_cs
+rcvar=riak_cs_enable
+
+pidfile=/var/run/riak-cs/riak-cs.pid
+
+start_cmd="riak_cs_start"
+stop_cmd="riak_cs_stop"
+restart_cdm="riak_cs_restart"
+status_cmd="riak_cs_status"
+command="%%PREFIX%%/sbin/riak-cs"
+
+load_rc_config $name
+
+# Read rc.d config and set defaults
+load_rc_config "$name"
+: ${riak_cs_enable="NO"}
+
+riak_cs_start()
+{
+	echo "Starting Riak."
+	%%PREFIX%%/sbin/riak-cs start
+	return 0
+}
+
+riak_cs_stop()
+{
+	echo "Stopping Riak processes"
+	%%PREFIX%%/sbin/riak-cs stop
+	killall -9 epmd
+	return 0
+}
+
+riak_cs_restart()
+{
+	riak_cs_stop
+	riak_cs_start
+	return 0
+}
+
+riak_cs_status()
+{
+	if riak_cs_running; then
+		echo "Riak is running."
+		return 0
+	else
+		echo "Riak is not running"
+		return 1
+	fi
+}
+
+riak_cs_running()
+{
+	local pid result ps
+	pid=`%%PREFIX%%/sbin/riak-cs getpid`
+	result=`echo $?`
+	if [ "$result" == 0 ]; then
+		ps=`ps -waux | grep ${pid} | grep riak-cs`
+		result=`echo $?`
+		if [ "$result" ]; then
+			return 0
+		else
+			return 1
+		fi
+	else
+		return 1
+	fi
+}
+
+run_rc_command "$1"

Property changes on: head/sysutils/riak-cs/files/riak_cs.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property