Attachment #157905 for bug #200998

Lines 2-9 Link Here

(-)./Makefile 2015-06-20 20:01:56.789141000 -0400 (-3 / +2 lines)
2	# $FreeBSD: head/www/h2o/Makefile 387352 2015-05-24 21:38:57Z amdmi3 $	2	# $FreeBSD: head/www/h2o/Makefile 387352 2015-05-24 21:38:57Z amdmi3 $
3		3
4	PORTNAME= h2o	4	PORTNAME= h2o
5	PORTVERSION= 1.2.0	5	PORTVERSION= 1.3.1
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	CATEGORIES= www	7	CATEGORIES= www
9		8
Lines 44-50 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+= -DEXTRA_LIBRARIES=OFF -DWITH_BUNDLED_SSL=OFF
48	USE_OPENSSL_PORT= yes	47	USE_OPENSSL_PORT= yes
49		48
50	post-install:	49	post-install:

Lines 1-2 Link Here

(-)./distinfo 2015-06-20 20:02:19.526130000 -0400 (-2 / +2 lines)
1	SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f	1	SHA256 (h2o-h2o-v1.3.1_GH0.tar.gz) = 8668a7c70cdb59eef4e67889569a45e0cf75b95eec133bd30435879cbdb77fba
2	SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709	2	SIZE (h2o-h2o-v1.3.1_GH0.tar.gz) = 4546819




--- CMakeLists.txt.orig        2015-06-20 20:04:35.323130111 -0400
+++ CMakeLists.txt     2015-06-20 20:24:28.497048226 -0400
@@ -288,11 +288,9 @@
 TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
 
 INSTALL(TARGETS h2o
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib)
+    RUNTIME DESTINATION bin)
 
-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
-INSTALL(TARGETS libh2o-evloop DESTINATION lib)
+#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)
@@ -301,7 +299,6 @@
 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)
 
 # tests
 ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})

Lines 1-6 Link Here

(-)./pkg-plist 2015-06-20 20:26:22.715023000 -0400 (+2 lines)
1	bin/h2o	1	bin/h2o
2	share/h2o/fetch-ocsp-response	2	share/h2o/fetch-ocsp-response
3	share/h2o/start_server	3	share/h2o/start_server
		4	share/h2o/annotate-backtrace-symbols
		5	share/h2o/kill-on-close
4	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%	6	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
5	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%	7	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
6	@sample %%ETCDIR%%/h2o.conf.sample	8	@sample %%ETCDIR%%/h2o.conf.sample

Return to bug 200998

Line 0 Link Here

(-)./files/patch-CMakeLists.txt 2015-06-20 20:24:33.605045000 -0400 (+24 lines)
	1	--- CMakeLists.txt.orig 2015-06-20 20:04:35.323130111 -0400
	2	+++ CMakeLists.txt 2015-06-20 20:24:28.497048226 -0400
	3	@@ -288,11 +288,9 @@
	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	-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
	12	-INSTALL(TARGETS libh2o-evloop DESTINATION lib)
	13	+#INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
	14	# only install libh2o if libuv is found
	15	IF (LIBUV_FOUND)
	16	INSTALL(TARGETS libh2o DESTINATION lib)
	17	@@ -301,7 +299,6 @@
	18	ENDIF (LIBUV_FOUND)
	19
	20	INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
	21	-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)
	22
	23	# tests
	24	ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})