Index: databases/kyototycoon/Makefile
===================================================================
--- databases/kyototycoon/Makefile
+++ databases/kyototycoon/Makefile
@@ -25,9 +25,9 @@
 MAKE_ARGS=	PCDIR=${PREFIX}/libdata/pkgconfig
 REINPLACE_ARGS=	-i ''
 TEST_TARGET=	check
+USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
-USES=		gmake pkgconfig
 
 PLIST_SUB=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
 		KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
Index: databases/kyototycoon/files/kyototycoon.in
===================================================================
--- databases/kyototycoon/files/kyototycoon.in
+++ databases/kyototycoon/files/kyototycoon.in
@@ -5,7 +5,7 @@
 # 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:
 #
@@ -20,21 +20,21 @@
 # kyototycoon_opts      (args):   Additional command-line arguments.
 
 . /etc/rc.subr
-
-name="kyototycoon"
+name=kyototycoon
 rcvar=kyototycoon_enable
+desc="Replicating key-value datastore with HTTP and binary API"
 
 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"}
+: ${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=/usr/sbin/daemon
 command_args="-f -c -r -t ${name} -P ${pidfile} \
     %%PREFIX%%/bin/ktserver \
     -bgs ${kyototycoon_dbdir}/snapshots \
@@ -42,15 +42,11 @@
     -log ${kyototycoon_log} \
     -sid ${kyototycoon_sid} \
     ${kyototycoon_opts}"
-pidfile="%%KYOTOTYCOON_PIDFILE%%"
+pidfile=%%KYOTOTYCOON_PIDFILE%%
 
 required_dirs="${kyototycoon_dbdir}/snapshots ${kyototycoon_dbdir}/updates"
-required_files="${kyototycoon_log}"
+required_files=${kyototycoon_log}
 
-kyototycoon_prestart()
-{
-    install -o ${kyototycoon_user} /dev/null ${pidfile}
-}
-start_precmd=${name}_prestart
+start_precmd="install -o ${kyototycoon_user} /dev/null ${pidfile}"
 
 run_rc_command "$1"
Index: www/h2o/Makefile
===================================================================
--- www/h2o/Makefile
+++ www/h2o/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	h2o
 PORTVERSION=	2.2.2
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	dch@skunkwerks.at
@@ -12,10 +12,10 @@
 
 LICENSE=	MIT
 
-USE_GITHUB=	yes
-
 USES=		cmake:noninja compiler:c11 cpe perl5 shebangfix ssl
 CPE_VENDOR=	h2o_project
+
+USE_GITHUB=	yes
 USE_PERL5=	run
 SHEBANG_FILES=	share/h2o/start_server
 
Index: www/h2o/files/h2o.in
===================================================================
--- www/h2o/files/h2o.in
+++ www/h2o/files/h2o.in
@@ -20,11 +20,14 @@
 
 name=h2o
 rcvar=h2o_enable
+desc="An HTTP/2 high-performance webserver"
 
+load_rc_config $name
+
 # defaults
-: ${h2o_enable:="NO"}
-: ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}
-: ${h2o_perl:="%%LOCALBASE%%/bin/perl"}
+: ${h2o_enable:=NO}
+: ${h2o_config:=%%PREFIX%%/etc/${name}/${name}.conf}
+: ${h2o_perl:=%%LOCALBASE%%/bin/perl}
 
 # daemon
 pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
@@ -34,7 +37,6 @@
 procname="%%LOCALBASE%%/bin/perl"
 
 # support SIGHUP to reload configuration file
-extra_commands="reload"
+extra_commands=reload
 
-load_rc_config $name
 run_rc_command "$1"