Attachment #197775 for bug #231938

View | Details | Raw Unified | Return to bug 231938
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libwebsockets
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

USES=		cmake pkgconfig ssl
USE_LDCONFIG=	yes

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

USE_GITHUB=	yes
GH_ACCOUNT=	warmcat

CMAKE_ARGS=	-DLWS_WITHOUT_TESTAPPS=ON \
		-DLWS_WITHOUT_TEST_SERVER=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

UNIX_SOCK_CMAKE_ON=	-DLWS_UNIX_SOCK=ON

WEBSERVER_CMAKE_ON=	-DLWS_WITH_LWSWS=ON
WEBSERVER_IMPLIES=	LIBUV

PLUGINS_CMAKE_ON=	-DLWS_WITH_PLUGINS=ON \
			-DLWS_WITH_SERVER_STATUS=ON \

Lines 1-3 Link Here

(-)b/net/libwebsockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1500465747	1	TIMESTAMP = 1538641163
2	SHA256 (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = e38a7d981fe87b9a86b1f1cddd1f9e062d3896c488e6b2a32cb700d4c959ecba	2	SHA256 (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6
3	SIZE (warmcat-libwebsockets-v2.2.2_GH0.tar.gz) = 3548981	3	SIZE (warmcat-libwebsockets-v2.4.2_GH0.tar.gz) = 3777160




--- CMakeLists.txt.orig	2018-03-08 10:28:37 UTC
+++ CMakeLists.txt
@@ -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"
-		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)

Lines 1-6 Link Here

(-)b/net/libwebsockets/pkg-plist (-1 / +5 lines)
1	%%WEBSERVER%%bin/lwsws	1	%%WEBSERVER%%bin/lwsws
2	%%WEBSERVER%%include/lejp.h	2	%%WEBSERVER%%include/lejp.h
3	include/libwebsockets.h	3	include/libwebsockets.h
		4	include/lws-plugin-ssh.h
4	include/lws_config.h	5	include/lws_config.h
5	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake	6	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
6	lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake	7	lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
Lines 8-15 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.10	12	lib/libwebsockets.so.12
12	libdata/pkgconfig/libwebsockets.pc	13	libdata/pkgconfig/libwebsockets.pc
		14	libdata/pkgconfig/libwebsockets_static.pc
		15	%%DATADIR%%-test-server/lws-ssh-test-keys
		16	%%DATADIR%%-test-server/lws-ssh-test-keys.pub
13	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html	17	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html
14	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html	18	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html
15	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png	19	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png

Return to bug 231938

Lines 2-11 Link Here

(-)b/net/libwebsockets/Makefile (-7 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libwebsockets	4	PORTNAME= libwebsockets
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.4.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net devel	7	CATEGORIES= net devel
8	MASTER_SITES= GITHUB
9		8
10	MAINTAINER= iblis@hs.ntnu.edu.tw	9	MAINTAINER= iblis@hs.ntnu.edu.tw
11	COMMENT= C library for lightweight websocket clients and servers	10	COMMENT= C library for lightweight websocket clients and servers
Lines 13-25 COMMENT= C library for lightweight websocket clients and servers Link Here
13	LICENSE= LGPL21	12	LICENSE= LGPL21
14	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
15		14
16	USE_GITHUB= yes	15	USES= cmake pkgconfig ssl
17	GH_ACCOUNT= warmcat	16	USE_LDCONFIG= yes
18		17
19	PORTSCOUT= limit:^v\d+\.*	18	PORTSCOUT= limit:^v\d+\.*
20		19
21	USES= cmake pkgconfig ssl	20	USE_GITHUB= yes
22	USE_LDCONFIG= yes	21	GH_ACCOUNT= warmcat
23		22
24	CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \	23	CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \
25	-DLWS_WITHOUT_TEST_SERVER=ON \	24	-DLWS_WITHOUT_TEST_SERVER=ON \
Lines 30-35 CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ Link Here
30	-DLWS_WITHOUT_TEST_FRAGGLE=ON	29	-DLWS_WITHOUT_TEST_FRAGGLE=ON
31		30
32	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS	31	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS
		32	OPTIONS_DEFAULT=HTTP2
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 53-59 LIBUV_LIB_DEPENDS= libuv.so:devel/libuv Link Here
53	UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON	53	UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON
54		54
55	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON	55	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON
56	WEBSERVER_LIB_DEPENDS= libuv.so:devel/libuv	56	WEBSERVER_IMPLIES= LIBUV
57		57
58	PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \	58	PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \
59	-DLWS_WITH_SERVER_STATUS=ON \	59	-DLWS_WITH_SERVER_STATUS=ON \

Lines 1-20 Link Here

(-)b/net/libwebsockets/files/patch-CMakeLists.txt (-13 / +13 lines)
1	--- CMakeLists.txt.orig 2016-10-06 19:19:50 UTC	1	--- CMakeLists.txt.orig 2018-03-08 10:28:37 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -682,7 +682,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM	3	@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
4	set(VISIBILITY_FLAG -fvisibility=hidden)
5	endif()
6	if (UNIX OR LWS_WITH_ESP8266)
7	- set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
8	+ set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
9	else()
10	set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
11	endif()
12	@@ -1416,7 +1416,7 @@ Cflags: -I\${includedir}"
13	)	4	)
14		5
15	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"	6	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
16	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)	7	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
17	+ DESTINATION libdata/pkgconfig)	8	+ DESTINATION libdata/pkgconfig)
18	endif(UNIX)
19		9
20	#	10	file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
		11	"prefix=\"${CMAKE_INSTALL_PREFIX}\"
		12	@@ -1757,7 +1757,7 @@ Cflags: -I\${includedir}"
		13	)
		14
		15	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
		16	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
		17	+ DESTINATION libdata/pkgconfig)
		18
		19
		20	endif(UNIX)