Index: head/www/h2o/Makefile
===================================================================
--- head/www/h2o/Makefile	(revision 440216)
+++ head/www/h2o/Makefile	(revision 440217)
@@ -1,75 +1,74 @@
 # Created by: Dave Cottlehuber <dch@skunkwerks.at>
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
 MAINTAINER=	dch@skunkwerks.at
 COMMENT=	Optimized HTTP2 server with support for HTTP/1.x
 
 LICENSE=	MIT
 
 USE_GITHUB=	yes
 
 USES=		cmake compiler:c11 cpe perl5 shebangfix ssl
 CPE_VENDOR=	h2o_project
 USE_PERL5=	run
 SHEBANG_FILES=	share/h2o/start_server
 
 PORTDOCS=	README.md
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST+=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 PLIST_SUB=	H2O_USER=${H2O_USER} \
 		H2O_GROUP=${H2O_GROUP} \
 		H2O_LOGDIR=${H2O_LOGDIR}
 
 H2O_USER?=	www
 H2O_GROUP?=	www
 
 H2O_LOGDIR=	/var/log/${PORTNAME}/
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		MRUBY
 OPTIONS_DEFAULT=	MRUBY
 OPTIONS_SUB=		yes
 MRUBY_DESC=		Build with mruby handler support
 
 CMAKE_ARGS+=		-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON -DWITH_BUNDLED_SSL=OFF
 CMAKE_VERBOSE=		yes
 
 .include <bsd.port.options.mk>
 
 MRUBY_CMAKE_ON=		-DWITH_MRUBY=ON
 MRUBY_CMAKE_OFF=	-DWITH_MRUBY=OFF
 
 .if ${PORT_OPTIONS:MMRUBY}
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
-BUILD_DEPENDS+=	bison:devel/bison
+USES+=	bison
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \
 		${WRKSRC}/share/h2o/annotate-backtrace-symbols \
 		${WRKSRC}/share/h2o/fetch-ocsp-response \
 		${WRKSRC}/share/h2o/kill-on-close \
 		${WRKSRC}/share/h2o/start_server
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${H2O_LOGDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} \
 		${FILESDIR}/${PORTNAME}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
Index: head/www/h2o/distinfo
===================================================================
--- head/www/h2o/distinfo	(revision 440216)
+++ head/www/h2o/distinfo	(revision 440217)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484725591
-SHA256 (h2o-h2o-v2.1.0_GH0.tar.gz) = 41f3853f3083c2fe8e70d3ab7be02c3de3c26fb77ba5fc56fdaf46712418b999
-SIZE (h2o-h2o-v2.1.0_GH0.tar.gz) = 15207573
+TIMESTAMP = 1492946918
+SHA256 (h2o-h2o-v2.2.2_GH0.tar.gz) = cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433
+SIZE (h2o-h2o-v2.2.2_GH0.tar.gz) = 16192602