Attachment #160608 for bug #202818

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

Lines 2-8 Link Here

(-)b/www/h2o/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= h2o	4	PORTNAME= h2o
5	PORTVERSION= 1.4.3	5	PORTVERSION= 1.4.4
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= www	7	CATEGORIES= www
8		8

Lines 1-2 Link Here

(-)b/www/h2o/distinfo (-2 / +2 lines)
1	SHA256 (h2o-h2o-v1.4.3_GH0.tar.gz) = b41cdbadd2a345bc4a91295fd6faf39923c83beb00ad795f87fde69e2ba66f43	1	SHA256 (h2o-h2o-v1.4.4_GH0.tar.gz) = 0297ca73dba460653c6edb14dab17095f60616baf7c51e45ac9f8a6d54b9ba55
2	SIZE (h2o-h2o-v1.4.3_GH0.tar.gz) = 4736127	2	SIZE (h2o-h2o-v1.4.4_GH0.tar.gz) = 4736114




--- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
+++ CMakeLists.txt
@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
     ELSE (LIBUV_FOUND)
         SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
     ENDIF (LIBUV_FOUND)
-    INSTALL(TARGETS libh2o-evloop DESTINATION lib)
 ELSE (OPENSSL_FOUND)
     SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
     SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1)
@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL)
 TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
 
 INSTALL(TARGETS h2o

 INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
 
-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
+    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
 # only install libh2o if libuv is found
 IF (LIBUV_FOUND)
   INSTALL(TARGETS libh2o DESTINATION lib)
@@ -360,7 +358,6 @@ ELSE (LIBUV_FOUND)
 ENDIF (LIBUV_FOUND)
 
 INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)

Return to bug 202818

Lines 1-6 Link Here

(-)b/www/h2o/files/patch-CMakeLists.txt (-9 / +12 lines)
1	--- CMakeLists.txt.orig 2015-07-22 11:57:16 UTC	1	--- CMakeLists.txt.orig 2015-09-01 19:56:02 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL)	3	@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
		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)
4	TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})	12	TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
5		13
6	INSTALL(TARGETS h2o	14	INSTALL(TARGETS h2o
Lines 12-24 Link Here
12	INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)	20	INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
13		21
14	-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")	22	-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
15	-INSTALL(TARGETS libh2o-evloop DESTINATION lib)	23	+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
16	+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")	24	+ 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		25
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)	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)
24	-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)	27	-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)