git: 0e94a54ee194 - main - devel/libsoup: Massage features and options

[Adriaan de Groot]

The branch main has been updated by adridg:

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

commit 0e94a54ee19481e569344e95d5d28732ce3a86ef
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-05-17 13:25:45 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-05-17 14:01:43 +0000

    devel/libsoup: Massage features and options
    
    - From PR 235207 comes a patch from mi@ to use NTLM if it's there.
      Unfortunately, the switch to Meson has made this run-time-option
      a build-time-check, so the original patch isn't directly useful.
      Make samba a build-time dep, so that the code is enabled; there
      is a run-time check if the NTLM executable is available.
    - From PR 231160 comes a patch to configure different kinds of
      GSSAPI. That too doesn't apply with the current Meson build,
      but the general idea does.
    
    Build-tested in 8 configurations (but libsoup is nice that everything
    is #ifdeffed internally, so there's no plist or other visible changes)
    
    While here, add WWW line.
    
    PR:             235207 231160
    Reported by:    mi
    Reported by:    Sergey Akhmatov
---
 devel/libsoup/Makefile  | 20 ++++++++++++++++++--
 devel/libsoup/pkg-descr |  2 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index c2d9b74bb2b3..b5b7e4092bd6 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.72.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -19,8 +20,23 @@ RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 PORTSCOUT=	limitw:1,even
 
+OPTIONS_SINGLE=			GSSAPI	
+OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_DEFAULT=		GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
+
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_MIT_MESON_ON=		-Dgssapi=enabled -Dkrb5_config=${KRB5CONFIG}
+
+GSSAPI_MIT_USES=		gssapi:heimdal
+GSSAPI_MIT_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
+		pkgconfig python:3.6+,build samba:build sqlite ssl tar:xz
 USE_GNOME=	glib20 intlhack introspection:build \
 		libxml2
 USE_LDCONFIG=	yes
@@ -29,7 +45,7 @@ MESON_ARGS=	-Dvapi=disabled \
 		-Dtests=false \
 		-Dgnome=true \
 		-Dbrotli=disabled \
-		-Dntlm=disabled
+		-Dntlm=enabled
 
 LIBVERSION=	1.11.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr
index c758849f920e..23d583fb4f75 100644
--- a/devel/libsoup/pkg-descr
+++ b/devel/libsoup/pkg-descr
@@ -14,3 +14,5 @@ Features:
   * SSL Support using OpenSSL
   * Apache module server support
   * Client digest authentication
+
+WWW: https://libsoup.org/