7 files changed, 100 insertions, 91 deletions

diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index ed8184ee78a8..b5f9fe2756b6 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kumofs
 PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://cloud.github.com/downloads/etolabo/kumofs/
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
 USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_RUBY=	yes
-USE_RC_SUBR=	kumofs-manager.sh kumofs-server.sh kumofs-gateway.sh
+USE_RC_SUBR=	kumofs-manager kumofs-server kumofs-gateway
 PIDDIR?=	/var/run/kumofs
 LOGDIR?=	/var/log/kumofs
 PLIST_SUB=	PIDDIR=${PIDDIR} LOGDIR=${LOGDIR}
diff --git a/databases/kumofs/files/kumofs-gateway.in b/databases/kumofs/files/kumofs-gateway.in
new file mode 100644
index 000000000000..ce6d170ec489
--- /dev/null
+++ b/databases/kumofs/files/kumofs-gateway.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: kumofs-gateway
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# kumofs_gateway_enable="YES"
+# kumofs_gateway_addr="client1"
+# kumofs_gateway_manager_local_addr="manager1"
+# kumofs_gateway_manager_partner_addr="manager2"
+# kumofs_gateway_extra_flags="-v -t 11411"
+#
+
+. /etc/rc.subr
+
+name="kumofs_gateway"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+# Set defaults
+: ${kumofs_gateway_enable="NO"}
+: ${kumofs_gateway_pid="/var/run/kumofs/gateway.pid"}
+: ${kumofs_gateway_flags="-m ${kumofs_gateway_manager_local_addr} -p ${kumofs_gateway_manager_partner_addr} -d ${kumofs_gateway_pid} -o /var/log/kumofs/gateway.log ${kumofs_gateway_extra_flags}"}
+: ${kumofs_gateway_user="kumofs"}
+
+command=%%PREFIX%%/bin/kumo-gateway
+
+run_rc_command "$1"
diff --git a/databases/kumofs/files/kumofs-gateway.sh.in b/databases/kumofs/files/kumofs-gateway.sh.in
deleted file mode 100644
index ccc2e9f8853b..000000000000
--- a/databases/kumofs/files/kumofs-gateway.sh.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: kumofs-gateway
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-. %%RC_SUBR%%
-
-name=kumofs_gateway
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-# Set defaults
-: ${kumofs_gateway_enable:="NO"}
-: ${kumofs_gateway_addr:=""}
-: ${kumofs_gateway_manager_local_addr:=""}
-: ${kumofs_gateway_manager_partner_addr:=""}
-: ${kumofs_gateway_extra_flags:=""}
-: ${kumofs_gateway_pid:="/var/run/kumofs/gateway.pid"}
-: ${kumofs_gateway_flags:="-m ${kumofs_gateway_manager_local_addr} -p ${kumofs_gateway_manager_partner_addr} -d ${kumofs_gateway_pid} -o /var/log/kumofs/gateway.log ${kumofs_gateway_extra_flags}"}
-: ${kumofs_gateway_user:="kumofs"}
-
-command=%%PREFIX%%/bin/kumo-gateway
-
-run_rc_command "$1"
diff --git a/databases/kumofs/files/kumofs-manager.in b/databases/kumofs/files/kumofs-manager.in
new file mode 100644
index 000000000000..36ebaab8937f
--- /dev/null
+++ b/databases/kumofs/files/kumofs-manager.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: kumofs-manager
+# REQUIRE: LOGIN
+# BEFORE: kumofs-server
+# KEYWORD: shutdown
+#
+# kumofs_manager_enable="YES"
+# kumofs_manager_local_addr="manager1"
+# kumofs_manager_partner_addr="manager2"
+# kumofs_manager_extra_flags="-v"
+#
+. /etc/rc.subr
+
+name="kumofs_manager"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+# Set defaults
+: ${kumofs_manager_enable="NO"}
+: ${kumofs_manager_pid="/var/run/kumofs/manager.pid"}
+: ${kumofs_manager_flags="-l ${kumofs_manager_local_addr} -p ${kumofs_manager_partner_addr} -d ${kumofs_manager_pid} -o /var/log/kumofs/manager.log ${kumofs_manager_extra_flags}"}
+: ${kumofs_manager_user="kumofs"}
+
+command=%%PREFIX%%/bin/kumo-manager
+
+run_rc_command "$1"
diff --git a/databases/kumofs/files/kumofs-manager.sh.in b/databases/kumofs/files/kumofs-manager.sh.in
deleted file mode 100644
index e1cea3296ef4..000000000000
--- a/databases/kumofs/files/kumofs-manager.sh.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: kumofs-manager
-# REQUIRE: DAEMON
-# BEFORE: kumofs-server
-# KEYWORD: shutdown
-
-. %%RC_SUBR%%
-
-name=kumofs_manager
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-# Set defaults
-: ${kumofs_manager_enable:="NO"}
-: ${kumofs_manager_local_addr:=""}
-: ${kumofs_manager_partner_addr:=""}
-: ${kumofs_manager_extra_flags:=""}
-: ${kumofs_manager_pid:="/var/run/kumofs/manager.pid"}
-: ${kumofs_manager_flags:="-l ${kumofs_manager_local_addr} -p ${kumofs_manager_partner_addr} -d ${kumofs_manager_pid} -o /var/log/kumofs/manager.log ${kumofs_manager_extra_flags}"}
-: ${kumofs_manager_user:="kumofs"}
-
-command=%%PREFIX%%/bin/kumo-manager
-
-run_rc_command "$1"
diff --git a/databases/kumofs/files/kumofs-server.in b/databases/kumofs/files/kumofs-server.in
new file mode 100644
index 000000000000..4437817cd2bc
--- /dev/null
+++ b/databases/kumofs/files/kumofs-server.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: kumofs-server
+# REQUIRE: LOGIN
+# BEFORE: kumofs-gateway
+# KEYWORD: shutdown
+#
+# kumofs_server_enable="YES"
+# kumofs_server_addr="server1"
+# kumofs_server_db="/var/db/kumofs/db.tch"
+# kumofs_server_manager_local_addr="manager1"
+# kumofs_server_manager_partner_addr="manager2"
+# kumofs_server_extra_flags=""
+#
+
+. /etc/rc.subr
+
+name="kumofs_server"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+# Set defaults
+: ${kumofs_server_enable="NO"}
+: ${kumofs_server_db="/var/db/kumofs.tch"}
+: ${kumofs_server_pid="/var/run/kumofs/server.pid"}
+: ${kumofs_server_flags="-m ${kumofs_server_manager_local_addr} -p ${kumofs_server_manager_partner_addr} -l ${kumofs_server_addr} -d ${kumofs_server_pid} -o /var/log/kumofs/server.log -s ${kumofs_server_db} ${kumofs_server_extra_flags}"}
+: ${kumofs_server_user="kumofs"}
+
+command=%%PREFIX%%/bin/kumo-server
+
+run_rc_command "$1"
diff --git a/databases/kumofs/files/kumofs-server.sh.in b/databases/kumofs/files/kumofs-server.sh.in
deleted file mode 100644
index 6429d72e2f5c..000000000000
--- a/databases/kumofs/files/kumofs-server.sh.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: kumofs-server
-# REQUIRE: DAEMON
-# BEFORE: kumofs-gateway
-# KEYWORD: shutdown
-
-. %%RC_SUBR%%
-
-name=kumofs_server
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-# Set defaults
-: ${kumofs_server_enable:="NO"}
-: ${kumofs_server_addr:=""}
-: ${kumofs_server_db:="/var/db/kumofs.tch"}
-: ${kumofs_server_manager_local_addr:=""}
-: ${kumofs_server_manager_partner_addr:=""}
-: ${kumofs_server_extra_flags:=""}
-: ${kumofs_server_pid:="/var/run/kumofs/server.pid"}
-: ${kumofs_server_flags:="-m ${kumofs_server_manager_local_addr} -p ${kumofs_server_manager_partner_addr} -l ${kumofs_server_addr} -d ${kumofs_server_pid} -o /var/log/kumofs/server.log -s ${kumofs_server_db} ${kumofs_server_extra_flags}"}
-: ${kumofs_server_user:="kumofs"}
-
-command=%%PREFIX%%/bin/kumo-server
-
-run_rc_command "$1"