diff options
| -rw-r--r-- | audio/ardour6/Makefile | 1 | ||||
| -rw-r--r-- | audio/forked-daapd/Makefile | 2 | ||||
| -rw-r--r-- | games/DDNet/Makefile | 1 | ||||
| -rw-r--r-- | net/guacamole-server/Makefile | 1 | ||||
| -rw-r--r-- | net/libwebsockets/Makefile | 105 | ||||
| -rw-r--r-- | net/libwebsockets/distinfo | 6 | ||||
| -rw-r--r-- | net/libwebsockets/files/patch-CMakeLists.txt | 20 | ||||
| -rw-r--r-- | net/libwebsockets/pkg-plist | 66 | ||||
| -rw-r--r-- | net/mosquitto/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/ttyd/Makefile | 1 |
10 files changed, 102 insertions, 102 deletions
diff --git a/audio/ardour6/Makefile b/audio/ardour6/Makefile index ed06226f8bfc..f2c398c6e903 100644 --- a/audio/ardour6/Makefile +++ b/audio/ardour6/Makefile @@ -3,6 +3,7 @@ PORTNAME= ardour6 PORTVERSION= 6.5.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ # The original master side points to the latest release only: diff --git a/audio/forked-daapd/Makefile b/audio/forked-daapd/Makefile index c2c4ad57bee8..c2f2bdc50371 100644 --- a/audio/forked-daapd/Makefile +++ b/audio/forked-daapd/Makefile @@ -3,7 +3,7 @@ PORTNAME= forked-daapd DISTVERSION= 27.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://github.com/ejurgensen/forked-daapd/releases/download/${DISTVERSION}/ diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile index d181203cace9..142557eb0c0c 100644 --- a/games/DDNet/Makefile +++ b/games/DDNet/Makefile @@ -3,6 +3,7 @@ PORTNAME= DDNet PORTVERSION= 15.2.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://ddnet.tw/downloads/ diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index a82bccc7c831..ba76718ad236 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= guacamole-server DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index a38680283769..2d6af8c1b56f 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -3,8 +3,9 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v -DISTVERSION= 4.0.21 +DISTVERSION= 4.1.6 CATEGORIES= net devel +MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/ MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= C library for lightweight websocket clients and servers @@ -12,63 +13,67 @@ COMMENT= C library for lightweight websocket clients and servers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake pkgconfig ssl +USES= cmake localbase pkgconfig tar:xz USE_LDCONFIG= yes -PORTSCOUT= limit:^v\d+\.* +CMAKE_ON= 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 -USE_GITHUB= yes -GH_ACCOUNT= warmcat +OPTIONS_DEFINE= HTTP_PROXY HTTP2 MQTT PEERLIMITS PLUGINS \ + SECURE_STREAMS SOCKS SQLITE WEBSERVER +OPTIONS_DEFAULT= HTTP2 OPENSSL LIBUV +OPTIONS_SUB= yes -CMAKE_ARGS= -DLWS_WITHOUT_TESTAPPS=ON \ - -DLWS_WITHOUT_TEST_SERVER=ON \ - -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \ - -DLWS_WITHOUT_TEST_PING=ON \ - -DLWS_WITHOUT_TEST_CLIENT=ON +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL +OPTIONS_GROUP= EVLOOP +OPTIONS_GROUP_EVLOOP= GLIB LIBEV LIBEVENT LIBUV -OPTIONS_DEFINE= HTTP2 HTTP_PROXY IPV6 LIBEV LIBUV UNIX_SOCK WEBSERVER PLUGINS \ - SOCKS5 MQTT SECURE_STREAMS -OPTIONS_DEFAULT=HTTP2 LIBUV -OPTIONS_SUB= yes - -HTTP2_DESC= Compile with server support for HTTP/2 HTTP_PROXY_DESC= HTTP proxy support -LIBUV_DESC= Asynchronous I/O support via libuv -UNIX_SOCK_DESC= Unix domain socket support -SOCKS5_DESC= Allow use of SOCKS5 proxy on client connections MQTT_DESC= MQTT client support -SECURE_STREAMS_DESC= Secure Streams API support - -HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON - -HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \ - -DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so -HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub - -IPV6_CMAKE_ON= -DLWS_IPV6=ON - -LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON +PEERLIMITS_DESC= Tracking and limiting of resources of peer(s) +PLUGINS_DESC= Plugins support +SECURE_STREAMS_DESC= Secure streams protocol API support +SOCKS_DESC= Allow use of SOCKS5 proxy on client connections +EVLOOP_DESC= Event loop support +GLIB_DESC= Events support via Glib +LIBEVENT_DESC= Asynchronous event notification via libevent +LIBUV_DESC= Asynchronous I/O support via libuv + +HTTP_PROXY_CMAKE_BOOL= LWS_WITH_HTTP_PROXY +HTTP2_CMAKE_BOOL= LWS_WITH_HTTP2 +MQTT_CMAKE_BOOL= LWS_ROLE_MQTT +PEERLIMITS_CMAKE_BOOL= LWS_WITH_PEER_LIMITS +PLUGINS_CMAKE_BOOL= LWS_WITH_PLUGINS \ + LWS_WITH_PLUGINS_API +SECURE_STREAMS_CMAKE_BOOL= LWS_WITH_SECURE_STREAMS \ + LWS_WITH_SECURE_STREAMS_PROXY_API +SOCKS_CMAKE_BOOL= LWS_WITH_SOCKS5 +SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +SQLITE_CMAKE_BOOL= LWS_WITH_SQLITE3 +WEBSERVER_CMAKE_BOOL= LWS_WITH_LWSWS +WEBSERVER_IMPLIES= PEERLIMITS PLUGINS LIBUV + +MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls +MBEDTLS_CMAKE_BOOL= LWS_WITH_MBEDTLS +OPENSSL_USES= ssl +OPENSSL_CMAKE_BOOL= LWS_WITHOUT_BUILTIN_SHA1 +# WolfSSL need to be compiled with --enable-libwebsockets to be compatible +# WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl +# WOLFSSL_CMAKE_BOOL= LWS_WITH_SSL LWS_WITH_WOLFSSL +# WOLFSSL_CMAKE_ON= -DLWS_WOLFSSL_INCLUDE_DIRS=${LOCALBASE}/include \ +# -DLWS_WOLFSSL_LIBRARIES=${LOCALBASE}/lib/libwolfssl.so + +GLIB_USES= gnome +GLIB_USE= GNOME=glib20 +GLIB_CMAKE_BOOL= LWS_WITH_GLIB LIBEV_LIB_DEPENDS= libev.so:devel/libev - -LIBUV_CMAKE_ON= -DLWS_WITH_LIBUV=ON +LIBEV_CMAKE_BOOL= LWS_WITH_LIBEV +LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent +LIBEVENT_CMAKE_BOOL= LWS_WITH_LIBEVENT LIBUV_LIB_DEPENDS= libuv.so:devel/libuv - -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 \ - -DLWS_WITH_GENERIC_SESSIONS=ON -PLUGINS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 - -SOCKS5_CMAKE_ON= -DLWS_WITH_SOCKS5=ON - -MQTT_CMAKE_ON= -DLWS_ROLE_MQTT=ON - -SECURE_STREAMS_CMAKE_ON=-DLWS_WITH_SECURE_STREAMS=ON \ - -DLWS_WITH_SECURE_STREAMS_PROXY_API=ON \ - -DLWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM=ON +LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV .include <bsd.port.mk> diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo index 42c2aa3035cd..5b26cf42e526 100644 --- a/net/libwebsockets/distinfo +++ b/net/libwebsockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603959557 -SHA256 (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 -SIZE (warmcat-libwebsockets-v4.0.21_GH0.tar.gz) = 12342078 +TIMESTAMP = 1607873825 +SHA256 (libwebsockets-v4.1.6.tar.xz) = d24b644bb1686c6dd6e3499b9407bb7e22f08f43da22ae7be435c74433a2641f +SIZE (libwebsockets-v4.1.6.tar.xz) = 8570880 diff --git a/net/libwebsockets/files/patch-CMakeLists.txt b/net/libwebsockets/files/patch-CMakeLists.txt deleted file mode 100644 index 0592f26fc7e2..000000000000 --- a/net/libwebsockets/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- 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) diff --git a/net/libwebsockets/pkg-plist b/net/libwebsockets/pkg-plist index a55eef96f3d1..1a05235c2685 100644 --- a/net/libwebsockets/pkg-plist +++ b/net/libwebsockets/pkg-plist @@ -8,6 +8,9 @@ include/libwebsockets/abstract/transports/raw-skt.h include/libwebsockets/abstract/transports/unit-test.h include/libwebsockets/lws-adopt.h include/libwebsockets/lws-async-dns.h +include/libwebsockets/lws-bb-i2c.h +include/libwebsockets/lws-bb-spi.h +include/libwebsockets/lws-button.h include/libwebsockets/lws-callbacks.h include/libwebsockets/lws-cgi.h include/libwebsockets/lws-client.h @@ -15,9 +18,10 @@ 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-esp32.h +include/libwebsockets/lws-eventlib-exports.h include/libwebsockets/lws-freertos.h include/libwebsockets/lws-fts.h include/libwebsockets/lws-genaes.h @@ -25,21 +29,26 @@ include/libwebsockets/lws-gencrypto.h include/libwebsockets/lws-genec.h include/libwebsockets/lws-genhash.h include/libwebsockets/lws-genrsa.h +include/libwebsockets/lws-gpio.h include/libwebsockets/lws-http.h +include/libwebsockets/lws-i2c.h +include/libwebsockets/lws-ili9341-spi.h include/libwebsockets/lws-jose.h include/libwebsockets/lws-jwe.h include/libwebsockets/lws-jwk.h include/libwebsockets/lws-jws.h +include/libwebsockets/lws-led.h include/libwebsockets/lws-lejp.h include/libwebsockets/lws-logs.h include/libwebsockets/lws-lwsac.h include/libwebsockets/lws-misc.h include/libwebsockets/lws-mqtt.h +include/libwebsockets/lws-netdev.h include/libwebsockets/lws-network-helper.h include/libwebsockets/lws-optee.h -include/libwebsockets/lws-plugin-generic-sessions.h include/libwebsockets/lws-protocols-plugins.h include/libwebsockets/lws-purify.h +include/libwebsockets/lws-pwm.h include/libwebsockets/lws-retry.h include/libwebsockets/lws-ring.h include/libwebsockets/lws-secure-streams-client.h @@ -47,8 +56,12 @@ include/libwebsockets/lws-secure-streams-policy.h include/libwebsockets/lws-secure-streams.h include/libwebsockets/lws-sequencer.h include/libwebsockets/lws-service.h +include/libwebsockets/lws-settings.h include/libwebsockets/lws-sha1-base64.h +include/libwebsockets/lws-smd.h include/libwebsockets/lws-spa.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 @@ -64,40 +77,37 @@ include/libwebsockets/lws-ws-close.h include/libwebsockets/lws-ws-ext.h include/libwebsockets/lws-ws-state.h include/libwebsockets/lws-x509.h -include/lws-plugin-ssh.h include/lws_config.h -lib/cmake/libwebsockets/LibwebsocketsConfig.cmake -lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake lib/cmake/libwebsockets/LibwebsocketsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libwebsockets/LibwebsocketsTargets.cmake +lib/cmake/libwebsockets/LwsCheckRequirements.cmake +lib/cmake/libwebsockets/libwebsockets-config-version.cmake +lib/cmake/libwebsockets/libwebsockets-config.cmake +%%GLIB%%lib/libwebsockets-evlib_glib.so +%%LIBEV%%lib/libwebsockets-evlib_ev.so +%%LIBEVENT%%lib/libwebsockets-evlib_event.so +%%LIBUV%%lib/libwebsockets-evlib_uv.so lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.16 +lib/libwebsockets.so.17 libdata/pkgconfig/libwebsockets.pc libdata/pkgconfig/libwebsockets_static.pc %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.css %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/deaddrop.js %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/drop.svg %%PLUGINS%%%%DATADIR%%-test-server/deaddrop/index.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.css -%%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.css -%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html -%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_client_loopback_test.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_deaddrop.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_dumb_increment.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_mirror.so +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_proxy.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_raw_test.so +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_server_status.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_ssh_base.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_sshd_demo.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_lws_status.so +%%PLUGINS%%%%DATADIR%%-test-server/plugins/libprotocol_post_demo.so +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/lwsws-logo.png +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.css +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.html +%%WEBSERVER%%%%PLUGINS%%%%DATADIR%%-test-server/server-status/server-status.js diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 923f62693c79..3f5ba1bf166f 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -3,6 +3,7 @@ PORTNAME= mosquitto PORTVERSION= 1.6.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://mosquitto.org/files/source/ diff --git a/sysutils/ttyd/Makefile b/sysutils/ttyd/Makefile index a32a728d412c..d2765da45b4c 100644 --- a/sysutils/ttyd/Makefile +++ b/sysutils/ttyd/Makefile @@ -2,6 +2,7 @@ PORTNAME= ttyd DISTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= nc@FreeBSD.org |