Attachment 157905 Details for Bug 200998 – h2o diff attempt 3

[patch] h2o diff attempt 3

file_200998.txt (text/plain), 2.84 KB, created by Sean on 2015-06-21 00:33:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean

Created: 2015-06-21 00:33:28 UTC

Size: 2.84 KB

patch

obsolete

>--- /usr/ports/www/h2o/Makefile 2015-06-20 15:59:05.440131000 -0400
>+++ ./Makefile  2015-06-20 20:01:56.789141000 -0400
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/www/h2o/Makefile 387352 2015-05-24 21:38:57Z amdmi3 $
> 
> PORTNAME=      h2o
>-PORTVERSION=   1.2.0
>-PORTREVISION=  1
>+PORTVERSION=   1.3.1
> DISTVERSIONPREFIX=     v
> CATEGORIES=    www
> 
>@@ -44,7 +43,7 @@
> BROKEN=                fails to compile on 8.x
> .endif
> 
>-CMAKE_ARGS+=   -DWITH_BUNDLED_SSL=OFF
>+CMAKE_ARGS+=   -DEXTRA_LIBRARIES=OFF -DWITH_BUNDLED_SSL=OFF
> USE_OPENSSL_PORT=      yes
> 
> post-install:
>diff -ruN /usr/ports/www/h2o/distinfo ./distinfo
>--- /usr/ports/www/h2o/distinfo 2015-06-20 15:59:05.442130000 -0400
>+++ ./distinfo  2015-06-20 20:02:19.526130000 -0400
>@@ -1,2 +1,2 @@
>-SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
>-SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709
>+SHA256 (h2o-h2o-v1.3.1_GH0.tar.gz) = 8668a7c70cdb59eef4e67889569a45e0cf75b95eec133bd30435879cbdb77fba
>+SIZE (h2o-h2o-v1.3.1_GH0.tar.gz) = 4546819
>diff -ruN /usr/ports/www/h2o/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/www/h2o/files/patch-CMakeLists.txt       1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-CMakeLists.txt        2015-06-20 20:24:33.605045000 -0400
>@@ -0,0 +1,24 @@
>+--- 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})
>diff -ruN /usr/ports/www/h2o/pkg-plist ./pkg-plist
>--- /usr/ports/www/h2o/pkg-plist        2015-06-20 15:59:05.444130000 -0400
>+++ ./pkg-plist 2015-06-20 20:26:22.715023000 -0400
>@@ -1,6 +1,8 @@
> bin/h2o
> share/h2o/fetch-ocsp-response
> share/h2o/start_server
>+share/h2o/annotate-backtrace-symbols
>+share/h2o/kill-on-close
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%
> @sample %%ETCDIR%%/h2o.conf.sample

Actions: View | Diff

Attachments on bug 200998: 157900 | 157901 | 157905 | 157957 | 159318 | 159319 | 159336 | 159337