- Upgrade to 0.3.4.

6 files changed, 112 insertions, 9 deletions

diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index a90dfd33015b..819629a4cab4 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	kumofs
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://cloud.github.com/downloads/etolabo/kumofs/
 MASTER_SITE_SUBDIR=	kuriyama
-DISTNAME=	kumofs-${GIT_REVISION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Scalable and highly available distributed key-value store
@@ -19,7 +19,6 @@ LIB_DEPENDS=	msgpack:${PORTSDIR}/devel/msgpack \
 		tokyocabinet:${PORTSDIR}/databases/tokyocabinet
 RUN_DEPENDS=	rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
 
-WRKSRC=		${WRKDIR}/etolabo-kumofs-${GIT_REVISION}
 USE_AUTOTOOLS=	libtool:22 autoheader:262 autoconf:262 automake:110 aclocal:110
 ACLOCAL_ARGS=	# empty
 AUTOMAKE_ARGS=	--add-missing --copy
@@ -27,8 +26,12 @@ CONFIGURE_ARGS=	--with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
 USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_RUBY=	yes
-
-GIT_REVISION=	03cb7f8
+USE_RC_SUBR=	kumofs-manager.sh kumofs-server.sh kumofs-gateway.sh
+PIDDIR?=	/var/run/kumofs
+LOGDIR?=	/var/log/kumofs
+PLIST_SUB=	PIDDIR=${PIDDIR} LOGDIR=${LOGDIR}
+USERS=		kumofs
+GROUPS=		kumofs
 
 MAN1=	kumo-gateway.1 \
 	kumo-manager.1 \
@@ -44,6 +47,13 @@ pre-configure:
 	cd ${WRKSRC}; ${TOUCH} README
 	cd ${WRKSRC}; ${LIBTOOLIZE} --force --copy
 
+post-install:
+	${MKDIR} ${PIDDIR}
+	${CHOWN} ${USERS}:${GROUPS} ${PIDDIR}
+	${MKDIR} ${LOGDIR}
+	${CHOWN} ${USERS}:${GROUPS} ${LOGDIR}
+	${ECHO} "@exec ${CHOWN} ${USERS}:${GROUPS} ${PIDDIR} ${LOGDIR}" >> ${TMPPLIST}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
diff --git a/databases/kumofs/distinfo b/databases/kumofs/distinfo
index 3d961fd6772a..cc9c554ffd28 100644
--- a/databases/kumofs/distinfo
+++ b/databases/kumofs/distinfo
@@ -1,3 +1,3 @@
-MD5 (kumofs-03cb7f8.tar.gz) = 3bde4ac432a363602501024c2cb901bd
-SHA256 (kumofs-03cb7f8.tar.gz) = 893a5d218ba2dceb06ca2dee2a8531066887c0f7fc16ca2810747ca4332f31bc
-SIZE (kumofs-03cb7f8.tar.gz) = 154913
+MD5 (kumofs-0.3.4.tar.gz) = 74a3ea2fdca7350024d71b7f32a50c63
+SHA256 (kumofs-0.3.4.tar.gz) = 07729b6a7f082e6ab1c79dcac2089601716f9e43da47d764da1dfaa099d523f0
+SIZE (kumofs-0.3.4.tar.gz) = 524573
diff --git a/databases/kumofs/files/kumofs-gateway.sh.in b/databases/kumofs/files/kumofs-gateway.sh.in
new file mode 100644
index 000000000000..ccc2e9f8853b
--- /dev/null
+++ b/databases/kumofs/files/kumofs-gateway.sh.in
@@ -0,0 +1,29 @@
+#!/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.sh.in b/databases/kumofs/files/kumofs-manager.sh.in
new file mode 100644
index 000000000000..e1cea3296ef4
--- /dev/null
+++ b/databases/kumofs/files/kumofs-manager.sh.in
@@ -0,0 +1,29 @@
+#!/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.sh.in b/databases/kumofs/files/kumofs-server.sh.in
new file mode 100644
index 000000000000..6429d72e2f5c
--- /dev/null
+++ b/databases/kumofs/files/kumofs-server.sh.in
@@ -0,0 +1,31 @@
+#!/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"
diff --git a/databases/kumofs/pkg-plist b/databases/kumofs/pkg-plist
index 77052ef507f4..16543da0b9f5 100644
--- a/databases/kumofs/pkg-plist
+++ b/databases/kumofs/pkg-plist
@@ -7,3 +7,7 @@ bin/kumolog
 bin/kumomergedb
 bin/kumostat
 bin/kumotop
+@exec mkdir %%PIDDIR%%
+@exec mkdir %%LOGDIR%%
+@dirrmtry %%PIDDIR%%
+@dirrmtry %%LOGDIR%%