View | Details | Raw Unified | Return to bug 203956
Collapse All | Expand All

(-)b/www/h2o/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	h2o
4
PORTNAME=	h2o
5
PORTVERSION=	1.5.0
5
PORTVERSION=	1.5.2
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
CATEGORIES=	www
7
CATEGORIES=	www
8
8
Lines 37-43 USE_RC_SUBR= ${PORTNAME} Link Here
37
37
38
.include <bsd.port.options.mk>
38
.include <bsd.port.options.mk>
39
39
40
CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
40
CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
41
USE_OPENSSL_PORT=	yes
41
USE_OPENSSL_PORT=	yes
42
42
43
post-patch:
43
post-patch:
(-)b/www/h2o/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (h2o-h2o-v1.5.0_GH0.tar.gz) = b0700b30e26852d6dca2fc72d3f742ab8a0694ae7e1871e33b0cfb5ce1bdde7e
1
SHA256 (h2o-h2o-v1.5.2_GH0.tar.gz) = 1daf205b86e0a5ce96937db733ab02205a4f57dcb9ded8507fc7dd0a00c00dc2
2
SIZE (h2o-h2o-v1.5.0_GH0.tar.gz) = 6261794
2
SIZE (h2o-h2o-v1.5.2_GH0.tar.gz) = 6263184
(-)b/www/h2o/files/patch-CMakeLists.txt (-21 / +8 lines)
Lines 1-14 Link Here
1
--- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
1
--- CMakeLists.txt.orig	2015-10-20 06:50:39 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
3
@@ -357,11 +357,11 @@ ENDIF (WITH_MRUBY)
4
     ELSE (LIBUV_FOUND)
5
         SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
6
     ENDIF (LIBUV_FOUND)
7
-    INSTALL(TARGETS libh2o-evloop DESTINATION lib)
8
 ELSE (OPENSSL_FOUND)
9
     SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
10
     SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1)
11
@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL)
12
 TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
4
 TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
13
 
5
 
14
 INSTALL(TARGETS h2o
6
 INSTALL(TARGETS h2o
Lines 16-30 Link Here
16
-    LIBRARY DESTINATION lib)
8
-    LIBRARY DESTINATION lib)
17
+    RUNTIME DESTINATION bin)
9
+    RUNTIME DESTINATION bin)
18
 
10
 
19
 ADD_EXECUTABLE(setuidgid src/setuidgid.c)
11
 IF (NOT WITHOUT_LIBS)
20
 INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
12
-    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
13
+    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
14
+        EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
15
 ENDIF ()
21
 
16
 
22
-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
17
 INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/setuidgid share/h2o/start_server DESTINATION share/h2o)
23
+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
24
+    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
25
 
26
 INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
27
-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)
28
 
29
 # tests
30
 ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})
(-)b/www/h2o/pkg-plist (+30 lines)
Lines 5-8 share/h2o/kill-on-close Link Here
5
share/h2o/start_server
5
share/h2o/start_server
6
%%DATADIR%%/setuidgid
6
%%DATADIR%%/setuidgid
7
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
7
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
8
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
9
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
10
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
11
%%PORTDOCS%%%%DOCSDIR%%/assets/searchstyle.css
12
%%PORTDOCS%%%%DOCSDIR%%/assets/style.css
13
%%PORTDOCS%%%%DOCSDIR%%/benchmarks.html
14
%%PORTDOCS%%%%DOCSDIR%%/configure.html
15
%%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html
16
%%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html
17
%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
18
%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
19
%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
20
%%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html
21
%%PORTDOCS%%%%DOCSDIR%%/configure/gzip_directives.html
22
%%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
23
%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
24
%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
25
%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
26
%%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html
27
%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
28
%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
29
%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
30
%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
31
%%PORTDOCS%%%%DOCSDIR%%/faq.html
32
%%PORTDOCS%%%%DOCSDIR%%/index.html
33
%%PORTDOCS%%%%DOCSDIR%%/install.html
34
%%PORTDOCS%%%%DOCSDIR%%/search/jquery-1.9.1.min.js
35
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
36
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
37
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
8
@sample %%ETCDIR%%/h2o.conf.sample
38
@sample %%ETCDIR%%/h2o.conf.sample

Return to bug 203956