Attachment #225569 for bug #256019





PORTNAME=	libwebsockets
DISTVERSIONPREFIX=	v
DISTVERSION=	4.2.0
CATEGORIES=	net devel
MASTER_SITES=	https://libwebsockets.org/git/libwebsockets/snapshot/


USES=		cmake localbase pkgconfig tar:xz
USE_LDCONFIG=	yes

CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
		LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
		LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \
		LWS_WITHOUT_TEST_SERVER_EXTPOLL \
		LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT

OPTIONS_DEFINE=		HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \
			SECURE_STREAMS SOCKS SQLITE WEBSERVER
OPTIONS_DEFAULT=	HTTP2 MQTT OPENSSL LIBUV
OPTIONS_SUB=		yes

OPTIONS_SINGLE=		SSL

LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
LIBUV_CMAKE_BOOL=	LWS_WITH_LIBUV

BUILDINFO=	${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R}

post-patch:
	@${REINPLACE_CMD} -e 's|%%BUILDINFO%%|${BUILDINFO}|g' \
	    ${PATCH_WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net/libwebsockets/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1607873825	1	TIMESTAMP = 1621466017
2	SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f	2	SHA256 (libwebsockets-v4.2.0.tar.xz) = 4d1e42c2be5951b49cda195008f9c39b7dd29a8956ea00bbe52fcf7efb6a623a
3	SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880	3	SIZE (libwebsockets-v4.2.0.tar.xz) = 12769280

Added Link Here

(-)b/net/libwebsockets/files/patch-CMakeLists.txt (+10 lines)
1	--- CMakeLists.txt.orig 2021-05-19 23:49:00 UTC
2	+++ CMakeLists.txt
3	@@ -369,6 +369,7 @@ if(GIT_EXECUTABLE)
4	message("Git commit hash: ${LWS_BUILD_HASH}")
5	endif()
6
7	+set(LWS_BUILD_HASH "%%BUILDINFO%%")
8	set(PACKAGE "libwebsockets")
9	set(CPACK_RPM_PACKAGE_LICENSE "MIT")
10	set(CPACK_PACKAGE_NAME "${PACKAGE}")




include/libwebsockets/lws-callbacks.h
include/libwebsockets/lws-cgi.h
include/libwebsockets/lws-client.h
include/libwebsockets/lws-conmon.h
include/libwebsockets/lws-context-vhost.h
include/libwebsockets/lws-dbus.h
include/libwebsockets/lws-detailed-latency.h
include/libwebsockets/lws-diskcache.h
include/libwebsockets/lws-display.h
include/libwebsockets/lws-dll2.h
include/libwebsockets/lws-dsh.h
include/libwebsockets/lws-eventlib-exports.h
include/libwebsockets/lws-fault-injection.h
include/libwebsockets/lws-freertos.h
include/libwebsockets/lws-fts.h
include/libwebsockets/lws-genaes.h

include/libwebsockets/lws-lejp.h
include/libwebsockets/lws-logs.h
include/libwebsockets/lws-lwsac.h
include/libwebsockets/lws-metrics.h
include/libwebsockets/lws-misc.h
include/libwebsockets/lws-mqtt.h
include/libwebsockets/lws-netdev.h

include/libwebsockets/lws-spi.h
include/libwebsockets/lws-ssd1306-i2c.h
include/libwebsockets/lws-state.h
include/libwebsockets/lws-stats.h
include/libwebsockets/lws-struct.h
include/libwebsockets/lws-system.h
include/libwebsockets/lws-test-sequencer.h
include/libwebsockets/lws-threadpool.h
include/libwebsockets/lws-timeout-timer.h
include/libwebsockets/lws-tls-sessions.h
include/libwebsockets/lws-tokenize.h
include/libwebsockets/lws-vfs.h
include/libwebsockets/lws-write.h

%%LIBUV%%lib/libwebsockets-evlib_uv.so
lib/libwebsockets.a
lib/libwebsockets.so
lib/libwebsockets.so.18
libdata/pkgconfig/libwebsockets.pc
libdata/pkgconfig/libwebsockets_static.pc
%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css

Return to bug 256019

Lines 2-8 Link Here

(-)b/net/libwebsockets/Makefile (-3 / +10 lines)
2		2
3	PORTNAME= libwebsockets	3	PORTNAME= libwebsockets
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 4.1.6	5	DISTVERSION= 4.2.0
6	CATEGORIES= net devel	6	CATEGORIES= net devel
7	MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/	7	MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/
8		8
Lines 15-28 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
15	USES= cmake localbase pkgconfig tar:xz	15	USES= cmake localbase pkgconfig tar:xz
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	CMAKE_ON= LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \	18	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \
		19	LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \
19	LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \	20	LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \
20	LWS_WITHOUT_TEST_SERVER_EXTPOLL \	21	LWS_WITHOUT_TEST_SERVER_EXTPOLL \
21	LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT	22	LWS_WITHOUT_TEST_PING LWS_WITHOUT_TEST_CLIENT
22		23
23	OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \	24	OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \
24	SECURE_STREAMS SOCKS SQLITE WEBSERVER	25	SECURE_STREAMS SOCKS SQLITE WEBSERVER
25	OPTIONS_DEFAULT= HTTP2 OPENSSL LIBUV	26	OPTIONS_DEFAULT= HTTP2 MQTT OPENSSL LIBUV
26	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
27		28
28	OPTIONS_SINGLE= SSL	29	OPTIONS_SINGLE= SSL
Lines 75-78 LIBEVENT_CMAKE_BOOL= LWS_WITH_LIBEVENT Link Here
75	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv	76	LIBUV_LIB_DEPENDS= libuv.so:devel/libuv
76	LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV	77	LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV
77		78
		79	BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R}
		80
		81	post-patch:
		82	@${REINPLACE_CMD} -e 's\|%%BUILDINFO%%\|${BUILDINFO}\|g' \
		83	${PATCH_WRKSRC}/CMakeLists.txt
		84
78	.include <bsd.port.mk>	85	.include <bsd.port.mk>

Lines 14-27 include/libwebsockets/lws-button.h Link Here

(-)b/net/libwebsockets/pkg-plist (-3 / +5 lines)
14	include/libwebsockets/lws-callbacks.h	14	include/libwebsockets/lws-callbacks.h
15	include/libwebsockets/lws-cgi.h	15	include/libwebsockets/lws-cgi.h
16	include/libwebsockets/lws-client.h	16	include/libwebsockets/lws-client.h
		17	include/libwebsockets/lws-conmon.h
17	include/libwebsockets/lws-context-vhost.h	18	include/libwebsockets/lws-context-vhost.h
18	include/libwebsockets/lws-dbus.h	19	include/libwebsockets/lws-dbus.h
19	include/libwebsockets/lws-detailed-latency.h
20	include/libwebsockets/lws-diskcache.h	20	include/libwebsockets/lws-diskcache.h
21	include/libwebsockets/lws-display.h	21	include/libwebsockets/lws-display.h
22	include/libwebsockets/lws-dll2.h	22	include/libwebsockets/lws-dll2.h
23	include/libwebsockets/lws-dsh.h	23	include/libwebsockets/lws-dsh.h
24	include/libwebsockets/lws-eventlib-exports.h	24	include/libwebsockets/lws-eventlib-exports.h
		25	include/libwebsockets/lws-fault-injection.h
25	include/libwebsockets/lws-freertos.h	26	include/libwebsockets/lws-freertos.h
26	include/libwebsockets/lws-fts.h	27	include/libwebsockets/lws-fts.h
27	include/libwebsockets/lws-genaes.h	28	include/libwebsockets/lws-genaes.h
Lines 41-46 include/libwebsockets/lws-led.h Link Here
41	include/libwebsockets/lws-lejp.h	42	include/libwebsockets/lws-lejp.h
42	include/libwebsockets/lws-logs.h	43	include/libwebsockets/lws-logs.h
43	include/libwebsockets/lws-lwsac.h	44	include/libwebsockets/lws-lwsac.h
		45	include/libwebsockets/lws-metrics.h
44	include/libwebsockets/lws-misc.h	46	include/libwebsockets/lws-misc.h
45	include/libwebsockets/lws-mqtt.h	47	include/libwebsockets/lws-mqtt.h
46	include/libwebsockets/lws-netdev.h	48	include/libwebsockets/lws-netdev.h
Lines 63-74 include/libwebsockets/lws-spa.h Link Here
63	include/libwebsockets/lws-spi.h	65	include/libwebsockets/lws-spi.h
64	include/libwebsockets/lws-ssd1306-i2c.h	66	include/libwebsockets/lws-ssd1306-i2c.h
65	include/libwebsockets/lws-state.h	67	include/libwebsockets/lws-state.h
66	include/libwebsockets/lws-stats.h
67	include/libwebsockets/lws-struct.h	68	include/libwebsockets/lws-struct.h
68	include/libwebsockets/lws-system.h	69	include/libwebsockets/lws-system.h
69	include/libwebsockets/lws-test-sequencer.h	70	include/libwebsockets/lws-test-sequencer.h
70	include/libwebsockets/lws-threadpool.h	71	include/libwebsockets/lws-threadpool.h
71	include/libwebsockets/lws-timeout-timer.h	72	include/libwebsockets/lws-timeout-timer.h
		73	include/libwebsockets/lws-tls-sessions.h
72	include/libwebsockets/lws-tokenize.h	74	include/libwebsockets/lws-tokenize.h
73	include/libwebsockets/lws-vfs.h	75	include/libwebsockets/lws-vfs.h
74	include/libwebsockets/lws-write.h	76	include/libwebsockets/lws-write.h
Lines 89-95 lib/cmake/libwebsockets/libwebsockets-config.cmake Link Here
89	%%LIBUV%%lib/libwebsockets-evlib_uv.so	91	%%LIBUV%%lib/libwebsockets-evlib_uv.so
90	lib/libwebsockets.a	92	lib/libwebsockets.a
91	lib/libwebsockets.so	93	lib/libwebsockets.so
92	lib/libwebsockets.so.17	94	lib/libwebsockets.so.18
93	libdata/pkgconfig/libwebsockets.pc	95	libdata/pkgconfig/libwebsockets.pc
94	libdata/pkgconfig/libwebsockets_static.pc	96	libdata/pkgconfig/libwebsockets_static.pc
95	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css	97	%%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css