diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index de1658fd029c..ef9b896de476 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -1,120 +1,141 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.0
+DISTVERSION=	4.2.0
 CATEGORIES=	audio
 
-MAINTAINER=	herbert@gojira.at
+MAINTAINER=	zarychtam@plan-b.pwste.edu.pl
 COMMENT=	Small SIP client
 WWW=		https://github.com/baresip
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	re>=${DISTVERSION:R}:audio/re
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LIB_DEPENDS=	libre.so:audio/re
+
+FLAVORS=			default nox11
+default_CONFLICTS_INSTALL=	barsip-nox11
+nox11_PKGNAMESUFFIX=		-nox11
+nox11_CONFLICTS_INSTALL=	baresip
 
 USES=		cmake pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	baresip
-PORTDOCS=	ChangeLog CONTRIBUTING.md THANKS
+PORTDOCS=	CONTRIBUTING.md ChangeLog THANKS
 
 OPTIONS_DEFINE=		ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS DOCS \
-			EXAMPLES G711 G722 G726 GST GTK3 MQTT OPUS OPUS_MS PLC \
-			PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE V4L2 \
-			VPX X11
+			EXAMPLES G711 G722 G726 GST GTK3 JACK MQTT OPUS OPUS_MS \
+			PLC PORTAUDIO PULSEAUDIO SDL SNAPSHOT SNDFILE SWSCALE \
+			V4L2 VPX X11
+OPTIONS_DEFAULT=	ALSA AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS G711 G722 \
+			G726 GST GTK3 OPUS PLC PORTAUDIO SDL SNAPSHOT SNDFILE \
+			SWSCALE V4L2 VPX X11
+.if ${FLAVOR:U} == nox11
+COMMENT+=		(without X11 and video calls)
+OPTIONS_EXCLUDE=	AV1 AVCODEC AVFILTER AVFORMAT CTRL_DBUS GST GTK3 SDL \
+			SNAPSHOT SWSCALE V4L2 VPX X11
+.endif
 OPTIONS_SUB=		yes
 
 ALSA_DESC=	ALSA audio driver
 AV1_DESC=	AV1 Video Codec
 AVCODEC_DESC=	Video codecs using libavcodec
 AVFILTER_DESC=	Video filter using libavfilter
 AVFORMAT_DESC=	libavformat media-source
 CTRL_DBUS_DESC=	[broken] DBUS interface for baresip
 G711_DESC=	G.711 audio codec
 G722_DESC=	G.722 audio codec
 G726_DESC=	G.726 audio codec
 GST_DESC=	Gstreamer audio module
+JACK_DESC=	JACK audio module
 MQTT_DESC=	Message Queue Telemetry Transport (MQTT) client
 OPUS_MS_DESC=	Opus Multistream audio codec
 PLC_DESC=	Packet Loss Concealment
 SDL_DESC=	libSDL2 video output
 SNAPSHOT_DESC=	Snapshot video module
 SNDFILE_DESC=	sndfile wav dumper
 SWSCALE_DESC=	Video filter for scaling and pixel conversion
 V4L2_DESC=	Video4Linux2 module
 VPX_DESC=	VP8/VP9 video codecs
 X11_DESC=	X11 video output
 
 _MODULES_LIST=	account aubridge auconv aufile auresamp ausine cons contact \
-		ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd \
-		httpreq ice l16 menu mixausrc mixminus mwi natpmp netroam pcp \
-		presence rtcpsummary selfview serreg srtp stdio stun syslog \
-		turn uuid vidbridge vidinfo vumeter
+		ctrl_tcp debug_cmd dtls_srtp echo fakevideo httpd httpreq ice \
+		l16 menu mixausrc mixminus mwi natpmp netroam pcp presence \
+		rtcpsummary selfview serreg srtp stdio stun syslog turn uuid \
+		vidbridge vidinfo vumeter
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_VARS=		_MODULES_LIST+=alsa
 AV1_LIB_DEPENDS+=	libaom.so:multimedia/aom
 AV1_VARS=		_MODULES_LIST+=av1
 AVCODEC_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libdrm.so:graphics/libdrm
 AVCODEC_VARS=		_MODULES_LIST+=avcodec
 AVFILTER_LIB_DEPENDS=	libavfilter.so:multimedia/ffmpeg
 AVFILTER_VARS=		_MODULES_LIST+=avfilter
 AVFORMAT_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 AVFORMAT_VARS=		_MODULES_LIST+=avformat
 G711_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G711_VARS=		_MODULES_LIST+=g711
 G722_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G722_VARS=		_MODULES_LIST+=g722
 G726_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 G726_VARS=		_MODULES_LIST+=g726
 GST_USES=		gnome gstreamer:1
-GST_VARS=		USE_GNOME+=glib20
+GST_VARS=		_MODULES_LIST+=gst \
+			USE_GNOME+=glib20
 GTK3_USES=		gnome
-GTK3_VARS=		USE_GNOME+=gtk30 _MODULES_LIST+=gtk
+GTK3_VARS=		_MODULES_LIST+=gtk \
+			USE_GNOME+=gtk30
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_VARS=		_MODULES_LIST+=jack
 MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
 MQTT_VARS=		_MODULES_LIST+=mqtt
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_VARS=		_MODULES_LIST+=opus
 OPUS_MS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_MS_VARS=		_MODULES_LIST+=opus_multistream
 PLC_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 PLC_VARS=		_MODULES_LIST+=plc
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_VARS=		_MODULES_LIST+=portaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	_MODULES_LIST+=pulse
 SDL_LIB_DEPENDS=	libglapi.so:graphics/mesa-libs
 SDL_USES=		sdl
 SDL_VARS=		_MODULES_LIST+=sdl \
 			USE_SDL=sdl2
 SNAPSHOT_LIB_DEPENDS=	libpng16.so:graphics/png
 SNAPSHOT_VARS=		_MODULES_LIST+=snapshot
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_VARS=		_MODULES_LIST+=sndfile
 SWSCALE_LIB_DEPENDS=	libswscale.so:multimedia/ffmpeg
 SWSCALE_VARS=		_MODULES_LIST+=swscale
 V4L2_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L2_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 V4L2_VARS=		_MODULES_LIST+=v4l2
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_VARS=		_MODULES_LIST+="vp8 vp9"
 X11_USES=		xorg
 X11_VARS=		_MODULES_LIST+=x11 \
 			USE_XORG="x11 ice sm xext"
 
 .include <bsd.port.options.mk>
 
 CMAKE_ARGS+=	-DMODULES="$(_MODULES_LIST:ts;)" \
 		-DRE_INCLUDE_DIR:STRING="${LOCALBASE}/include/re" \
 		-DREM_INCLUDE_DIR:STRING="${LOCALBASE}/include/rem"
 
+post-patch:
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/cmake/FindGST.cmake
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo
index ceb973463746..9fe1957758f4 100644
--- a/audio/baresip/distinfo
+++ b/audio/baresip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757536377
-SHA256 (baresip-baresip-v4.1.0_GH0.tar.gz) = ef8663b95caf187edd5062136230be02bd6815090da410b2fe6b7e1341312133
-SIZE (baresip-baresip-v4.1.0_GH0.tar.gz) = 1185261
+TIMESTAMP = 1760646436
+SHA256 (baresip-baresip-v4.2.0_GH0.tar.gz) = 4b9fba7c53cabec4cc702bf47fb421f078d6f31421b7bea8f3f0fdbe1a671674
+SIZE (baresip-baresip-v4.2.0_GH0.tar.gz) = 1181348
diff --git a/audio/baresip/files/patch-cmake_FindGST.cmake b/audio/baresip/files/patch-cmake_FindGST.cmake
new file mode 100644
index 000000000000..51e347e884de
--- /dev/null
+++ b/audio/baresip/files/patch-cmake_FindGST.cmake
@@ -0,0 +1,44 @@
+--- cmake/FindGST.cmake.orig	2025-10-17 17:11:22 UTC
++++ cmake/FindGST.cmake
+@@ -2,14 +2,14 @@ find_path(GST_INCLUDE_DIR
+   NAMES gst/gst.h
+   HINTS
+     "${GST_INCLUDE_DIRS}"
+-  PATHS /usr/include/gstreamer-1.0
++  PATHS %%LOCALBASE%%/include/gstreamer-1.0
+ )
+ 
+ find_path(GL_INCLUDE_DIR
+   NAMES glib.h
+   HINTS
+     "${GL_INCLUDE_DIRS}"
+-  PATHS /usr/include/glib-2.0
++  PATHS %%LOCALBASE%%/include/glib-2.0
+ )
+ 
+ find_path(GLIB_INCLUDE_DIR
+@@ -19,21 +19,21 @@ find_path(GLIB_INCLUDE_DIR
+   PATHS /usr/lib/x86_64-linux-gnu/glib-2.0
+         /usr/lib/x86_64-linux-gnu/glib-2.0/include
+         /usr/lib64/glib-2.0
+-        /usr/lib/glib-2.0
++        %%LOCALBASE%%/lib/glib-2.0/include
+ )
+ 
+ find_library(GST_LIBRARY
+   NAMES gstreamer-1.0
+   HINTS
+     "${GST_LIBRARY_DIRS}"
+-  PATHS /usr/lib/x86_64-linux-gnu
++  PATHS %%LOCALBASE%%/lib
+ )
+ 
+ find_library(GL_LIBRARY
+   NAMES glib-2.0
+   HINTS
+     "${GL_LIBRARY_DIRS}"
+-  PATHS /usr/lib/x86_64-linux-gnu
++  PATHS %%LOCALBASE%%/lib
+ )
+ 
+ include(FindPackageHandleStandardArgs)
diff --git a/audio/baresip/pkg-plist b/audio/baresip/pkg-plist
index ab895ca6e1d9..23c8bc72fd46 100644
--- a/audio/baresip/pkg-plist
+++ b/audio/baresip/pkg-plist
@@ -1,96 +1,98 @@
 bin/baresip
 include/baresip.h
 lib/baresip/modules/account.so
 %%ALSA%%lib/baresip/modules/alsa.so
 lib/baresip/modules/aubridge.so
 lib/baresip/modules/auconv.so
 lib/baresip/modules/aufile.so
 lib/baresip/modules/auresamp.so
 lib/baresip/modules/ausine.so
 %%AV1%%lib/baresip/modules/av1.so
 %%AVCODEC%%lib/baresip/modules/avcodec.so
 %%AVFILTER%%lib/baresip/modules/avfilter.so
 %%AVFORMAT%%lib/baresip/modules/avformat.so
 lib/baresip/modules/cons.so
 lib/baresip/modules/contact.so
 @comment %%CTRL_DBUS%%lib/baresip/modules/ctrl_dbus.so
 lib/baresip/modules/ctrl_tcp.so
 lib/baresip/modules/debug_cmd.so
 lib/baresip/modules/dtls_srtp.so
 lib/baresip/modules/echo.so
 lib/baresip/modules/fakevideo.so
 %%G711%%lib/baresip/modules/g711.so
 %%G722%%lib/baresip/modules/g722.so
 %%G726%%lib/baresip/modules/g726.so
+%%GST%%lib/baresip/modules/gst.so
 %%GTK3%%lib/baresip/modules/gtk.so
 lib/baresip/modules/httpd.so
 lib/baresip/modules/httpreq.so
 lib/baresip/modules/ice.so
+%%JACK%%lib/baresip/modules/jack.so
 lib/baresip/modules/l16.so
 lib/baresip/modules/menu.so
 lib/baresip/modules/mixausrc.so
 lib/baresip/modules/mixminus.so
 %%MQTT%%lib/baresip/modules/mqtt.so
 lib/baresip/modules/mwi.so
 lib/baresip/modules/natpmp.so
 lib/baresip/modules/netroam.so
 %%OPUS%%lib/baresip/modules/opus.so
 %%OPUS_MS%%lib/baresip/modules/opus_multistream.so
 lib/baresip/modules/pcp.so
 %%PLC%%lib/baresip/modules/plc.so
 %%PORTAUDIO%%lib/baresip/modules/portaudio.so
 lib/baresip/modules/presence.so
 %%PULSEAUDIO%%lib/baresip/modules/pulse.so
 lib/baresip/modules/rtcpsummary.so
 %%SDL%%lib/baresip/modules/sdl.so
 lib/baresip/modules/selfview.so
 lib/baresip/modules/serreg.so
 %%SNAPSHOT%%lib/baresip/modules/snapshot.so
 %%SNDFILE%%lib/baresip/modules/sndfile.so
 lib/baresip/modules/srtp.so
 lib/baresip/modules/stdio.so
 lib/baresip/modules/stun.so
 %%SWSCALE%%lib/baresip/modules/swscale.so
 lib/baresip/modules/syslog.so
 lib/baresip/modules/turn.so
 lib/baresip/modules/uuid.so
 %%V4L2%%lib/baresip/modules/v4l2.so
 lib/baresip/modules/vidbridge.so
 lib/baresip/modules/vidinfo.so
 %%VPX%%lib/baresip/modules/vp8.so
 %%VPX%%lib/baresip/modules/vp9.so
 lib/baresip/modules/vumeter.so
 %%X11%%lib/baresip/modules/x11.so
 lib/libbaresip.so
 lib/libbaresip.so.22
-lib/libbaresip.so.22.1.0
+lib/libbaresip.so.22.2.0
 libdata/pkgconfig/libbaresip.pc
 share/applications/com.github.baresip.desktop
 %%DATADIR%%/autoanswer.wav
 %%DATADIR%%/busy.wav
 %%DATADIR%%/callwaiting.wav
 %%DATADIR%%/error.wav
 %%DATADIR%%/logo.png
 %%DATADIR%%/message.wav
 %%DATADIR%%/notfound.wav
 %%DATADIR%%/ring.wav
 %%DATADIR%%/ringback.wav
 %%DATADIR%%/sound0.wav
 %%DATADIR%%/sound1.wav
 %%DATADIR%%/sound2.wav
 %%DATADIR%%/sound3.wav
 %%DATADIR%%/sound4.wav
 %%DATADIR%%/sound5.wav
 %%DATADIR%%/sound6.wav
 %%DATADIR%%/sound7.wav
 %%DATADIR%%/sound8.wav
 %%DATADIR%%/sound9.wav
 %%DATADIR%%/sounda.wav
 %%DATADIR%%/soundb.wav
 %%DATADIR%%/soundc.wav
 %%DATADIR%%/soundd.wav
 %%DATADIR%%/soundroute.wav
 %%DATADIR%%/soundstar.wav
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/accounts
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contacts