Attachment 157957 Details for Bug 200998 – patch v4 joint effort Sean & Dave

[patch] patch v4 joint effort Sean & Dave

430e802.diff (text/plain), 2.51 KB, created by Dave Cottlehuber on 2015-06-21 21:29:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2015-06-21 21:29:24 UTC

Size: 2.51 KB

patch

obsolete

>diff --git a/www/h2o/Makefile b/www/h2o/Makefile
>index a4eb878..17d3b22 100644
>--- a/www/h2o/Makefile
>+++ b/www/h2o/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	h2o
>-PORTVERSION=	1.2.0
>-PORTREVISION=	1
>+PORTVERSION=	1.3.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>@@ -44,7 +43,7 @@ USE_RC_SUBR=	${PORTNAME}
> BROKEN=		fails to compile on 8.x
> .endif
> 
>-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
>+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
> USE_OPENSSL_PORT=	yes
> 
> post-install:
>diff --git a/www/h2o/distinfo b/www/h2o/distinfo
>index 4365884..00bc288 100644
>--- a/www/h2o/distinfo
>+++ b/www/h2o/distinfo
>@@ -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 --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt
>new file mode 100644
>index 0000000..be3b826
>--- /dev/null
>+++ b/www/h2o/files/patch-CMakeLists.txt
>@@ -0,0 +1,25 @@
>+--- 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 --git a/www/h2o/pkg-plist b/www/h2o/pkg-plist
>index f8f6bd1..0fbbd4e 100644
>--- a/www/h2o/pkg-plist
>+++ b/www/h2o/pkg-plist
>@@ -1,5 +1,7 @@
> bin/h2o
>+share/h2o/annotate-backtrace-symbols
> share/h2o/fetch-ocsp-response
>+share/h2o/kill-on-close
> share/h2o/start_server
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
> @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%%

Flags:

dch: maintainer-approval+

Actions: View | Diff

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