diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index ab65d9a4bc01..be036f740e3d 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -1,56 +1,71 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	libsoup
 PORTVERSION=	2.72.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	SOAP (Simple Object Access Protocol) implementation in C
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libpsl.so:dns/libpsl
 RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
-PORTSCOUT=	limitw:1,even
+USES=		gettext gnome localbase meson \
+		pkgconfig python:3.6+,build sqlite ssl tar:xz
+USE_GNOME=	glib20 intlhack introspection:build \
+		libxml2
+USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=			SMB
 OPTIONS_SINGLE=			GSSAPI
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=		SMB GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
 
-SMB_USES=			samba:build
+# Circular dependency samba -> tracker -> libsoup if the SPOTLIGHT
+# option is turned on in samba. Since samba is a **runtime** only
+# dependency, we can just tell it to be used. However, the Meson
+# build does a **build** time check for samba (even though the code does
+# a run-time check, too).
+#
+# Runtime deps still trigger a build / a dependency cycle, so as
+# a stopgap, patch it in, don't build anything, and inform the
+# user via pkg-message.
+# SMB_USES=			samba:run
 SMB_MESON_ENABLED=		ntlm
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_MESON_ON=		-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
 
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 GSSAPI_HEIMDAL_MESON_ON=	-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
 
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_MESON_ON=		-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
 
 GSSAPI_NONE_MESON_DISABLED=	gssapi
 
-USES=		gettext gnome localbase meson \
-		pkgconfig python:3.6+,build sqlite ssl tar:xz
-USE_GNOME=	glib20 intlhack introspection:build \
-		libxml2
-USE_LDCONFIG=	yes
 MESON_ARGS=	-Dvapi=disabled \
 		-Dsysprof=disabled \
 		-Dtests=false \
 		-Dgnome=true \
 		-Dbrotli=disabled
 
 LIBVERSION=	1.11.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
+PORTSCOUT=	limitw:1,even
+
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's+@@NTLM_AUTH@@+${LOCALBASE}/bin/ntlm_auth+' \
+		${WRKSRC}/meson.build
+
 .include <bsd.port.mk>
diff --git a/devel/libsoup/files/patch-meson.build b/devel/libsoup/files/patch-meson.build
new file mode 100644
index 000000000000..a5c6a02454bb
--- /dev/null
+++ b/devel/libsoup/files/patch-meson.build
@@ -0,0 +1,17 @@
+--- meson.build.orig	2021-06-12 13:43:16 UTC
++++ meson.build
+@@ -340,11 +340,11 @@ endif
+ ################
+ # NTLM not supported on Windows
+ if host_machine.system() != 'windows'
+-  ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
++  # ntlm_auth = find_program(get_option('ntlm_auth'), required: get_option('ntlm'))
+ 
+-  if ntlm_auth.found()
++  if get_option('ntlm').enabled()
+     add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
+-    add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
++    add_project_arguments('-DNTLM_AUTH="@@NTLM_AUTH@@"', language : 'c')
+   endif
+ endif
+ 
diff --git a/devel/libsoup/pkg-message b/devel/libsoup/pkg-message
new file mode 100644
index 000000000000..3b9b3c2e1209
--- /dev/null
+++ b/devel/libsoup/pkg-message
@@ -0,0 +1,10 @@
+[
+{
+  type: install
+  message: <<EOM
+libsoup can use NTLM authentication if it is compiled
+with the SMB option. To use it, you must install a
+port that provides NTLM, like net/samba412 or net/samba413.
+EOM
+}
+]