Import of pkgsrc-2016Q3

www/h2o/Makefile

@@ -1,23 +1,39 @@
-# $NetBSD: Makefile,v 1.5 2015/06/12 10:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/17 11:10:23 mef Exp $
 
-DISTNAME=	h2o-1.2.0
-PKGREVISION=	1
+DISTNAME=	h2o-2.0.4
 CATEGORIES=	www
-MASTER_SITES=	-https://github.com/h2o/h2o/archive/v1.2.0${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=h2o/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://github.com/h2o/h2o
 COMMENT=	Optimized HTTP server with support for HTTP/1.x and HTTP/2
 LICENSE=	mit
 
-USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-USE_TOOLS+=	perl:run
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		perl:run pkg-config
+PKGCONFIG_OVERRIDE+=	libh2o-evloop.pc.in
+PKGCONFIG_OVERRIDE+=	libh2o.pc.in
 
-EXTRACT_USING=	gtar
-REPLACE_PERL=	share/h2o/start_server
+CMAKE_ARGS+=		-DWITH_BUNDLED_SSL=off
+# TODO: make it an option
+CMAKE_ARGS+=		-DWITH_MRUBY=off
 
-.include "../../textproc/libyaml/buildlink3.mk"
+SUBST_CLASSES+=		interp
+SUBST_STAGE.interp=	post-extract
+SUBST_MESSAGE.interp=	Fixing interpreter.
+SUBST_FILES.interp=	share/h2o/*
+SUBST_SED.interp=	-e 's,^\#\! /bin/sh,\#\!/bin/perl,'
+SUBST_SED.interp+=	-e '/^exec perl/d'
+SUBST_SED.interp+=	-e '/\#\! perl/d'
+
+REPLACE_PERL=		share/h2o/*
+
+.include "../../devel/libuv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libyaml/buildlink3.mk"
+.include "../../www/wslay/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

www/h2o/PLIST

@@ -1,4 +1,93 @@
-@comment $NetBSD: PLIST,v 1.2 2015/05/20 02:06:29 wen Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/02 17:39:41 schmonz Exp $
 bin/h2o
+include/h2o.h
+include/h2o/cache.h
+include/h2o/configurator.h
+include/h2o/file.h
+include/h2o/filecache.h
+include/h2o/hostinfo.h
+include/h2o/http1.h
+include/h2o/http1client.h
+include/h2o/http2.h
+include/h2o/http2_casper.h
+include/h2o/http2_internal.h
+include/h2o/http2_scheduler.h
+include/h2o/linklist.h
+include/h2o/memcached.h
+include/h2o/memory.h
+include/h2o/mruby_.h
+include/h2o/multithread.h
+include/h2o/serverutil.h
+include/h2o/socket.h
+include/h2o/socket/evloop.h
+include/h2o/socket/uv-binding.h
+include/h2o/socketpool.h
+include/h2o/string_.h
+include/h2o/time_.h
+include/h2o/timeout.h
+include/h2o/token.h
+include/h2o/tunnel.h
+include/h2o/url.h
+include/h2o/version.h
+include/h2o/websocket.h
+lib/libh2o-evloop.a
+lib/libh2o.a
+lib/pkgconfig/libh2o-evloop.pc
+lib/pkgconfig/libh2o.pc
+share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png
+share/doc/h2o/assets/firstpaintbench.png
+share/doc/h2o/assets/remotebench.png
+share/doc/h2o/assets/searchstyle.css
+share/doc/h2o/assets/staticfile612-nginx1910-h2o170.png
+share/doc/h2o/assets/style.css
+share/doc/h2o/benchmarks.html
+share/doc/h2o/configure.html
+share/doc/h2o/configure/access_log_directives.html
+share/doc/h2o/configure/base_directives.html
+share/doc/h2o/configure/basic_auth.html
+share/doc/h2o/configure/cgi.html
+share/doc/h2o/configure/command_options.html
+share/doc/h2o/configure/compress_directives.html
+share/doc/h2o/configure/errordoc_directives.html
+share/doc/h2o/configure/expires_directives.html
+share/doc/h2o/configure/fastcgi_directives.html
+share/doc/h2o/configure/file_directives.html
+share/doc/h2o/configure/headers_directives.html
+share/doc/h2o/configure/http1_directives.html
+share/doc/h2o/configure/http2_directives.html
+share/doc/h2o/configure/mruby.html
+share/doc/h2o/configure/mruby_directives.html
+share/doc/h2o/configure/proxy_directives.html
+share/doc/h2o/configure/quick_start.html
+share/doc/h2o/configure/redirect_directives.html
+share/doc/h2o/configure/reproxy_directives.html
+share/doc/h2o/configure/status_directives.html
+share/doc/h2o/configure/syntax_and_structure.html
+share/doc/h2o/examples/doc_root.alternate/index.txt
+share/doc/h2o/examples/doc_root/index.html
+share/doc/h2o/examples/h2o/alternate.crt
+share/doc/h2o/examples/h2o/alternate.key
+share/doc/h2o/examples/h2o/h2o.conf
+share/doc/h2o/examples/h2o/server.crt
+share/doc/h2o/examples/h2o/server.key
+share/doc/h2o/examples/h2o_mruby/h2o.conf
+share/doc/h2o/examples/h2o_mruby/hello.rb
+share/doc/h2o/examples/libh2o/http1client.c
+share/doc/h2o/examples/libh2o/simple.c
+share/doc/h2o/examples/libh2o/socket-client.c
+share/doc/h2o/examples/libh2o/websocket.c
+share/doc/h2o/faq.html
+share/doc/h2o/index.html
+share/doc/h2o/install.html
+share/doc/h2o/search/jquery-1.9.1.min.js
+share/doc/h2o/search/oktavia-english-search.js
+share/doc/h2o/search/oktavia-jquery-ui.js
+share/doc/h2o/search/searchindex.js
+share/h2o/annotate-backtrace-symbols
+share/h2o/ca-bundle.crt
+share/h2o/fastcgi-cgi
 share/h2o/fetch-ocsp-response
+share/h2o/kill-on-close
+share/h2o/setuidgid
 share/h2o/start_server
+share/h2o/status/index.html

www/h2o/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/05/20 02:06:29 wen Exp $
+$NetBSD: distinfo,v 1.8 2016/09/17 11:10:23 mef Exp $
 
-SHA1 (h2o-1.2.0.tar.gz) = e3db95a5355227a286b4e54f7b316bc250d7f917
-RMD160 (h2o-1.2.0.tar.gz) = c6224294a98cadde0ec81a47f5065082a556c5eb
-Size (h2o-1.2.0.tar.gz) = 4155709 bytes
+SHA1 (h2o-2.0.4.tar.gz) = 31137ba524ae5281061c6a91cdc756d06d86e8ce
+RMD160 (h2o-2.0.4.tar.gz) = 82ec01957d187a076c1c0e39ab045870ea31a6c8
+SHA512 (h2o-2.0.4.tar.gz) = 5d8317a65c77294c8bc5388b65905aa614726ee0630705e70c7d419684f303e3006fa77d54e4c28dbdf3cde522324a03b318513e4de304cf5712ca44ad1a89c7
+Size (h2o-2.0.4.tar.gz) = 15015392 bytes