Index: head/audio/ardour6/Makefile =================================================================== --- head/audio/ardour6/Makefile (revision 564063) +++ head/audio/ardour6/Makefile (revision 564064) @@ -1,118 +1,119 @@ # Created by: Michael Beer # $FreeBSD$ 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: # MASTER_SITES= https://community.ardour.org/srctar/ DISTNAME= Ardour-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Multichannel digital audio workstation LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= fails to configure: Could not find the program gas,as,gcc BUILD_DEPENDS= lv2>=1.18.0:audio/lv2 \ itstool>2.0.0:textproc/itstool LIB_DEPENDS= libserd-0.so:devel/serd \ libsord-0.so:devel/sord \ libsratom-0.so:audio/sratom \ liblilv-0.so:audio/lilv \ libsuil-0.so:audio/suil \ libaubio.so:audio/aubio \ librubberband.so:audio/rubberband \ liblo.so:audio/liblo \ liblrdf.so:textproc/liblrdf \ libjack.so:audio/jack \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libboost_date_time.so:devel/boost-libs \ libvamp-hostsdk.so:audio/vamp-plugin-sdk \ libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile \ libtag.so:audio/taglib \ libfftw3f.so:math/fftw3-float \ libcurl.so:ftp/curl \ libogg.so:audio/libogg \ libFLAC.so:audio/flac \ libSoundTouch.so:audio/soundtouch \ libwebsockets.so:net/libwebsockets USES= compiler:c++11-lang desktop-file-utils gettext gnome \ libarchive pkgconfig python:3.7,build readline:port tar:bzip2 \ waf xorg USE_CXXSTD= c++11 USE_XORG= x11 USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango USE_LDCONFIG= yes INSTALLS_ICONS= yes BINARY_ALIAS+= gas=${CC} PLIST_SUB= ARDOURVERSION=${PORTVERSION} CONFIGURE_ARGS= --optimize --ptformat --freedesktop --no-phone-home \ --with-backends=jack,dummy --internal-shared-libs --no-vst3 post-patch: @${REINPLACE_CMD} -e 's/obj\.use = '\''libsmf libpbd'\''/obj\.use = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript @${REINPLACE_CMD} -e 's/libsmf\.name = '\''libsmf'\''/libsmf\.name = '\''libsmf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript @${REINPLACE_CMD} -e 's/libsmf\.target = '\''smf'\''/libsmf\.target = '\''smf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps @${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.appdata.xml \ ${STAGEDIR}${PREFIX}/share/appdata/${PORTNAME}.appdata.xml @${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_16px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_22px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_32px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_48px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_256px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_512px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png @${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \ -name '*.so*' -exec ${STRIP_CMD} {} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sanityCheck @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-copy-mixer @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-export @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-fix_bbtppq @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_empty_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-exec-wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-vst-scanner @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession .include .if ${ARCH} == "i386" # only support for i686 or better WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686 .elif ${ARCH} == "amd64" WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64 .endif .if defined(WITH_ARCH_FLAGS) CONFIGURE_ARGS+= ${WITH_ARCH_FLAGS} .endif .include Index: head/audio/forked-daapd/Makefile =================================================================== --- head/audio/forked-daapd/Makefile (revision 564063) +++ head/audio/forked-daapd/Makefile (revision 564064) @@ -1,65 +1,65 @@ # Created by: Takumi Takahashi # $FreeBSD$ PORTNAME= forked-daapd DISTVERSION= 27.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://github.com/ejurgensen/forked-daapd/releases/download/${DISTVERSION}/ MAINTAINER= takumiiinn@gmail.com COMMENT= DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libavahi-client.so:net/avahi-app \ libavcodec.so:multimedia/ffmpeg \ libconfuse.so:devel/libconfuse \ libcurl.so:ftp/curl \ libevent_pthreads.so:devel/libevent \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libjson-c.so:devel/json-c \ libinotify.so:devel/libinotify \ libmxml.so:textproc/mxml \ libplist-2.0.so:devel/libplist \ libsodium.so:security/libsodium \ libunistring.so:devel/libunistring \ libwebsockets.so:net/libwebsockets USES= gnome gmake gperf iconv:wchar_t libtool localbase pathfix \ pkgconfig sqlite tar:xz USE_GNOME= libxml2 GNU_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message USERS= daapd GROUPS= daapd OPTIONS_DEFINE= ALSA ITUNES MPD PULSEAUDIO OPTIONS_DEFAULT= ITUNES MPD ITUNES_DESC= iTunes XML support MPD_DESC= Music Player Daemon protocol support ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_WITH= alsa ITUNES_CONFIGURE_ENABLE= itunes MPD_CONFIGURE_ENABLE= mpd PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/forked-daapd/forked-daapd-sqlext.so @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/forked-daapd @${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample .include Index: head/games/DDNet/Makefile =================================================================== --- head/games/DDNet/Makefile (revision 564063) +++ head/games/DDNet/Makefile (revision 564064) @@ -1,71 +1,72 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= DDNet PORTVERSION= 15.2.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://ddnet.tw/downloads/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= DDraceNetwork, a cooperative racing mod of Teeworlds LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/license.txt USES= cmake compiler:c++11-lang pkgconfig python sqlite:3 ssl tar:xz CMAKE_ARGS= -DPYTHON_EXECUTABLE="${PYTHON_CMD}" CMAKE_OFF= AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS PORTDATA= * DATADIR= ${PREFIX}/share/ddnet OPTIONS_DEFINE= CLIENT TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP OPTIONS_DEFAULT= CLIENT TEST OPTIONS_SUB= yes CLIENT_DESC= Build game client CLIENT_CMAKE_BOOL= CLIENT CLIENT_USES= gettext gl sdl xorg desktop-file-utils CLIENT_USE= GL=gl,glew XORG=x11 SDL=sdl2 CLIENT_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libwavpack.so:audio/wavpack \ libpnglite.so:graphics/pnglite \ libopusfile.so:audio/opusfile \ libopus.so:audio/opus \ libogg.so:audio/libogg \ libnotify.so:devel/libnotify \ libcurl.so:ftp/curl TEST_BUILD_DEPENDS= googletest>=0:devel/googletest TEST_TEST_TARGET= run_tests WEBSOCKETS_DESC= Enable WebSocket support for server WEBSOCKETS_CMAKE_BOOL= WEBSOCKETS WEBSOCKETS_LIB_DEPENDS= libwebsockets.so:net/libwebsockets MYSQL_DESC= Enable MySQL/MariaDB support for server MYSQL_CMAKE_BOOL= MYSQL MYSQL_USES= mysql MYSQL_LIB_DEPENDS= libmysqlcppconn.so:databases/mysql-connector-c++ VIDEORECORDER_DESC= Video recording support using FFmpeg to the client VIDEORECORDER_CMAKE_BOOL=VIDEORECORDER VIDEORECORDER_LIB_DEPENDS=libavcodec.so:multimedia/ffmpeg UPNP_DESC= UPnP support for the server UPNP_CMAKE_BOOL= UPNP UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc post-extract: # json-parser and md5 are left intact .for dep in glew pnglite wavpack zlib @${RM} -r ${WRKSRC}/src/engine/external/${dep} .endfor post-patch: @${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt post-patch-TEST-off: @${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt .include Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 564063) +++ head/net/guacamole-server/Makefile (revision 564064) @@ -1,101 +1,102 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-server DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ libpng.so:graphics/png CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USES= autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \ shebangfix USE_GITHUB= yes GH_ACCOUNT= apache USE_GNOME= cairo USE_LDCONFIG= yes USE_RC_SUBR= guacd SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-guacd-conf=${ETCDIR}/guacd.conf INSTALL_TARGET= install-strip GUACAMOLE_HOME?= ${PREFIX}/guacamole USERS= guacamole GROUPS= guacamole SUB_LIST= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} PLIST_SUB= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} OPTIONS_DEFINE= GUACENC GUACLOG NLS SSL WEBP OPTIONS_DEFAULT= GUACENC GUACLOG KUBERNETES PULSEAUDIO RDP \ SSH SSL VNC VORBIS WEBP OPTIONS_GROUP= SP AUDIO OPTIONS_GROUP_SP= KUBERNETES RDP SSH VNC OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO OPTIONS_SUB= yes AUDIO_DESC= Audio Support GUACENC_DESC= Video Encoding Utility GUACLOG_DESC= Input log interpreter KUBERNETES_DESC= Kubernetes protocol support RDP_DESC= RDP protocol support SP_DESC= Supported Protocols VNC_DESC= VNC protocol support GUACENC_CONFIGURE_ENABLE= guacenc GUACENC_CONFIGURE_WITH= libavcodec libavutil libswscale GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GUACENC_CFLAGS= -Wno-error=deprecated GUACLOG_CONFIGURE_ENABLE= guaclog KUBERNETES_CONFIGURE_ENABLE= kubernetes KUBERNETES_CONFIGURE_WITH= pango terminal KUBERNETES_LIB_DEPENDS= libwebsockets.so:net/libwebsockets KUBERNETES_USE= GNOME=pango NLS_USES= gettext-runtime PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio RDP_CONFIGURE_WITH= rdp RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp SSH_CONFIGURE_WITH= pango ssh terminal SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_USE= GNOME=pango SSL_CONFIGURE_WITH= ssl SSL_USES= ssl VNC_CONFIGURE_WITH= vnc VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VORBIS_CONFIGURE_WITH= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp post-patch: @${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/src/libguac/Makefile.am \ ${WRKSRC}/src/protocols/vnc/Makefile.am @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${ETCDIR}|g' \ ${WRKSRC}/src/guacd/man/guacd.conf.5.in post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} .include Index: head/net/libwebsockets/files/patch-CMakeLists.txt =================================================================== --- head/net/libwebsockets/files/patch-CMakeLists.txt (revision 564063) +++ head/net/libwebsockets/files/patch-CMakeLists.txt (nonexistent) @@ -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) Property changes on: head/net/libwebsockets/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/libwebsockets/Makefile =================================================================== --- head/net/libwebsockets/Makefile (revision 564063) +++ head/net/libwebsockets/Makefile (revision 564064) @@ -1,74 +1,79 @@ # Created by: Iblis Lin # $FreeBSD$ 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 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 +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 -HTTP2_CMAKE_ON= -DLWS_WITH_HTTP2=ON +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 -HTTP_PROXY_CMAKE_ON= -DLWS_WITH_HTTP_PROXY=ON \ - -DLIBHUBBUB_LIBRARIES=${LOCALBASE}/lib/libhubbub.so -HTTP_PROXY_LIB_DEPENDS= libhubbub.so:www/libhubbub +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 -IPV6_CMAKE_ON= -DLWS_IPV6=ON - -LIBEV_CMAKE_ON= -DLWS_WITH_LIBEV=ON +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 Index: head/net/libwebsockets/distinfo =================================================================== --- head/net/libwebsockets/distinfo (revision 564063) +++ head/net/libwebsockets/distinfo (revision 564064) @@ -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 Index: head/net/libwebsockets/pkg-plist =================================================================== --- head/net/libwebsockets/pkg-plist (revision 564063) +++ head/net/libwebsockets/pkg-plist (revision 564064) @@ -1,103 +1,113 @@ %%WEBSERVER%%bin/lwsws include/libwebsockets.h include/libwebsockets/abstract/abstract.h include/libwebsockets/abstract/protocols.h include/libwebsockets/abstract/protocols/smtp.h include/libwebsockets/abstract/transports.h 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 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 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 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 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-tokenize.h include/libwebsockets/lws-vfs.h include/libwebsockets/lws-write.h include/libwebsockets/lws-writeable.h 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 Index: head/net/mosquitto/Makefile =================================================================== --- head/net/mosquitto/Makefile (revision 564063) +++ head/net/mosquitto/Makefile (revision 564064) @@ -1,55 +1,56 @@ # Created by: Joseph Benden # $FreeBSD$ PORTNAME= mosquitto PORTVERSION= 1.6.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://mosquitto.org/files/source/ PATCH_SITES= https://github.com/eclipse/mosquitto/commit/ PATCHFILES= 8a4ae28fa926589e9891674ca4424dc703ad2d88.patch:-p1 MAINTAINER= joe@thrallingpenguin.com COMMENT= Open source MQTT broker LICENSE= EPL LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake ssl USE_RC_SUBR= mosquitto USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" USERS= nobody PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CARES WS OPTIONS_DEFAULT= CARES CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON WS_DESC= MQTT over Websockets support WS_LIB_DEPENDS= libwebsockets.so:net/libwebsockets WS_CMAKE_ON= -DWITH_WEBSOCKETS:BOOL=ON post-patch: @${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt post-install: ${SED} -e '/cafile/s,/usr/local,${LOCALBASE},' \ ${STAGEDIR}${ETCDIR}/mosquitto.conf > \ ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/pwfile.example \ ${STAGEDIR}${ETCDIR}/pwfile.sample ${MV} ${STAGEDIR}${ETCDIR}/pskfile.example \ ${STAGEDIR}${ETCDIR}/pskfile.sample ${MV} ${STAGEDIR}${ETCDIR}/aclfile.example \ ${STAGEDIR}${ETCDIR}/aclfile.sample .include Index: head/sysutils/ttyd/Makefile =================================================================== --- head/sysutils/ttyd/Makefile (revision 564063) +++ head/sysutils/ttyd/Makefile (revision 564064) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= ttyd DISTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= nc@FreeBSD.org COMMENT= Program to share your terminal over the web LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= xxd:editors/vim-console LIB_DEPENDS= libjson-c.so:devel/json-c \ libuv.so:devel/libuv \ libwebsockets.so:net/libwebsockets USES= cmake pkgconfig ssl USE_CSTD= c99 USE_GITHUB= yes GH_ACCOUNT= tsl0922 PLIST_FILES= bin/${PORTNAME} \ man/man1/ttyd.1.gz .include