svn commit: r427365 - in head/net/libwebsockets: . files
Li-Wen Hsu
lwhsu at FreeBSD.org
Tue Nov 29 07:37:50 UTC 2016
Author: lwhsu
Date: Tue Nov 29 07:37:49 2016
New Revision: 427365
URL: https://svnweb.freebsd.org/changeset/ports/427365
Log:
- Update to 2.1.0
PR: 214869
Submitted by: iblis at hs.ntnu.edu.tw (maintainer)
Modified:
head/net/libwebsockets/Makefile
head/net/libwebsockets/distinfo
head/net/libwebsockets/files/patch-CMakeLists.txt
head/net/libwebsockets/pkg-plist
Modified: head/net/libwebsockets/Makefile
==============================================================================
--- head/net/libwebsockets/Makefile Tue Nov 29 07:32:07 2016 (r427364)
+++ head/net/libwebsockets/Makefile Tue Nov 29 07:37:49 2016 (r427365)
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= libwebsockets
-PORTVERSION= 2.0.2
+PORTVERSION= 2.1.0
DISTVERSIONPREFIX= v
-CATEGORIES= net
+CATEGORIES= net devel
MASTER_SITES= GITHUB
MAINTAINER= iblis at hs.ntnu.edu.tw
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= warmcat
-PORTSCOUT= limit:^v\d+\.
+PORTSCOUT= limit:^v\d+\.*
USES= cmake pkgconfig ssl
USE_LDCONFIG= yes
@@ -29,7 +29,7 @@ CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_TEST_CLIENT=ON \
-DLWS_WITHOUT_TEST_FRAGGLE=ON
-OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER
+OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
OPTIONS_SUB= yes
HTTP_PROXY_DESC= HTTP proxy support
@@ -54,4 +54,9 @@ UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON
WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON
WEBSERVER_LIB_DEPENDS= libuv.so:devel/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 <bsd.port.mk>
Modified: head/net/libwebsockets/distinfo
==============================================================================
--- head/net/libwebsockets/distinfo Tue Nov 29 07:32:07 2016 (r427364)
+++ head/net/libwebsockets/distinfo Tue Nov 29 07:37:49 2016 (r427365)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468814124
-SHA256 (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59
-SIZE (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 2998706
+TIMESTAMP = 1479903723
+SHA256 (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66
+SIZE (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = 3721679
Modified: head/net/libwebsockets/files/patch-CMakeLists.txt
==============================================================================
--- head/net/libwebsockets/files/patch-CMakeLists.txt Tue Nov 29 07:32:07 2016 (r427364)
+++ head/net/libwebsockets/files/patch-CMakeLists.txt Tue Nov 29 07:37:49 2016 (r427365)
@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig 2016-06-06 11:59:30 UTC
+--- CMakeLists.txt.orig 2016-10-06 19:19:50 UTC
+++ CMakeLists.txt
-@@ -602,7 +602,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
+@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
set(VISIBILITY_FLAG -fvisibility=hidden)
endif()
- if (UNIX)
+ 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(UNIX)
+ else()
set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
- endif(UNIX)
-@@ -1316,7 +1316,7 @@ Cflags: -I\${includedir}"
+ endif()
+@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}"
)
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
Modified: head/net/libwebsockets/pkg-plist
==============================================================================
--- head/net/libwebsockets/pkg-plist Tue Nov 29 07:32:07 2016 (r427364)
+++ head/net/libwebsockets/pkg-plist Tue Nov 29 07:37:49 2016 (r427365)
@@ -1,5 +1,6 @@
@comment $FreeBSD$
%%WEBSERVER%%bin/lwsws
+%%WEBSERVER%%include/lejp.h
include/libwebsockets.h
include/lws_config.h
lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
@@ -8,7 +9,24 @@ lib/cmake/libwebsockets/LibwebsocketsTar
lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
lib/libwebsockets.a
lib/libwebsockets.so
-lib/libwebsockets.so.8
+lib/libwebsockets.so.9
libdata/pkgconfig/libwebsockets.pc
-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
-%%WEBSERVER%%%%DATADIR%%-test-server/server-status/server-status.html
+%%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
More information about the svn-ports-all
mailing list