Re: git: 48437516330b - main - www/nghttp2: Remove unnecessary substitution

Hello,

What's going on?

-DISTVERSION=   1.59.0
+PORTVERSION=   1.59.0

Should Porter's Handbook be fixed?

Thanks,

Po-Chuan Hsieh <sunpoet@freebsd.org> escreveu (quarta, 21/02/2024 à(s) 15:20):
>
> The branch main has been updated by sunpoet:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=48437516330b2bcb27cdfb51b6e268fea08ceaae
>
> commit 48437516330b2bcb27cdfb51b6e268fea08ceaae
> Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2024-02-21 14:29:51 +0000
> Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2024-02-21 15:06:49 +0000
>
>     www/nghttp2: Remove unnecessary substitution
>
>     - Cosmetic change
> ---
>  www/nghttp2/Makefile | 42 +++++++++++-------------------------------
>  1 file changed, 11 insertions(+), 31 deletions(-)
>
> diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
> index d387dcb64a1a..6b1d025b6310 100644
> --- a/www/nghttp2/Makefile
> +++ b/www/nghttp2/Makefile
> @@ -1,7 +1,7 @@
>  PORTNAME=      nghttp2
> -DISTVERSION=   1.59.0
> +PORTVERSION=   1.59.0
>  CATEGORIES=    www net
> -MASTER_SITES=  https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
> +MASTER_SITES=  https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/
>
>  MAINTAINER=    sunpoet@FreeBSD.org
>  COMMENT=       HTTP/2.0 C Library
> @@ -10,56 +10,36 @@ WWW=                https://nghttp2.org/
>  LICENSE=       MIT
>  LICENSE_FILE=  ${WRKSRC}/COPYING
>
> -BUILD_DEPENDS= libnghttp2>=${DISTVERSION}:www/libnghttp2
> +BUILD_DEPENDS= libnghttp2>=${PORTVERSION}:www/libnghttp2
>  LIB_DEPENDS=   libnghttp2.so:www/libnghttp2
>
> -USES=          cmake compiler:c++14-lang cpe localbase:ldflags pathfix \
> -               pkgconfig python:env shebangfix ssl tar:xz
> -SHEBANG_FILES= script/fetch-ocsp-response
> +USES=          cmake compiler:c++14-lang cpe localbase:ldflags pathfix pkgconfig python:env shebangfix ssl tar:xz
>
> +CMAKE_ARGS=    -DCMAKE_INSTALL_MANDIR=share/man
> +CMAKE_OFF=     ENABLE_DEBUG ENABLE_HTTP3 ENABLE_LIB_ONLY ENABLE_STATIC_CRT ENABLE_WERROR WITH_LIBBPF WITH_MRUBY WITH_NEVERBLEED
> +CMAKE_ON=      ENABLE_DOC ENABLE_FAILMALLOC ENABLE_THREADS
>  USE_RC_SUBR=   nghttpx
>
> -CMAKE_OFF=     ENABLE_DEBUG \
> -               ENABLE_HTTP3 \
> -               ENABLE_LIB_ONLY \
> -               ENABLE_STATIC_CRT \
> -               ENABLE_WERROR \
> -               WITH_LIBBPF \
> -               WITH_MRUBY \
> -               WITH_NEVERBLEED
> -CMAKE_ON=      ENABLE_DOC \
> -               ENABLE_FAILMALLOC \
> -               ENABLE_THREADS \
> -               CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
> -               CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
> -               CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
> -               CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl
> +SHEBANG_FILES= script/fetch-ocsp-response
>
>  OPTIONS_DEFINE=        APP EXAMPLES HPACK
>  OPTIONS_DEFAULT=APP HPACK
>  OPTIONS_SUB=   yes
> -
>  APP_DESC=      Build h2load, nghttp, nghttpd and nghttpx
>
>  APP_BUILD_DEPENDS=     c-ares>=1.7.5:dns/c-ares \
>                         libev>=4.11:devel/libev
> +APP_CMAKE_BOOL=                ENABLE_APP
>  APP_LIB_DEPENDS=       libcares.so:dns/c-ares \
>                         libev.so:devel/libev
>  APP_USE=               GNOME=libxml2
>  APP_USES=              gnome
> -APP_CMAKE_BOOL=                ENABLE_APP
> -APP_CMAKE_OFF=         -DCMAKE_DISABLE_FIND_PACKAGE_Libev:BOOL=True \
> -                       -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:BOOL=True
> -
>  EXAMPLES_BUILD_DEPENDS=        libevent>=2.0.8:devel/libevent
> -EXAMPLES_LIB_DEPENDS=  libevent_openssl.so:devel/libevent
>  EXAMPLES_CMAKE_BOOL=   ENABLE_EXAMPLES
> -EXAMPLES_CMAKE_OFF=    -DCMAKE_DISABLE_FIND_PACKAGE_Libevent:BOOL=True
> -
> +EXAMPLES_LIB_DEPENDS=  libevent_openssl.so:devel/libevent
>  HPACK_BUILD_DEPENDS=   jansson>=2.5:devel/jansson
> -HPACK_LIB_DEPENDS=     libjansson.so:devel/jansson
>  HPACK_CMAKE_BOOL=      ENABLE_HPACK_TOOLS
> -HPACK_CMAKE_OFF=       -DCMAKE_DISABLE_FIND_PACKAGE_Jansson:BOOL=True
> +HPACK_LIB_DEPENDS=     libjansson.so:devel/jansson
>
>  post-install:
>         ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/



-- 
Nuno Teixeira
FreeBSD Committer (ports)