Re: git: b55113e4038c - main - ftp/curl: Fix build with --with-gssapi and --disable-ftp

On Tue, Apr 29, 2025 at 9:23 PM Michael Osipov <michaelo@freebsd.org> wrote:

> The branch main has been updated by michaelo:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=b55113e4038c74da6ab611a932db9cb041b7b967
>
> commit b55113e4038c74da6ab611a932db9cb041b7b967
> Author:     Michael Osipov <michaelo@FreeBSD.org>
> AuthorDate: 2025-04-28 13:42:15 +0000
> Commit:     Michael Osipov <michaelo@FreeBSD.org>
> CommitDate: 2025-04-29 13:16:25 +0000
>
>     ftp/curl: Fix build with --with-gssapi and --disable-ftp
>
>     Approved by:    jrm (mentor), otis (mentor), sunpoet (implicit
> approval)
>

That is incorrect.
It is not implicit approval from me.


>     Differential Revision:  https://reviews.freebsd.org/D50052


I'd like to say that I do not use reviews.


>
>     Upstream PR:    https://github.com/curl/curl/issues/16925
> ---
>  ftp/curl/Makefile | 4 ++++
>  ftp/curl/distinfo | 4 +++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
> index 3c80430349f2..d6650d896a5a 100644
> --- a/ftp/curl/Makefile
> +++ b/ftp/curl/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      curl
>  PORTVERSION=   8.13.0
> +PORTREVISION=  1
>

You should not bump PORTREVISION since it is a build fix.
When the build fails with --with-gssapi and --disable-ftp, there is no
package.
Therefore you do not need to bump PORTREVISION to force rebuild.
You just bring unnecessary rebuild for all dependent ports, including heavy
ones like lang/rust.


>  CATEGORIES=    ftp net www
>  MASTER_SITES=  https://curl.se/download/ \
>
> https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
> @@ -15,6 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
>  USES=          cpe libtool localbase:ldflags pathfix perl5 shebangfix
> tar:xz
>  USE_PERL5=     build
>
> +PATCH_SITES=
> https://patch-diff.githubusercontent.com/raw/curl/curl/pull/
> +PATCHFILES+=   16931.patch:-p1
> +
>

Normally we use the commit, not the pull request.
And it was added in the wrong place.


>  CONFIGURE_ARGS=        --disable-test-bundles \
>                 --disable-unity \
>                 --disable-werror \
> diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
> index ef04573cef70..2eab319b5471 100644
> --- a/ftp/curl/distinfo
> +++ b/ftp/curl/distinfo
> @@ -1,3 +1,5 @@
> -TIMESTAMP = 1744288722
> +TIMESTAMP = 1745847381
>  SHA256 (curl-8.13.0.tar.xz) =
> 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025
>  SIZE (curl-8.13.0.tar.xz) = 2773628
> +SHA256 (16931.patch) =
> 839add7018a2b166ca31c1058d34cd0a60a21e11de38cb9094b7081897389758
> +SIZE (16931.patch) = 828
>