svn commit: r386743 - head/www/h2o

[Wen Heping]

Author: wen
Date: Tue May 19 06:10:28 2015
New Revision: 386743
URL: https://svnweb.freebsd.org/changeset/ports/386743

Log:
  - Update to 1.2.0
  
  PR:		198573
  Submitted by:	anonymous.bug.report at gmail.com
  Approved by:	dch at skunkwerks.at(maintainer)

Modified:
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/pkg-plist

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Tue May 19 05:40:21 2015	(r386742)
+++ head/www/h2o/Makefile	Tue May 19 06:10:28 2015	(r386743)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.0.1
+PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -11,15 +11,9 @@ COMMENT=	Optimized HTTP2 server with sup
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-
 USE_GITHUB=	yes
-GH_ACCOUNT=	h2o
-
-MAKE_JOBS_UNSAFE=	yes
-USES=	cmake:outsource compiler:c11
 
-USE_OPENSSL=	yes
+USES=		cmake compiler:c11
 
 PORTDOCS=	README.md
 
@@ -42,7 +36,16 @@ H2O_PIDDIR=	/var/run/${PORTNAME}/
 
 USE_RC_SUBR=	${PORTNAME}
 
-do-install:
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} < 900000
+BROKEN=		fails to compile on 8.x
+.endif
+
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
+USE_OPENSSL_PORT=	yes
+
+post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${H2O_PIDDIR} \
@@ -51,12 +54,5 @@ do-install:
 	${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>

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Tue May 19 05:40:21 2015	(r386742)
+++ head/www/h2o/distinfo	Tue May 19 06:10:28 2015	(r386743)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.0.1_GH0.tar.gz) = c8454c191104876ebaca1351fa52dbf1bb19c5f998ae959010c1a533a1bef827
-SIZE (h2o-h2o-v1.0.1_GH0.tar.gz) = 782867
+SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
+SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709

Modified: head/www/h2o/pkg-plist
==============================================================================
--- head/www/h2o/pkg-plist	Tue May 19 05:40:21 2015	(r386742)
+++ head/www/h2o/pkg-plist	Tue May 19 06:10:28 2015	(r386743)
@@ -1,5 +1,6 @@
 bin/h2o
+share/h2o/fetch-ocsp-response
+share/h2o/start_server
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
- at dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%ETCDIR%%
 @sample %%ETCDIR%%/h2o.conf.sample