Attachment 160608 Details for Bug 202818 – git diff generated

[patch] git diff generated

h2o-1.4.4.diff (text/plain), 2.56 KB, created by Dave Cottlehuber on 2015-09-01 21:12:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2015-09-01 21:12:11 UTC

Size: 2.56 KB

patch

obsolete

>commit b74fd8187257779a1dd48c25a26f783e11244e4f
>Author: Dave Cottlehuber <dch@skunkwerks.at>
>Date:   Tue Sep 1 20:07:09 2015 +0000
>
>    h2o 1.4.4
>
>diff --git a/www/h2o/Makefile b/www/h2o/Makefile
>index 2b65617..b46c1dc 100644
>--- a/www/h2o/Makefile
>+++ b/www/h2o/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	h2o
>-PORTVERSION=	1.4.3
>+PORTVERSION=	1.4.4
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>diff --git a/www/h2o/distinfo b/www/h2o/distinfo
>index 73495d0..e3bae57 100644
>--- a/www/h2o/distinfo
>+++ b/www/h2o/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (h2o-h2o-v1.4.3_GH0.tar.gz) = b41cdbadd2a345bc4a91295fd6faf39923c83beb00ad795f87fde69e2ba66f43
>-SIZE (h2o-h2o-v1.4.3_GH0.tar.gz) = 4736127
>+SHA256 (h2o-h2o-v1.4.4_GH0.tar.gz) = 0297ca73dba460653c6edb14dab17095f60616baf7c51e45ac9f8a6d54b9ba55
>+SIZE (h2o-h2o-v1.4.4_GH0.tar.gz) = 4736114
>diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt
>index 7a0d6e7..ba812ff 100644
>--- a/www/h2o/files/patch-CMakeLists.txt
>+++ b/www/h2o/files/patch-CMakeLists.txt
>@@ -1,6 +1,14 @@
>---- CMakeLists.txt.orig	2015-07-22 11:57:16 UTC
>+--- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
> +++ CMakeLists.txt
>-@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL)
>+@@ -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
>@@ -12,13 +20,8 @@
>  INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
>  
> -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)
>-@@ -360,7 +358,6 @@ ELSE (LIBUV_FOUND)
>- ENDIF (LIBUV_FOUND)
>++INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
>++    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
>  
>  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)

Flags:

dch: maintainer-approval+

Actions: View | Diff

Attachments on bug 202818: 160608