Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Mar 2025 06:02:58 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fc8179d7dab5 - main - devel/libsoup3: Unbreak GSSAPI_BASE again
Message-ID:  <202503250602.52P62wS9074079@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by arrowd:

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

commit fc8179d7dab50599d701c1e4184d87b43c209cb4
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-03-25 05:06:42 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-03-25 06:02:55 +0000

    devel/libsoup3: Unbreak GSSAPI_BASE again
    
    Fixes:  d048fa7dde94644b084f1422defbd46695302877
---
 devel/libsoup3/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/libsoup3/Makefile b/devel/libsoup3/Makefile
index 93d3309a25f3..03ce88b5e463 100644
--- a/devel/libsoup3/Makefile
+++ b/devel/libsoup3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libsoup
 PORTVERSION=	3.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -38,7 +38,7 @@ CPE_VENDOR=	gnome
 OPTIONS_DEFINE=			VAPI
 OPTIONS_SINGLE=			GSSAPI
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=		GSSAPI_NONE VAPI
+OPTIONS_DEFAULT=		GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} VAPI
 OPTIONS_SUB=			yes
 
 MESON_ARGS=	-Dtests=false \
@@ -53,7 +53,6 @@ MESON_ARGS=	-Dtests=false \
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_MESON_ON=		-Dgssapi=enabled
 GSSAPI_BASE_VARS=		pkgconfig_paths=${PATCHDIR}
-GSSAPI_BASE_BROKEN=		Makes consumers fail
 
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 GSSAPI_HEIMDAL_MESON_ON=	-Dgssapi=enabled
@@ -68,4 +67,8 @@ VAPI_MESON_ENABLED=		vapi
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
+post-install-GSSAPI_BASE-on:
+	${SED} -e 's|krb5-gssapi,||' \
+		${BUILD_WRKSRC}/meson-private/libsoup-3.0.pc > ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libsoup-3.0.pc
+
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503250602.52P62wS9074079>