Index: head/www/h2o/Makefile
===================================================================
--- head/www/h2o/Makefile	(revision 403879)
+++ head/www/h2o/Makefile	(revision 403880)
@@ -1,59 +1,59 @@
 # Created by: Dave Cottlehuber <dch@skunkwerks.at>
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6.0
 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 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}
 
 .include <bsd.port.options.mk>
 
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
 USE_OPENSSL_PORT=	yes
 
 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 403879)
+++ head/www/h2o/distinfo	(revision 403880)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.5.3_GH0.tar.gz) = 93bbfac7f781b82a276a69b2bc331782c4020f8c877ec6c8ca6a4f9addb42922
-SIZE (h2o-h2o-v1.5.3_GH0.tar.gz) = 6264687
+SHA256 (h2o-h2o-v1.6.0_GH0.tar.gz) = 5c8b96ac9e930fbd563359323413e3e08057fe850e515eb41c3bfff896a78593
+SIZE (h2o-h2o-v1.6.0_GH0.tar.gz) = 6279605
Index: head/www/h2o/pkg-plist
===================================================================
--- head/www/h2o/pkg-plist	(revision 403879)
+++ head/www/h2o/pkg-plist	(revision 403880)
@@ -1,38 +1,39 @@
 bin/h2o
 share/h2o/annotate-backtrace-symbols
 share/h2o/fetch-ocsp-response
 share/h2o/kill-on-close
 share/h2o/start_server
 %%DATADIR%%/setuidgid
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
 %%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/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/command_options.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/gzip_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
 %%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.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/syntax_and_structure.html
 %%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
 @sample %%ETCDIR%%/h2o.conf.sample