sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-13 15:29:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/libwebsockets: update to 2.4.2

Browse source 
PR:		231938
Submitted by:	Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)
This commit is contained in:
Steve Wills 2018-10-07 04:53:21 +00:00
parent 60371fe88c
commit 0775f1ae29
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=481420
4 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/libwebsockets/Makefile
View file

@ -2,10 +2,9 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libwebsockets PORTNAME= libwebsockets
PORTVERSION= 2.2.2 PORTVERSION= 2.4.2
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= net devel CATEGORIES= net devel
MASTER_SITES= GITHUB
MAINTAINER= iblis@hs.ntnu.edu.tw MAINTAINER= iblis@hs.ntnu.edu.tw
COMMENT= C library for lightweight websocket clients and servers 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= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes USES= cmake pkgconfig ssl
GH_ACCOUNT= warmcat USE_LDCONFIG= yes
PORTSCOUT= limit:^v\d+\.* PORTSCOUT= limit:^v\d+\.*
USES= cmake pkgconfig ssl USE_GITHUB= yes
USE_LDCONFIG= yes GH_ACCOUNT= warmcat
CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_TEST_SERVER=ON \ -DLWS_WITHOUT_TEST_SERVER=ON \
@ -30,6 +29,7 @@ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_TEST_FRAGGLE=ON -DLWS_WITHOUT_TEST_FRAGGLE=ON
OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
OPTIONS_DEFAULT=HTTP2
OPTIONS_SUB= yes OPTIONS_SUB= yes
HTTP_PROXY_DESC= HTTP proxy support 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 UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON
WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=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 \ PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \
-DLWS_WITH_SERVER_STATUS=ON \ -DLWS_WITH_SERVER_STATUS=ON \

6
net/libwebsockets/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500465747 TIMESTAMP = 1538641163
SHA256 (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = e38a7d981fe87b9a86b1f1cddd1f9e062d3896c488e6b2a32cb700d4c959ecba SHA256 (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6
SIZE (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = 3548981 SIZE (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 3777160

26
net/libwebsockets/files/patch-CMakeLists.txt
View file

@ -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 +++ CMakeLists.txt
@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM @@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
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}"
) )
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc" install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
- DESTINATION lib${LIB_SUFFIX}/pkgconfig) - DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ DESTINATION libdata/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)

6
net/libwebsockets/pkg-plist
View file

@ -1,6 +1,7 @@
%%WEBSERVER%%bin/lwsws %%WEBSERVER%%bin/lwsws
%%WEBSERVER%%include/lejp.h %%WEBSERVER%%include/lejp.h
include/libwebsockets.h include/libwebsockets.h
include/lws-plugin-ssh.h
include/lws_config.h include/lws_config.h
lib/cmake/libwebsockets/LibwebsocketsConfig.cmake lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
@ -8,8 +9,11 @@ lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libwebsockets/LibwebsocketsTargets.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
lib/libwebsockets.a lib/libwebsockets.a
lib/libwebsockets.so lib/libwebsockets.so
lib/libwebsockets.so.10 lib/libwebsockets.so.12
libdata/pkgconfig/libwebsockets.pc 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/failed-login.html
%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.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-logo.png