git: b0c90d091353 - main - ftp/curl: Re-apply modified 2a3bac310439f8de03b945ae6b596ddf6384d411

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 22 Dec 2024 14:50:17 UTC
The branch main has been updated by sunpoet:

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

commit b0c90d09135397928451238b95bb532060ff5d9c
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-12-22 14:49:32 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-12-22 14:49:39 +0000

    ftp/curl: Re-apply modified 2a3bac310439f8de03b945ae6b596ddf6384d411
    
    - Fix libcurl.pc with GSSAPI_BASE enabled
    - Bump PORTREVISION for package change
    
    Do not add heimdal-gssapi to libcurl.pc because we do no provide .pc file base GSSAPI library.
---
 ftp/curl/Makefile                 |  2 ++
 ftp/curl/files/extra-patch-gssapi | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index f42934c00a88..a50a8fc289ad 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	curl
 PORTVERSION=	8.11.1
+PORTREVISION=	1
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.se/download/ \
 		https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
@@ -100,6 +101,7 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 GOPHER_CONFIGURE_ENABLE=gopher
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
+GSSAPI_BASE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gssapi
 GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
 GSSAPI_BASE_LIBS=	${GSSAPILIBS}
 GSSAPI_BASE_USES=	gssapi
diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi
new file mode 100644
index 000000000000..d2b90d46c80f
--- /dev/null
+++ b/ftp/curl/files/extra-patch-gssapi
@@ -0,0 +1,11 @@
+--- configure.orig	2024-12-11 07:08:12 UTC
++++ configure
+@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; }
+     if test -n "$gnu_gss"; then
+       LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
+     elif test "x$not_mit" = "x1"; then
+-      LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
++      LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE"
+     else
+       LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
+     fi