Index: head/databases/kyototycoon/Makefile
===================================================================
--- head/databases/kyototycoon/Makefile	(revision 462065)
+++ head/databases/kyototycoon/Makefile	(revision 462066)
@@ -1,68 +1,68 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kyototycoon
 PORTVERSION=	0.9.56
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Handy cache/storage server
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 OPTIONS_DEFINE=	DOCS LZO
 
 CONFIGURE_ARGS=	--enable-uyield
 CPPFLAGS+=	-fPIC
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 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
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libkyototycoon.so.2.19.0 ${STAGEDIR}${PREFIX}/libexec/*.so
 
 post-install-DOCS-on:
 	${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} ${BINMODE} {} \;
 	${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} ${DOCMODE} {} \;
 
 .include <bsd.port.mk>
Index: head/databases/kyototycoon/files/kyototycoon.in
===================================================================
--- head/databases/kyototycoon/files/kyototycoon.in	(revision 462065)
+++ head/databases/kyototycoon/files/kyototycoon.in	(revision 462066)
@@ -1,56 +1,57 @@
 #!/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"}
 
+pidfile="%%KYOTOTYCOON_PIDFILE%%"
+
 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"