Index: www/h2o/Makefile
===================================================================
--- www/h2o/Makefile	(revision 383006)
+++ www/h2o/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.0.1
+PORTVERSION=	1.2.0
 CATEGORIES=	www
 
 MAINTAINER=	dch@skunkwerks.at
@@ -10,17 +10,14 @@
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	h2o
-GH_TAGNAME=	v1.0.1
-GH_COMMIT=	c28f39e
+GH_TAGNAME=	v1.2.0
+GH_COMMIT=	5203a7d
 
-MAKE_JOBS_UNSAFE=	yes
-USES=	cmake:outsource compiler:c11
+OPTIONS_DEFINE=	BUNDLED_LIBRESSL
 
-USE_OPENSSL=	yes
+USES=		cmake compiler:c11
 
 PORTDOCS=	README.md
 
@@ -43,7 +40,20 @@
 
 USE_RC_SUBR=	${PORTNAME}
 
-do-install:
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 900000
+BROKEN=	fails to compile on 8.x
+.endif
+
+.if ${PORT_OPTIONS:MBUNDLED_LIBRESSL}
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
+.else
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
+USE_OPENSSL=	yes
+.endif
+
+post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${H2O_PIDDIR} \
@@ -52,12 +62,5 @@
 	${INSTALL_DATA} \
 		${FILESDIR}/${PORTNAME}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
-	${INSTALL_PROGRAM} ${WRKDIR}/.build/h2o ${STAGEDIR}${PREFIX}/bin/h2o
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900000
-BROKEN=	fails to compile on 8.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/h2o/distinfo
===================================================================
--- www/h2o/distinfo	(revision 383006)
+++ www/h2o/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (h2o-1.0.1.tar.gz) = 44d8142482d0bd2a0a3ce904dafeb365c295883de263ed76891e9e264ca3669e
-SIZE (h2o-1.0.1.tar.gz) = 782916
+SHA256 (h2o-1.2.0.tar.gz) = 34f1e3ee079febbffc95bcf3a8b7cfbd51a949464ce5080bae505c54f7ee8c85
+SIZE (h2o-1.2.0.tar.gz) = 4156352
Index: www/h2o/pkg-plist
===================================================================
--- www/h2o/pkg-plist	(revision 383006)
+++ www/h2o/pkg-plist	(working copy)
@@ -1,5 +1,5 @@
 bin/h2o
+share/h2o/fetch-ocsp-response
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
-@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%ETCDIR%%
 @sample %%ETCDIR%%/h2o.conf.sample