Index: head/net/libwebsockets/Makefile =================================================================== --- head/net/libwebsockets/Makefile (revision 481419) +++ head/net/libwebsockets/Makefile (revision 481420) @@ -1,63 +1,63 @@ # Created by: Iblis Lin # $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 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 \ -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ -DLWS_WITHOUT_TEST_PING=ON \ -DLWS_WITHOUT_TEST_ECHO=ON \ -DLWS_WITHOUT_TEST_CLIENT=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 LIBUV_DESC= Asynchronous I/O support via libuv UNIX_SOCK_DESC= Unix domain socket support HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \ -DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub IPV6_CMAKE_ON= -DLWS_IPV6=ON LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON LIBEV_LIB_DEPENDS= libev.so:devel/libev LIBUV_CMAKE_ON= -DLWS_WITH_LIBUV=ON 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 \ -DLWS_WITH_GENERIC_SESSIONS=ON PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 .include Index: head/net/libwebsockets/distinfo =================================================================== --- head/net/libwebsockets/distinfo (revision 481419) +++ head/net/libwebsockets/distinfo (revision 481420) @@ -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 Index: head/net/libwebsockets/files/patch-CMakeLists.txt =================================================================== --- head/net/libwebsockets/files/patch-CMakeLists.txt (revision 481419) +++ head/net/libwebsockets/files/patch-CMakeLists.txt (revision 481420) @@ -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) Property changes on: head/net/libwebsockets/files/patch-CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/net/libwebsockets/pkg-plist =================================================================== --- head/net/libwebsockets/pkg-plist (revision 481419) +++ head/net/libwebsockets/pkg-plist (revision 481420) @@ -1,31 +1,35 @@ %%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 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 %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html %%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html %%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html %%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js %%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png %%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html