View | Details | Raw Unified | Return to bug 200998 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/h2o/Makefile (-3 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	h2o
4
PORTNAME=	h2o
5
PORTVERSION=	1.2.0
5
PORTVERSION=	1.4.1
6
PORTREVISION=	1
7
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
8
CATEGORIES=	www
7
CATEGORIES=	www
9
8
Lines 44-50 USE_RC_SUBR= ${PORTNAME} Link Here
44
BROKEN=		fails to compile on 8.x
43
BROKEN=		fails to compile on 8.x
45
.endif
44
.endif
46
45
47
CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
46
CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
48
USE_OPENSSL_PORT=	yes
47
USE_OPENSSL_PORT=	yes
49
48
50
post-install:
49
post-install:
(-)b/www/h2o/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
1
SHA256 (h2o-h2o-v1.4.1_GH0.tar.gz) = b5695b08c90a22b5f164a632bae68b4e8c4ecf4f231a3d336c7f94562591e4e9
2
SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709
2
SIZE (h2o-h2o-v1.4.1_GH0.tar.gz) = 4632714
(-)b/www/h2o/files/patch-CMakeLists.txt (+27 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2015-07-22 11:57:16 UTC
2
+++ CMakeLists.txt
3
@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL)
4
 TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
5
 
6
 INSTALL(TARGETS h2o
7
-    RUNTIME DESTINATION bin
8
-    LIBRARY DESTINATION lib)
9
+    RUNTIME DESTINATION bin)
10
 
11
 ADD_EXECUTABLE(setuidgid src/setuidgid.c)
12
 INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
13
 
14
-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
15
-INSTALL(TARGETS libh2o-evloop DESTINATION lib)
16
+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
17
 # only install libh2o if libuv is found
18
 IF (LIBUV_FOUND)
19
   INSTALL(TARGETS libh2o DESTINATION lib)
20
@@ -360,7 +358,6 @@ ELSE (LIBUV_FOUND)
21
 ENDIF (LIBUV_FOUND)
22
 
23
 INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
24
-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)
25
 
26
 # tests
27
 ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})
(-)b/www/h2o/pkg-plist (+3 lines)
Lines 1-6 Link Here
1
bin/h2o
1
bin/h2o
2
share/h2o/annotate-backtrace-symbols
2
share/h2o/fetch-ocsp-response
3
share/h2o/fetch-ocsp-response
4
share/h2o/kill-on-close
3
share/h2o/start_server
5
share/h2o/start_server
6
%%DATADIR%%/setuidgid
4
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
7
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
5
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
8
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
6
@sample %%ETCDIR%%/h2o.conf.sample
9
@sample %%ETCDIR%%/h2o.conf.sample

Return to bug 200998