git: adca3208aa62 - main - devel/libsoup: make NTLM (Samba) an option

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=adca3208aa62ada4fd7ea758902d2164b9fe9d41

commit adca3208aa62ada4fd7ea758902d2164b9fe9d41
Author:     Barbara <barbara.freebsd at gmail.com>
AuthorDate: 2021-05-18 21:44:10 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-05-18 21:51:42 +0000

    devel/libsoup: make NTLM (Samba) an option
    
    Having Samba as a build-dep can still be heavy, so add
    an OPTION to turn it off again; this just means that
    the runtime check for ntlm will be skipped.
    
    Thanks Barbara for insisting on a more configurable approach.
---
 devel/libsoup/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4e3f17c4bd02..ab65d9a4bc01 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.72.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -20,9 +20,13 @@ RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 PORTSCOUT=	limitw:1,even
 
-OPTIONS_SINGLE=			GSSAPI	
+OPTIONS_DEFINE=			SMB
+OPTIONS_SINGLE=			GSSAPI
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=		GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
+OPTIONS_DEFAULT=		SMB GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
+
+SMB_USES=			samba:build
+SMB_MESON_ENABLED=		ntlm
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_MESON_ON=		-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
@@ -36,7 +40,7 @@ GSSAPI_MIT_MESON_ON=		-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
 GSSAPI_NONE_MESON_DISABLED=	gssapi
 
 USES=		gettext gnome localbase meson \
-		pkgconfig python:3.6+,build samba:build sqlite ssl tar:xz
+		pkgconfig python:3.6+,build sqlite ssl tar:xz
 USE_GNOME=	glib20 intlhack introspection:build \
 		libxml2
 USE_LDCONFIG=	yes
@@ -44,8 +48,7 @@ MESON_ARGS=	-Dvapi=disabled \
 		-Dsysprof=disabled \
 		-Dtests=false \
 		-Dgnome=true \
-		-Dbrotli=disabled \
-		-Dntlm=enabled
+		-Dbrotli=disabled
 
 LIBVERSION=	1.11.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}