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"