Index: branches/2016Q3/www/h2o/Makefile
===================================================================
--- branches/2016Q3/www/h2o/Makefile	(revision 422135)
+++ branches/2016Q3/www/h2o/Makefile	(revision 422136)
@@ -1,70 +1,70 @@
 # Created by: Dave Cottlehuber <dch@skunkwerks.at>
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.4
 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}
 
 OPTIONS_DEFINE=	LIBRESSL
 LIBRESSL_DESC=	Build with bundled LibreSSL instead of OpenSSL
 OPTIONS_DEFAULT=	LIBRESSL
 
 CMAKE_ARGS+=	-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBRESSL}
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
 WITH_OPENSSL_PORT=	no
 .else
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
 WITH_OPENSSL_PORT=	yes
 .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: branches/2016Q3/www/h2o/distinfo
===================================================================
--- branches/2016Q3/www/h2o/distinfo	(revision 422135)
+++ branches/2016Q3/www/h2o/distinfo	(revision 422136)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464775587
-SHA256 (h2o-h2o-v2.0.0_GH0.tar.gz) = 068cc88fe7313ea3c637764abc296629f6c9250e12b714f5629065bdc49d28c8
-SIZE (h2o-h2o-v2.0.0_GH0.tar.gz) = 15007086
+TIMESTAMP = 1473753131
+SHA256 (h2o-h2o-v2.0.4_GH0.tar.gz) = c0efa18f0ffb0f68ee4b60a6ed1feb54c770458c59e48baa2d9d0906ef9c68c0
+SIZE (h2o-h2o-v2.0.4_GH0.tar.gz) = 15015392
Index: branches/2016Q3
===================================================================
--- branches/2016Q3	(revision 422135)
+++ branches/2016Q3	(revision 422136)

Property changes on: branches/2016Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r422122