4 files changed, 80 insertions, 3 deletions

diff --git a/GIDs b/GIDs
index 9cf98eb79641..ba8cc04a34ea 100644
--- a/GIDs
+++ b/GIDs
@@ -155,7 +155,7 @@ shoutcast:*:210:
 git:*:211:
 hg:*:212:
 drizzle:*:213:
-# free: 214
+kyototycoon:*:214:
 opendnssec:*:215:
 nsd:*:216:
 # free: 217
diff --git a/UIDs b/UIDs
index d342090c4579..bee9ac7a21dc 100644
--- a/UIDs
+++ b/UIDs
@@ -160,7 +160,7 @@ shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh
 git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh
 hg:*:212:212::0:0:mercurial-server user:/usr/local/hg:/bin/sh
 drizzle:*:213:213::0:0:Drizzle daemon:/var/db/drizzle:/usr/sbin/nologin
-# free: 214
+kyototycoon:*:214:214::0:0:kyototycoon user:/var/empty:/usr/sbin/nologin
 opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
 nsd:*:216:216::0:0:NSD DNS Server:/nonexistent:/usr/sbin/nologin
 # free: 217
diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile
index 43f4db831c2b..d437fcf28c1e 100644
--- a/databases/kyototycoon/Makefile
+++ b/databases/kyototycoon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyototycoon
 PORTVERSION=	0.9.56
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/ \
 		LOCAL/sunpoet
@@ -26,9 +26,30 @@ MAKE_ARGS=	PCDIR=${PREFIX}/libdata/pkgconfig
 REINPLACE_ARGS=	-i ''
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
+USE_RC_SUBR=	${PORTNAME}
 USES=		gmake pkgconfig
 
+PLIST_SUB=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
+		KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
+		KYOTOTYCOON_DBDIR=${KYOTOTYCOON_DBDIR} \
+		KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR} \
+		KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE}
 PORTDOCS=	*
+SUB_FILES=	${PORTNAME}
+SUB_LIST=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
+		KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
+		KYOTOTYCOON_DBDIR=${KYOTOTYCOON_DBDIR} \
+		KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR} \
+		KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE}
+
+USERS=		${KYOTOTYCOON_USER}
+GROUPS=		${KYOTOTYCOON_GROUP}
+
+KYOTOTYCOON_USER?=	${PORTNAME}
+KYOTOTYCOON_GROUP?=	${PORTNAME}
+KYOTOTYCOON_DBDIR?=	/var/db/${PORTNAME}
+KYOTOTYCOON_LOGDIR?=	/var/log/${PORTNAME}
+KYOTOTYCOON_PIDFILE?=	/var/run/${PORTNAME}.pid
 
 LZO_CONFIGURE_OFF=	ac_cv_lib_lzo2_main=no
 LZO_CONFIGURE_ON=	ac_cv_lib_lzo2_main=yes
diff --git a/databases/kyototycoon/files/kyototycoon.in b/databases/kyototycoon/files/kyototycoon.in
new file mode 100644
index 000000000000..fa45f0efb9c6
--- /dev/null
+++ b/databases/kyototycoon/files/kyototycoon.in
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: kyototycoon
+# REQUIRE: LOGIN NETWORKING SERVERS
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# kyototycoon_enable    (bool):   Set to NO by default.
+# Set it to YES to enable kyototycoon.
+#
+# kyototycoon_user      (user):   Set to kyototycoon by default.
+# kyototycoon_group     (group):  Set to kyototycoon by default.
+# kyototycoon_dbdir     (path):   Path to database files.
+# kyototycoon_log       (path):   Path to log file.
+# kyototycoon_sid       (int):    ServerID - 0-65535
+# kyototycoon_opts      (args):   Additional command-line arguments.
+
+. /etc/rc.subr
+
+name="kyototycoon"
+rcvar=kyototycoon_enable
+
+load_rc_config $name
+
+: ${kyototycoon_enable="NO"}
+: ${kyototycoon_user:="%%KYOTOTYCOON_USER%%"}
+: ${kyototycoon_group:="%%KYOTOTYCOON_GROUP%%"}
+: ${kyototycoon_dbdir="%%KYOTOTYCOON_DBDIR%%"}
+: ${kyototycoon_log="%%KYOTOTYCOON_LOGDIR%%/kyoto.log"}
+: ${kyototycoon_sid="1"}
+: ${kyototycoon_opts:=" -li"}
+
+command="/usr/sbin/daemon"
+command_args="-f -c -r -t ${name} -P ${pidfile} \
+    %%PREFIX%%/bin/ktserver \
+    -bgs ${kyototycoon_dbdir}/snapshots \
+    -ulog ${kyototycoon_dbdir}/updates \
+    -log ${kyototycoon_log} \
+    -sid ${kyototycoon_sid} \
+    ${kyototycoon_opts}"
+pidfile="%%KYOTOTYCOON_PIDFILE%%"
+
+required_dirs="${kyototycoon_dbdir}/snapshots ${kyototycoon_dbdir}/updates"
+required_files="${kyototycoon_log}"
+
+kyototycoon_prestart()
+{
+    install -o ${kyototycoon_user} /dev/null ${pidfile}
+}
+start_precmd=${name}_prestart
+
+run_rc_command "$1"