Attachment #220547 for bug #251835

Lines 3-10 Link Here

(-)b/net/libwebsockets/Makefile (-50 / +69 lines)
3		3
4	PORTNAME= libwebsockets	4	PORTNAME= libwebsockets
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 4.0.21	6	DISTVERSION= 4.1.6
7	CATEGORIES= net devel	7	CATEGORIES= net devel
		8	MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/
8		9
9	MAINTAINER= iblis@hs.ntnu.edu.tw	10	MAINTAINER= iblis@hs.ntnu.edu.tw
10	COMMENT= C library for lightweight websocket clients and servers	11	COMMENT= C library for lightweight websocket clients and servers
Lines 12-74 COMMENT= C library for lightweight websocket clients and servers Link Here
12	LICENSE= MIT	13	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
14		15
15	USES= cmake pkgconfig ssl	16	# TEST_DEPENDS= bash:shells/bash
16	USE_LDCONFIG= yes	17
		18	# USES= cmake localbase pkgconfig shebangfix tar:xz
		19	# SHEBANG_FILES= scripts/*.sh
		20	USES= cmake localbase pkgconfig tar:xz
17		21
18	PORTSCOUT= limit:^v\d+\.*	22	USE_LDCONFIG= yes
19		23
20	USE_GITHUB= yes	24	CMAKE_ON= LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
21	GH_ACCOUNT= warmcat	25	LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \
		26	LWS_WITHOUT_TEST_SERVER_EXTPOLL \
		27	LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT
22		28
23	CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \	29	OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \
24	-DLWS_WITHOUT_TEST_SERVER=ON \	30	SECURE_STREAMS SOCKS SQLITE WEBSERVER
25	-DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \	31	OPTIONS_DEFAULT= HTTP2 OPENSSL LIBUV
26	-DLWS_WITHOUT_TEST_PING=ON \	32	OPTIONS_SUB= yes
27	-DLWS_WITHOUT_TEST_CLIENT=ON
28		33
29	OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \	34	OPTIONS_SINGLE= SSL
30	SOCKS5 MQTT SECURE_STREAMS	35	OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL
31	OPTIONS_DEFAULT=HTTP2 LIBUV	36	OPTIONS_GROUP= EVLOOP
32	OPTIONS_SUB= yes	37	OPTIONS_GROUP_EVLOOP= GLIB LIBEV LIBEVENT LIBUV
33		38
34	HTTP2_DESC= Compile with server support for HTTP/2
35	HTTP_PROXY_DESC= HTTP proxy support	39	HTTP_PROXY_DESC= HTTP proxy support
36	LIBUV_DESC= Asynchronous I/O support via libuv
37	UNIX_SOCK_DESC= Unix domain socket support
38	SOCKS5_DESC= Allow use of SOCKS5 proxy on client connections
39	MQTT_DESC= MQTT client support	40	MQTT_DESC= MQTT client support
40	SECURE_STREAMS_DESC= Secure Streams API support	41	PEERLIMITS_DESC= Tracking and limiting of resources of peer(s)
41		42	PLUGINS_DESC= Plugins support
42	HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON	43	SECURE_STREAMS_DESC= Secure streams protocol API support
43		44	SOCKS_DESC= Allow use of SOCKS5 proxy on client connections
44	HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \	45	EVLOOP_DESC= Event loop support
45	-DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so	46	GLIB_DESC= Events support via Glib
46	HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub	47	LIBEVENT_DESC= Asynchronous event notification via libevent
47		48	LIBUV_DESC= Asynchronous I/O support via libuv
48	IPV6_CMAKE_ON= -DLWS_IPV6=ON	49
49		50	HTTP_PROXY_CMAKE_BOOL= LWS_WITH_HTTP_PROXY
50	LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON	51	HTTP2_CMAKE_BOOL= LWS_WITH_HTTP2
		52	MQTT_CMAKE_BOOL= LWS_ROLE_MQTT
		53	PEERLIMITS_CMAKE_BOOL= LWS_WITH_PEER_LIMITS
		54	PLUGINS_CMAKE_BOOL= LWS_WITH_PLUGINS \
		55	LWS_WITH_PLUGINS_API
		56	SECURE_STREAMS_CMAKE_BOOL= LWS_WITH_SECURE_STREAMS \
		57	LWS_WITH_SECURE_STREAMS_PROXY_API
		58	SOCKS_CMAKE_BOOL= LWS_WITH_SOCKS5
		59	SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
		60	SQLITE_CMAKE_BOOL= LWS_WITH_SQLITE3
		61	# Tests depends on bash at minimum, help needed to fix test suite
		62	# TEST_CMAKE_BOOL= LWS_WITH_MINIMAL_EXAMPLES
		63	# TEST_CMAKE_ON= -DLWS_CTEST_INTERNET_AVAILABLE:BOOL=OFF \
		64	# -DLWS_LINK_TESTAPPS_DYNAMIC:BOOL=ON
		65	# TEST_CMAKE_OFF= -DLWS_WITHOUT_TESTAPPS:BOOL=ON \
		66	# -DLWS_WITHOUT_TEST_SERVER:BOOL=ON \
		67	# -DLWS_WITHOUT_TEST_SERVER_EXTPOLL:BOOL=ON \
		68	# -DLWS_WITHOUT_TEST_PING:BOOL=ON \
		69	# -DLWS_WITHOUT_TEST_CLIENT:BOOL=ON
		70	WEBSERVER_CMAKE_BOOL= LWS_WITH_LWSWS
		71	WEBSERVER_IMPLIES= PEERLIMITS PLUGINS LIBUV
		72
		73	MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
		74	MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS
		75	OPENSSL_USES= ssl
		76	OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1
		77	# WolfSSL need to be compiled with --enable-libwebsockets to be compatible
		78	# WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl
		79	# WOLFSSL_CMAKE_BOOL= LWS_WITH_SSL LWS_WITH_WOLFSSL
		80	# WOLFSSL_CMAKE_ON= -DLWS_WOLFSSL_INCLUDE_DIRS=${LOCALBASE}/include \
		81	# -DLWS_WOLFSSL_LIBRARIES=${LOCALBASE}/lib/libwolfssl.so
		82
		83	GLIB_USES= gnome
		84	GLIB_USE= GNOME=glib20
		85	GLIB_CMAKE_BOOL= LWS_WITH_GLIB
51	LIBEV_LIB_DEPENDS= libev.so:devel/libev	86	LIBEV_LIB_DEPENDS= libev.so:devel/libev
52		87	LIBEV_CMAKE_BOOL= LWS_WITH_LIBEV
53	LIBUV_CMAKE_ON= -DLWS_WITH_LIBUV=ON	88	LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent
		89	LIBEVENT_CMAKE_BOOL= LWS_WITH_LIBEVENT
54	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv	90	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv
55		91	LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV
56	UNIX_SOCK_CMAKE_ON= -DLWS_UNIX_SOCK=ON
57
58	WEBSERVER_CMAKE_ON= -DLWS_WITH_LWSWS=ON
59	WEBSERVER_IMPLIES= LIBUV
60
61	PLUGINS_CMAKE_ON= -DLWS_WITH_PLUGINS=ON \
62	-DLWS_WITH_SERVER_STATUS=ON \
63	-DLWS_WITH_GENERIC_SESSIONS=ON
64	PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
65
66	SOCKS5_CMAKE_ON= -DLWS_WITH_SOCKS5=ON
67
68	MQTT_CMAKE_ON= -DLWS_ROLE_MQTT=ON
69
70	SECURE_STREAMS_CMAKE_ON=-DLWS_WITH_SECURE_STREAMS=ON \
71	-DLWS_WITH_SECURE_STREAMS_PROXY_API=ON \
72	-DLWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM=ON
73		92
74	.include <bsd.port.mk>	93	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net/libwebsockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603959557	1	TIMESTAMP = 1607873825
2	SHA256 (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78	2	SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f
3	SIZE (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 12342078	3	SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880




--- CMakeLists.txt.orig	2018-03-08 10:28:37 UTC
+++ CMakeLists.txt
@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
 )
 
 	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-		DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+		DESTINATION libdata/pkgconfig)
 
 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-3 Link Here

(-)b/net/libwebsockets/pkg-plist (-28 / +57 lines)
		1	@comment %%TEST%%bin/libwebsockets-test-client
		2	@comment %%TEST%%bin/libwebsockets-test-lejp
		3	@comment %%TEST%%bin/libwebsockets-test-server
		4	@comment %%TEST%%bin/libwebsockets-test-server-extpoll
1	%%WEBSERVER%%bin/lwsws	5	%%WEBSERVER%%bin/lwsws
2	include/libwebsockets.h	6	include/libwebsockets.h
3	include/libwebsockets/abstract/abstract.h	7	include/libwebsockets/abstract/abstract.h
Lines 8-13 include/libwebsockets/abstract/transports/raw-skt.h Link Here
8	include/libwebsockets/abstract/transports/unit-test.h	12	include/libwebsockets/abstract/transports/unit-test.h
9	include/libwebsockets/lws-adopt.h	13	include/libwebsockets/lws-adopt.h
10	include/libwebsockets/lws-async-dns.h	14	include/libwebsockets/lws-async-dns.h
		15	include/libwebsockets/lws-bb-i2c.h
		16	include/libwebsockets/lws-bb-spi.h
		17	include/libwebsockets/lws-button.h
11	include/libwebsockets/lws-callbacks.h	18	include/libwebsockets/lws-callbacks.h
12	include/libwebsockets/lws-cgi.h	19	include/libwebsockets/lws-cgi.h
13	include/libwebsockets/lws-client.h	20	include/libwebsockets/lws-client.h
Lines 15-23 include/libwebsockets/lws-context-vhost.h Link Here
15	include/libwebsockets/lws-dbus.h	22	include/libwebsockets/lws-dbus.h
16	include/libwebsockets/lws-detailed-latency.h	23	include/libwebsockets/lws-detailed-latency.h
17	include/libwebsockets/lws-diskcache.h	24	include/libwebsockets/lws-diskcache.h
		25	include/libwebsockets/lws-display.h
18	include/libwebsockets/lws-dll2.h	26	include/libwebsockets/lws-dll2.h
19	include/libwebsockets/lws-dsh.h	27	include/libwebsockets/lws-dsh.h
20	include/libwebsockets/lws-esp32.h	28	include/libwebsockets/lws-eventlib-exports.h
21	include/libwebsockets/lws-freertos.h	29	include/libwebsockets/lws-freertos.h
22	include/libwebsockets/lws-fts.h	30	include/libwebsockets/lws-fts.h
23	include/libwebsockets/lws-genaes.h	31	include/libwebsockets/lws-genaes.h
Lines 25-45 include/libwebsockets/lws-gencrypto.h Link Here
25	include/libwebsockets/lws-genec.h	33	include/libwebsockets/lws-genec.h
26	include/libwebsockets/lws-genhash.h	34	include/libwebsockets/lws-genhash.h
27	include/libwebsockets/lws-genrsa.h	35	include/libwebsockets/lws-genrsa.h
		36	include/libwebsockets/lws-gpio.h
28	include/libwebsockets/lws-http.h	37	include/libwebsockets/lws-http.h
		38	include/libwebsockets/lws-i2c.h
		39	include/libwebsockets/lws-ili9341-spi.h
29	include/libwebsockets/lws-jose.h	40	include/libwebsockets/lws-jose.h
30	include/libwebsockets/lws-jwe.h	41	include/libwebsockets/lws-jwe.h
31	include/libwebsockets/lws-jwk.h	42	include/libwebsockets/lws-jwk.h
32	include/libwebsockets/lws-jws.h	43	include/libwebsockets/lws-jws.h
		44	include/libwebsockets/lws-led.h
33	include/libwebsockets/lws-lejp.h	45	include/libwebsockets/lws-lejp.h
34	include/libwebsockets/lws-logs.h	46	include/libwebsockets/lws-logs.h
35	include/libwebsockets/lws-lwsac.h	47	include/libwebsockets/lws-lwsac.h
36	include/libwebsockets/lws-misc.h	48	include/libwebsockets/lws-misc.h
37	include/libwebsockets/lws-mqtt.h	49	include/libwebsockets/lws-mqtt.h
		50	include/libwebsockets/lws-netdev.h
38	include/libwebsockets/lws-network-helper.h	51	include/libwebsockets/lws-network-helper.h
39	include/libwebsockets/lws-optee.h	52	include/libwebsockets/lws-optee.h
40	include/libwebsockets/lws-plugin-generic-sessions.h
41	include/libwebsockets/lws-protocols-plugins.h	53	include/libwebsockets/lws-protocols-plugins.h
42	include/libwebsockets/lws-purify.h	54	include/libwebsockets/lws-purify.h
		55	include/libwebsockets/lws-pwm.h
43	include/libwebsockets/lws-retry.h	56	include/libwebsockets/lws-retry.h
44	include/libwebsockets/lws-ring.h	57	include/libwebsockets/lws-ring.h
45	include/libwebsockets/lws-secure-streams-client.h	58	include/libwebsockets/lws-secure-streams-client.h
Lines 47-54 include/libwebsockets/lws-secure-streams-policy.h Link Here
47	include/libwebsockets/lws-secure-streams.h	60	include/libwebsockets/lws-secure-streams.h
48	include/libwebsockets/lws-sequencer.h	61	include/libwebsockets/lws-sequencer.h
49	include/libwebsockets/lws-service.h	62	include/libwebsockets/lws-service.h
		63	include/libwebsockets/lws-settings.h
50	include/libwebsockets/lws-sha1-base64.h	64	include/libwebsockets/lws-sha1-base64.h
		65	include/libwebsockets/lws-smd.h
51	include/libwebsockets/lws-spa.h	66	include/libwebsockets/lws-spa.h
		67	include/libwebsockets/lws-spi.h
		68	include/libwebsockets/lws-ssd1306-i2c.h
52	include/libwebsockets/lws-state.h	69	include/libwebsockets/lws-state.h
53	include/libwebsockets/lws-stats.h	70	include/libwebsockets/lws-stats.h
54	include/libwebsockets/lws-struct.h	71	include/libwebsockets/lws-struct.h
Lines 64-103 include/libwebsockets/lws-ws-close.h Link Here
64	include/libwebsockets/lws-ws-ext.h	81	include/libwebsockets/lws-ws-ext.h
65	include/libwebsockets/lws-ws-state.h	82	include/libwebsockets/lws-ws-state.h
66	include/libwebsockets/lws-x509.h	83	include/libwebsockets/lws-x509.h
67	include/lws-plugin-ssh.h
68	include/lws_config.h	84	include/lws_config.h
69	lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
70	lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
71	lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake	85	lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake
72	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake	86	lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
		87	lib/cmake/libwebsockets/LwsCheckRequirements.cmake
		88	lib/cmake/libwebsockets/libwebsockets-config-version.cmake
		89	lib/cmake/libwebsockets/libwebsockets-config.cmake
		90	%%GLIB%%lib/libwebsockets-evlib_glib.so
		91	%%LIBEV%%lib/libwebsockets-evlib_ev.so
		92	%%LIBEVENT%%lib/libwebsockets-evlib_event.so
		93	%%LIBUV%%lib/libwebsockets-evlib_uv.so
73	lib/libwebsockets.a	94	lib/libwebsockets.a
74	lib/libwebsockets.so	95	lib/libwebsockets.so
75	lib/libwebsockets.so.16	96	lib/libwebsockets.so.17
76	libdata/pkgconfig/libwebsockets.pc	97	libdata/pkgconfig/libwebsockets.pc
77	libdata/pkgconfig/libwebsockets_static.pc	98	libdata/pkgconfig/libwebsockets_static.pc
		99	@comment %%TEST%%%%DATADIR%%-test-server/candide.zip
		100	@comment %%TEST%%%%DATADIR%%-test-server/favicon.ico
		101	@comment %%TEST%%%%DATADIR%%-test-server/http2.png
		102	@comment %%TEST%%%%DATADIR%%-test-server/leaf.jpg
		103	@comment %%TEST%%%%DATADIR%%-test-server/libwebsockets-test-server.key.pem
		104	@comment %%TEST%%%%DATADIR%%-test-server/libwebsockets-test-server.pem
		105	@comment %%TEST%%%%DATADIR%%-test-server/libwebsockets.org-logo.svg
		106	@comment %%TEST%%%%DATADIR%%-test-server/lws-common.js
		107	@comment %%TEST%%%%DATADIR%%-test-server/lws-ssh-test-keys
		108	@comment %%TEST%%%%DATADIR%%-test-server/lws-ssh-test-keys.pub
		109	@comment %%TEST%%%%DATADIR%%-test-server/test.css
		110	@comment %%TEST%%%%DATADIR%%-test-server/test.html
		111	@comment %%TEST%%%%DATADIR%%-test-server/test.js
		112	@comment %%TEST%%%%DATADIR%%-test-server/wss-over-h2.png
78	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css	113	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css
79	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js	114	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js
80	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg	115	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg
81	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html	116	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.html
82	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/failed-login.html	117	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_client_loopback_test.so
83	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/index.html	118	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_deaddrop.so
84	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs-logo.png	119	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_dumb_increment.so
85	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.css	120	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_mirror.so
86	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/lwsgs.js	121	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_proxy.so
87	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needadmin/admin-login.html	122	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_test.so
88	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/needauth/successful-login.html	123	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_server_status.so
89	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-fail.html	124	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_ssh_base.so
90	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-forgot-ok.html	125	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_sshd_demo.so
91	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-fail.html	126	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_status.so
92	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-register-ok.html	127	%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_post_demo.so
93	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-fail.html	128	@comment %%TEST%%%%DATADIR%%-test-server/private/index.html
94	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/post-verify-ok.html	129	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
95	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/seats.jpg	130	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css
96	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-fail.html	131	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
97	%%PLUGINS%%%%DATADIR%%-test-server/generic-sessions/sent-forgot-ok.html	132	%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js
98	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/index.html
99	%%PLUGINS%%%%DATADIR%%-test-server/generic-table/lwsgt.js
100	%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png
101	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css
102	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html
103	%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js

Return to bug 251835

Removed Link Here

(-)a/net/libwebsockets/files/patch-CMakeLists.txt (-20 lines)
1	--- CMakeLists.txt.orig 2018-03-08 10:28:37 UTC
2	+++ CMakeLists.txt
3	@@ -1739,7 +1739,7 @@ Cflags: -I\${includedir}"
4	)
5
6	install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
7	- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
8	+ DESTINATION libdata/pkgconfig)
9
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)