Attachment #177432 for bug #214869




# $FreeBSD$

PORTNAME=	libwebsockets
PORTVERSION=	2.1.0
DISTVERSIONPREFIX=	v
CATEGORIES=	net devel
MASTER_SITES=	GITHUB

MAINTAINER=	iblis@hs.ntnu.edu.tw

USE_GITHUB=	yes
GH_ACCOUNT=	warmcat

PORTSCOUT=	limit:^v\d+\.*

USES=		cmake pkgconfig ssl
USE_LDCONFIG=	yes

		-DLWS_WITHOUT_TEST_CLIENT=ON \
		-DLWS_WITHOUT_TEST_FRAGGLE=ON

OPTIONS_DEFINE=	HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
OPTIONS_SUB=	yes

HTTP_PROXY_DESC=	HTTP proxy support

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>

Lines 1-3 Link Here

(-)b/net/libwebsockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468814124	1	TIMESTAMP = 1479903723
2	SHA256 (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59	2	SHA256 (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66
3	SIZE (warmcat-libwebsockets-v2.0.2_GH0.tar.gz) = 2998706	3	SIZE (warmcat-libwebsockets-v2.1.0_GH0.tar.gz) = 3721679




--- CMakeLists.txt.orig	2016-10-06 19:19:50 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}"
 )
 
 	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"




@comment $FreeBSD$
%%WEBSERVER%%bin/lwsws
%%WEBSERVER%%include/lejp.h
include/libwebsockets.h
include/lws_config.h
lib/cmake/libwebsockets/LibwebsocketsConfig.cmake

lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
lib/libwebsockets.a
lib/libwebsockets.so
lib/libwebsockets.so.9
libdata/pkgconfig/libwebsockets.pc
%%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

Return to bug 214869

Lines 2-10 Link Here

(-)b/net/libwebsockets/Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libwebsockets	4	PORTNAME= libwebsockets
5	PORTVERSION= 2.0.2	5	PORTVERSION= 2.1.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net	7	CATEGORIES= net devel
8	MASTER_SITES= GITHUB	8	MASTER_SITES= GITHUB
9		9
10	MAINTAINER= iblis@hs.ntnu.edu.tw	10	MAINTAINER= iblis@hs.ntnu.edu.tw
Lines 16-22 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
16	USE_GITHUB= yes	16	USE_GITHUB= yes
17	GH_ACCOUNT= warmcat	17	GH_ACCOUNT= warmcat
18		18
19	PORTSCOUT= limit:^v\d+\.	19	PORTSCOUT= limit:^v\d+\.*
20		20
21	USES= cmake pkgconfig ssl	21	USES= cmake pkgconfig ssl
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
Lines 29-35 CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ Link Here
29	-DLWS_WITHOUT_TEST_CLIENT=ON \	29	-DLWS_WITHOUT_TEST_CLIENT=ON \
30	-DLWS_WITHOUT_TEST_FRAGGLE=ON	30	-DLWS_WITHOUT_TEST_FRAGGLE=ON
31		31
32	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER	32	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
33	OPTIONS_SUB= yes	33	OPTIONS_SUB= yes
34		34
35	HTTP_PROXY_DESC= HTTP proxy support	35	HTTP_PROXY_DESC= HTTP proxy support
Lines 54-57 UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON Link Here
54	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON	54	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON
55	WEBSERVER_LIB_DEPENDS= libuv.so:devel/libuv	55	WEBSERVER_LIB_DEPENDS= libuv.so:devel/libuv
56		56
		57	PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \
		58	-DLWS_WITH_SERVER_STATUS=ON \
		59	-DLWS_WITH_GENERIC_SESSIONS=ON
		60	PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
		61
57	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)b/net/libwebsockets/files/patch-CMakeLists.txt (-6 / +6 lines)
1	--- CMakeLists.txt.orig 2016-06-06 11:59:30 UTC	1	--- CMakeLists.txt.orig 2016-10-06 19:19:50 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -602,7 +602,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM	3	@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
4	set(VISIBILITY_FLAG -fvisibility=hidden)	4	set(VISIBILITY_FLAG -fvisibility=hidden)
5	endif()	5	endif()
6	if (UNIX)	6	if (UNIX OR LWS_WITH_ESP8266)
7	- set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )	7	- set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
8	+ set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )	8	+ set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
9	else(UNIX)	9	else()
10	set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )	10	set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
11	endif(UNIX)	11	endif()
12	@@ -1316,7 +1316,7 @@ Cflags: -I\${includedir}"	12	@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}"
13	)	13	)
14		14
15	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"	15	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"

Lines 1-5 Link Here

(-)b/net/libwebsockets/pkg-plist (-3 / +21 lines)
1	@comment $FreeBSD$	1	@comment $FreeBSD$
2	%%WEBSERVER%%bin/lwsws	2	%%WEBSERVER%%bin/lwsws
		3	%%WEBSERVER%%include/lejp.h
3	include/libwebsockets.h	4	include/libwebsockets.h
4	include/lws_config.h	5	include/lws_config.h
5	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake	6	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
Lines 8-14 lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake Link Here
8	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake	9	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
9	lib/libwebsockets.a	10	lib/libwebsockets.a
10	lib/libwebsockets.so	11	lib/libwebsockets.so
11	lib/libwebsockets.so.8	12	lib/libwebsockets.so.9
12	libdata/pkgconfig/libwebsockets.pc	13	libdata/pkgconfig/libwebsockets.pc
13	%%WEBSERVER%%%%DATADIR%%-test-server/server-status/lwsws-logo.png	14	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html
14	%%WEBSERVER%%%%DATADIR%%-test-server/server-status/server-status.html	15	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html
		16	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png
		17	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js
		18	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html
		19	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html
		20	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html
		21	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html
		22	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html
		23	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html
		24	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html
		25	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html
		26	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg
		27	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html
		28	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html
		29	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html
		30	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js
		31	%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
		32	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html