Index: head/www/h2o/Makefile
===================================================================
--- head/www/h2o/Makefile	(revision 428809)
+++ head/www/h2o/Makefile	(revision 428810)
@@ -1,71 +1,82 @@
 # Created by: Dave Cottlehuber <dch@skunkwerks.at>
 # $FreeBSD$
 
 PORTNAME=	h2o
 PORTVERSION=	2.0.4
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 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 perl5 shebangfix
 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=	LIBRESSL
+OPTIONS_DEFINE=	LIBRESSL MRUBY
+OPTIONS_DEFAULT=	LIBRESSL MRUBY
+OPTIONS_SUB=	yes
 LIBRESSL_DESC=	Build with bundled LibreSSL instead of OpenSSL
-OPTIONS_DEFAULT=	LIBRESSL
+MRUBY_DESC=	Build with mruby handler support
 
 CMAKE_ARGS+=	-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
 
 .include <bsd.port.options.mk>
 
+LIBRESSL_CMAKE_ON=	-DWITH_BUNDLED_SSL=ON
+LIBRESSL_CMAKE_OFF=	-DWITH_BUNDLED_SSL=OFF
+MRUBY_CMAKE_ON=		-DWITH_MRUBY=ON
+MRUBY_CMAKE_OFF=		-DWITH_MRUBY=OFF
+
 .if ${PORT_OPTIONS:MLIBRESSL}
-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
-WITH_OPENSSL_PORT=	no
+USES_SSL=	yes
 .else
-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
-WITH_OPENSSL_PORT=	yes
+USES_SSL=	no
+.endif
+
+.if ${PORT_OPTIONS:MMRUBY}
+USE_RUBY=	yes
+BUILD_DEPENDS+=	bison:devel/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/pkg-plist
===================================================================
--- head/www/h2o/pkg-plist	(revision 428809)
+++ head/www/h2o/pkg-plist	(revision 428810)
@@ -1,60 +1,61 @@
 bin/h2o
 share/h2o/annotate-backtrace-symbols
 share/h2o/fetch-ocsp-response
 share/h2o/kill-on-close
 share/h2o/start_server
 %%DATADIR%%/ca-bundle.crt
 %%DATADIR%%/fastcgi-cgi
 %%DATADIR%%/setuidgid
 %%DATADIR%%/status/index.html
-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
+%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
 %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
 %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
 %%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
 %%PORTDOCS%%%%DOCSDIR%%/assets/searchstyle.css
 %%PORTDOCS%%%%DOCSDIR%%/assets/staticfile612-nginx1910-h2o170.png
 %%PORTDOCS%%%%DOCSDIR%%/assets/style.css
 %%PORTDOCS%%%%DOCSDIR%%/benchmarks.html
 %%PORTDOCS%%%%DOCSDIR%%/configure.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
 %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
 %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/search/jquery-1.9.1.min.js
 %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
 %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
 %%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
+@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
 @sample %%ETCDIR%%/h2o.conf.sample