diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-10-07 04:53:21 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-10-07 04:53:21 +0000 |
| commit | 0775f1ae296bada3b780687cb15b329baadd0292 (patch) | |
| tree | ae10561b82b336933bcab0d6483bc8e020b62ce8 /net/libwebsockets | |
| parent | 60371fe88c3caa1e63359537a4213535ff4ca569 (diff) | |
| download | ports-0775f1ae296bada3b780687cb15b329baadd0292.tar.gz ports-0775f1ae296bada3b780687cb15b329baadd0292.zip | |
Notes
Diffstat (limited to 'net/libwebsockets')
| -rw-r--r-- | net/libwebsockets/Makefile | 14 | ||||
| -rw-r--r-- | net/libwebsockets/distinfo | 6 | ||||
| -rw-r--r-- | net/libwebsockets/files/patch-CMakeLists.txt | 26 | ||||
| -rw-r--r-- | net/libwebsockets/pkg-plist | 6 |
4 files changed, 28 insertions, 24 deletions
diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index 1558158c11e5..e3de809fcbf3 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= libwebsockets -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.2 DISTVERSIONPREFIX= v CATEGORIES= net devel -MASTER_SITES= GITHUB MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= C library for lightweight websocket clients and servers @@ -13,13 +12,13 @@ COMMENT= C library for lightweight websocket clients and servers LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_GITHUB= yes -GH_ACCOUNT= warmcat +USES= cmake pkgconfig ssl +USE_LDCONFIG= yes PORTSCOUT= limit:^v\d+\.* -USES= cmake pkgconfig ssl -USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= warmcat CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_TEST_SERVER=ON \ @@ -30,6 +29,7 @@ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_TEST_FRAGGLE=ON OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS +OPTIONS_DEFAULT=HTTP2 OPTIONS_SUB= yes HTTP_PROXY_DESC= HTTP proxy support @@ -53,7 +53,7 @@ LIBUV_LIB_DEPENDS= libuv.so:devel/libuv UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON -WEBSERVER_LIB_DEPENDS= libuv.so:devel/libuv +WEBSERVER_IMPLIES= LIBUV PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \ -DLWS_WITH_SERVER_STATUS=ON \ diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 8cbb8b3fc2d5..568f607a1efc 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500465747 -SHA256 (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = e38a7d981fe87b9a86b1f1cddd1f9e062d3896c488e6b2a32cb700d4c959ecba -SIZE (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = 3548981 +TIMESTAMP = 1538641163 +SHA256 (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6 +SIZE (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 3777160 diff --git a/net/libwebsockets/files/patch-CMakeLists.txt b/net/libwebsockets/files/patch-CMakeLists.txt index 22e72e469f99..0592f26fc7e2 100644 --- a/net/libwebsockets/files/patch-CMakeLists.txt +++ b/net/libwebsockets/files/patch-CMakeLists.txt @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2016-10-06 19:19:50 UTC +--- CMakeLists.txt.orig 2018-03-08 10:28:37 UTC +++ CMakeLists.txt -@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM - set(VISIBILITY_FLAG -fvisibility=hidden) - endif() - if (UNIX OR LWS_WITH_ESP8266) -- set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) -+ set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) - else() - set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" ) - endif() -@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}" +@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}" ) install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc" - DESTINATION lib${LIB_SUFFIX}/pkgconfig) + DESTINATION libdata/pkgconfig) - endif(UNIX) - # + file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" + "prefix=\"${CMAKE_INSTALL_PREFIX}\" +@@ -1757,7 +1757,7 @@ Cflags: -I\${includedir}" + ) + + install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" +- DESTINATION lib${LIB_SUFFIX}/pkgconfig) ++ DESTINATION libdata/pkgconfig) + + + endif(UNIX) diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index e000a41b9156..54306f2b9da3 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -1,6 +1,7 @@ %%WEBSERVER%%bin/lwsws %%WEBSERVER%%include/lejp.h include/libwebsockets.h +include/lws-plugin-ssh.h include/lws_config.h lib/cmake/libwebsockets/LibwebsocketsConfig.cmake lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake @@ -8,8 +9,11 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.10 +lib/libwebsockets.so.12 libdata/pkgconfig/libwebsockets.pc +libdata/pkgconfig/libwebsockets_static.pc +%%DATADIR%%-test-server/lws-ssh-test-keys +%%DATADIR%%-test-server/lws-ssh-test-keys.pub %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png |