Attachment #168196 for bug #208002

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

Lines 2-10 Link Here

(-)b/www/h2o/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= h2o	4	PORTNAME= h2o
5	PORTVERSION= 1.7.0	5	PORTVERSION= 1.7.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1
8	CATEGORIES= www	7	CATEGORIES= www
9		8
10	MAINTAINER= dch@skunkwerks.at	9	MAINTAINER= dch@skunkwerks.at

Lines 1-2 Link Here

(-)b/www/h2o/distinfo (-2 / +2 lines)
1	SHA256 (h2o-h2o-v1.7.0_GH0.tar.gz) = d11eef4590b2f4cdf13bb27a27c9605e59e50f54a710d2080d4c68e3bde77544	1	SHA256 (h2o-h2o-v1.7.1_GH0.tar.gz) = a9488667f0b73a66d5ef593660f6c0f66311d6eb4bf9378c6b7e74ab7ec9eea2
2	SIZE (h2o-h2o-v1.7.0_GH0.tar.gz) = 6543732	2	SIZE (h2o-h2o-v1.7.1_GH0.tar.gz) = 6546234




--- CMakeLists.txt.orig	2016-03-04 12:09:30 UTC
+++ CMakeLists.txt
@@ -419,7 +419,8 @@ INSTALL(TARGETS h2o
     LIBRARY DESTINATION lib)
 
 INSTALL(TARGETS h2o
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib)
+    RUNTIME DESTINATION bin)
 
 IF (NOT WITHOUT_LIBS)
-    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")
     IF (LIBUV_FOUND)
         INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION lib/pkgconfig)
     ENDIF ()

Lines 3-8 share/h2o/annotate-backtrace-symbols Link Here

(-)b/www/h2o/pkg-plist (+1 lines)
3	share/h2o/fetch-ocsp-response	3	share/h2o/fetch-ocsp-response
4	share/h2o/kill-on-close	4	share/h2o/kill-on-close
5	share/h2o/start_server	5	share/h2o/start_server
		6	%%DATADIR%%/fastcgi-cgi
6	%%DATADIR%%/setuidgid	7	%%DATADIR%%/setuidgid
7	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%	8	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
8	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png	9	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png

Return to bug 208002

Lines 1-17 Link Here

(-)b/www/h2o/files/patch-CMakeLists.txt (-11 / +6 lines)
1	--- CMakeLists.txt.orig 2015-10-20 06:50:39 UTC	1	--- CMakeLists.txt.orig 2016-03-04 12:09:30 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -357,11 +357,11 @@ ENDIF (WITH_MRUBY)	3	@@ -419,7 +419,8 @@ INSTALL(TARGETS h2o
4	TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})	4	LIBRARY DESTINATION lib)
5
6	INSTALL(TARGETS h2o
7	- RUNTIME DESTINATION bin
8	- LIBRARY DESTINATION lib)
9	+ RUNTIME DESTINATION bin)
10		5
11	IF (NOT WITHOUT_LIBS)	6	IF (NOT WITHOUT_LIBS)
12	- INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")	7	- INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
13	+ INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"	8	+ INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
14	+ EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")	9	+ EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
15	ENDIF ()	10	IF (LIBUV_FOUND)
16		11	INSTALL(FILES "${CMAKE_BINARY_DIR}/libh2o.pc" DESTINATION lib/pkgconfig)
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)	12	ENDIF ()