Re: git: 202ed6ce2a2e - main - ports-mgmt/portmaster: upgrade to version 3.28

From: Vladimir Druzenko <vvd_at_freebsd.org>
Date: Wed, 29 Nov 2023 22:40:56 UTC
29.11.2023 22:42, Stefan Eßer пишет:
> The branch main has been updated by se:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=202ed6ce2a2eeb154080bfbabe5ce57a74d1d6ec
>
> commit 202ed6ce2a2eeb154080bfbabe5ce57a74d1d6ec
> Author:     Stefan Eßer <se@FreeBSD.org>
> AuthorDate: 2023-11-29 19:36:45 +0000
> Commit:     Stefan Eßer <se@FreeBSD.org>
> CommitDate: 2023-11-29 19:36:45 +0000
>
>      ports-mgmt/portmaster: upgrade to version 3.28
>      
>      This version supports TRYBROKEN passed in the process environment or
>      in a Makefile (or, e.g., in /etc/make.conf as a per port setting) and
>      treats it as equivalent to the --try-broken option.
>      
>      PR:             275307
> ---
>   ports-mgmt/portmaster/Makefile | 2 +-
>   ports-mgmt/portmaster/distinfo | 6 +++---
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
> index c673a4c55bae..94ba5a3b4ed2 100644
> --- a/ports-mgmt/portmaster/Makefile
> +++ b/ports-mgmt/portmaster/Makefile
> @@ -1,5 +1,5 @@
>   PORTNAME=	portmaster
> -PORTVERSION=	3.27
> +PORTVERSION=	3.28
>   CATEGORIES=	ports-mgmt
>   
>   MAINTAINER=	se@FreeBSD.org
> diff --git a/ports-mgmt/portmaster/distinfo b/ports-mgmt/portmaster/distinfo
> index 1ececd18049a..ba4e9ed6569f 100644
> --- a/ports-mgmt/portmaster/distinfo
> +++ b/ports-mgmt/portmaster/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1695405213
> -SHA256 (freebsd-portmaster-3.27_GH0.tar.gz) = 914b54d939492aedb3da808e287eed6595fc9146810fcdf1923cab09c07c6362
> -SIZE (freebsd-portmaster-3.27_GH0.tar.gz) = 44697
> +TIMESTAMP = 1701286320
> +SHA256 (freebsd-portmaster-3.28_GH0.tar.gz) = 3fd89d76e4bf5c222b0d1f104a49d0f4226e6acd79c9eed28f77042443e7ce5b
> +SIZE (freebsd-portmaster-3.28_GH0.tar.gz) = 44723

Hello!

You forgot to remove "set -x":

--- /usr/local/sbin/portmaster.orig
+++ /usr/local/sbin/portmaster
@@ -1484,7 +1484,7 @@
  check_state () {
         # Global: state
         local state_set makevars
-set -x
+
         if egrep -ql '^(FORBIDDEN|BROKEN|IGNORE)' Makefile; then
                 [ -z "$TRY_BROKEN" ] && [ -z `pm_make -V TRYBROKEN` ] && \
                         makevars="FORBIDDEN BROKEN IGNORE" || \

-- 
Best regards,
Vladimir Druzenko