diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2015-07-28 11:21:25 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2015-07-28 11:21:25 +0000 |
| commit | 04336d90e1f1d63e757d322d1e3efc333d4f0814 (patch) | |
| tree | 6c1642bc8b4f22d939ebd7133c85b6cf639ea5d2 /www/h2o | |
| parent | 4de8ee56a45e835e227c127a4678dc6cdcae685f (diff) | |
| download | ports-04336d90e1f1d63e757d322d1e3efc333d4f0814.tar.gz ports-04336d90e1f1d63e757d322d1e3efc333d4f0814.zip | |
Notes
Diffstat (limited to 'www/h2o')
| -rw-r--r-- | www/h2o/Makefile | 5 | ||||
| -rw-r--r-- | www/h2o/distinfo | 4 | ||||
| -rw-r--r-- | www/h2o/files/patch-CMakeLists.txt | 27 | ||||
| -rw-r--r-- | www/h2o/pkg-plist | 3 |
4 files changed, 34 insertions, 5 deletions
diff --git a/www/h2o/Makefile b/www/h2o/Makefile index a4eb878e9950..77e5a47b6a77 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.2 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 43658842af9b..1bef3f92adf6 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.4.2_GH0.tar.gz) = 3024e6a8b704d119570551db2cbca701cb6c2fa7126336239044674ee02ea09c +SIZE (h2o-h2o-v1.4.2_GH0.tar.gz) = 4632490 diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..7a0d6e7ae78d --- /dev/null +++ b/www/h2o/files/patch-CMakeLists.txt @@ -0,0 +1,27 @@ +--- CMakeLists.txt.orig 2015-07-22 11:57:16 UTC ++++ CMakeLists.txt +@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL) + TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES}) + + INSTALL(TARGETS h2o +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib) ++ RUNTIME DESTINATION bin) + + ADD_EXECUTABLE(setuidgid src/setuidgid.c) + 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(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 f8f6bd1e4f73..bd2c683d05cf 100644 --- a/www/h2o/pkg-plist +++ b/www/h2o/pkg-plist @@ -1,6 +1,9 @@ bin/h2o +share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response +share/h2o/kill-on-close share/h2o/start_server +%%DATADIR%%/setuidgid @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%% @sample %%ETCDIR%%/h2o.conf.sample |