Attachment #179967 for bug #217088




# $FreeBSD$

PORTNAME=	h2o
PORTVERSION=	2.1.0
PORTREVISION=	2
DISTVERSIONPREFIX=	v
CATEGORIES=	www



USE_GITHUB=	yes

USES=		cmake compiler:c11 cpe perl5 shebangfix ssl
CPE_VENDOR=	h2o_project
USE_PERL5=	run
SHEBANG_FILES=	share/h2o/start_server



USE_RC_SUBR=	${PORTNAME}

OPTIONS_DEFINE=		MRUBY
OPTIONS_DEFAULT=	MRUBY
OPTIONS_SUB=		yes
MRUBY_DESC=			Build with mruby handler support
MRUBY_DESC=	Build with mruby handler support

CMAKE_ARGS+=		-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
CMAKE_VERBOSE=		yes

.include <bsd.port.options.mk>

LIBRESSL_CMAKE_ON=	-DWITH_BUNDLED_SSL=ON
LIBRESSL_CMAKE_OFF=	-DWITH_BUNDLED_SSL=OFF
LIBRESSL_USES_OFF=	ssl
MRUBY_CMAKE_ON=		-DWITH_MRUBY=ON
MRUBY_CMAKE_OFF=	-DWITH_MRUBY=OFF

.if ${PORT_OPTIONS:MLIBRESSL}
USES_SSL=	yes
.else
USES_SSL=	no
.endif

.if ${PORT_OPTIONS:MMRUBY}
USE_RUBY=	yes
BUILD_DEPENDS+=	bison:devel/bison

Lines 1-3 Link Here

(-)www/h2o/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473753131	1	TIMESTAMP = 1484725591
2	SHA256 (h2o-h2o-v2.0.4_GH0.tar.gz) = c0efa18f0ffb0f68ee4b60a6ed1feb54c770458c59e48baa2d9d0906ef9c68c0	2	SHA256 (h2o-h2o-v2.1.0_GH0.tar.gz) = 41f3853f3083c2fe8e70d3ab7be02c3de3c26fb77ba5fc56fdaf46712418b999
3	SIZE (h2o-h2o-v2.0.4_GH0.tar.gz) = 15015392	3	SIZE (h2o-h2o-v2.1.0_GH0.tar.gz) = 15207573




--- CMakeLists.txt.orig	2017-01-17 23:43:27 UTC
+++ CMakeLists.txt
@@ -462,7 +462,8 @@ INSTALL(TARGETS h2o
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 IF (NOT WITHOUT_LIBS)
-    INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
+    INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h"
+        EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
     IF (LIBUV_FOUND)
         INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
     ENDIF ()

Return to bug 217088

Lines 2-9 Link Here

(-)www/h2o/Makefile (-19 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= h2o	4	PORTNAME= h2o
5	PORTVERSION= 2.0.4	5	PORTVERSION= 2.1.0
6	PORTREVISION= 2
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	CATEGORIES= www	7	CATEGORIES= www
9		8
Lines 14-20 Link Here
14		13
15	USE_GITHUB= yes	14	USE_GITHUB= yes
16		15
17	USES= cmake compiler:c11 perl5 shebangfix	16	USES= cmake compiler:c11 cpe perl5 shebangfix ssl
		17	CPE_VENDOR= h2o_project
18	USE_PERL5= run	18	USE_PERL5= run
19	SHEBANG_FILES= share/h2o/start_server	19	SHEBANG_FILES= share/h2o/start_server
20		20
Lines 36-63 Link Here
36		36
37	USE_RC_SUBR= ${PORTNAME}	37	USE_RC_SUBR= ${PORTNAME}
38		38
39	OPTIONS_DEFINE= LIBRESSL MRUBY	39	OPTIONS_DEFINE= MRUBY
40	OPTIONS_DEFAULT= LIBRESSL MRUBY	40	OPTIONS_DEFAULT= MRUBY
41	OPTIONS_SUB= yes	41	OPTIONS_SUB= yes
42	LIBRESSL_DESC= Build with bundled LibreSSL instead of OpenSSL	42	MRUBY_DESC= Build with mruby handler support
43	MRUBY_DESC= Build with mruby handler support
44		43
45	CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON	44	CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
		45	CMAKE_VERBOSE= yes
46		46
47	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
48		48
49	LIBRESSL_CMAKE_ON= -DWITH_BUNDLED_SSL=ON
50	LIBRESSL_CMAKE_OFF= -DWITH_BUNDLED_SSL=OFF
51	LIBRESSL_USES_OFF= ssl
52	MRUBY_CMAKE_ON= -DWITH_MRUBY=ON	49	MRUBY_CMAKE_ON= -DWITH_MRUBY=ON
53	MRUBY_CMAKE_OFF= -DWITH_MRUBY=OFF	50	MRUBY_CMAKE_OFF= -DWITH_MRUBY=OFF
54		51
55	.if ${PORT_OPTIONS:MLIBRESSL}
56	USES_SSL= yes
57	.else
58	USES_SSL= no
59	.endif
60
61	.if ${PORT_OPTIONS:MMRUBY}	52	.if ${PORT_OPTIONS:MMRUBY}
62	USE_RUBY= yes	53	USE_RUBY= yes
63	BUILD_DEPENDS+= bison:devel/bison	54	BUILD_DEPENDS+= bison:devel/bison

Lines 1-12 Link Here

(-)www/h2o/files/patch-CMakeLists.txt (-6 / +6 lines)
1	--- CMakeLists.txt.orig 2016-03-04 12:09:30 UTC	1	--- CMakeLists.txt.orig 2017-01-17 23:43:27 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -419,7 +419,8 @@ INSTALL(TARGETS h2o	3	@@ -462,7 +462,8 @@ INSTALL(TARGETS h2o
4	LIBRARY DESTINATION lib)	4	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
5		5
6	IF (NOT WITHOUT_LIBS)	6	IF (NOT WITHOUT_LIBS)
7	- INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")	7	- INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
8	+ INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"	8	+ INSTALL(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h"
9	+ EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")	9	+ EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
10	IF (LIBUV_FOUND)	10	IF (LIBUV_FOUND)
11	INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION lib/pkgconfig)	11	INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
12	ENDIF ()	12	ENDIF ()

Lines 7-13 Link Here

(-)www/h2o/pkg-plist (+10 lines)
7	%%DATADIR%%/fastcgi-cgi	7	%%DATADIR%%/fastcgi-cgi
8	%%DATADIR%%/setuidgid	8	%%DATADIR%%/setuidgid
9	%%DATADIR%%/status/index.html	9	%%DATADIR%%/status/index.html
		10	%%MRUBY%%%%DATADIR%%/mruby/acl.rb
		11	%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
		12	%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
10	%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb	13	%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
		14	%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
		15	%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
		16	%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
11	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png	17	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
12	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png	18	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
13	%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png	19	%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
Lines 16-21 Link Here
16	%%PORTDOCS%%%%DOCSDIR%%/assets/style.css	22	%%PORTDOCS%%%%DOCSDIR%%/assets/style.css
17	%%PORTDOCS%%%%DOCSDIR%%/benchmarks.html	23	%%PORTDOCS%%%%DOCSDIR%%/benchmarks.html
18	%%PORTDOCS%%%%DOCSDIR%%/configure.html	24	%%PORTDOCS%%%%DOCSDIR%%/configure.html
		25	%%PORTDOCS%%%%DOCSDIR%%/configure/access_control.html
19	%%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html	26	%%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html
20	%%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html	27	%%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html
21	%%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html	28	%%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
Lines 22-27 Link Here
22	%%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html	29	%%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
23	%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html	30	%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
24	%%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html	31	%%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
		32	%%PORTDOCS%%%%DOCSDIR%%/configure/dos_detection.html
25	%%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html	33	%%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html
26	%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html	34	%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
27	%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html	35	%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
Lines 37-42 Link Here
37	%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html	45	%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
38	%%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html	46	%%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
39	%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html	47	%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
		48	%%PORTDOCS%%%%DOCSDIR%%/configure/throttle_response_directives.html
40	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt	49	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
41	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html	50	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
42	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt	51	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
Lines 47-52 Link Here
47	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf	56	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
48	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb	57	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
49	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c	58	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
		59	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c
50	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c	60	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
51	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c	61	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
52	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c	62	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c