From owner-dev-commits-ports-all@freebsd.org  Thu Jul 22 11:31:54 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EBB76588C6;
 Thu, 22 Jul 2021 11:31:54 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4GVqzZ3mMJz4SrX;
 Thu, 22 Jul 2021 11:31:54 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from mandree.no-ip.org (p54a0366d.dip0.t-ipconnect.de
 [84.160.54.109])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: mandree/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 4ECF733462;
 Thu, 22 Jul 2021 11:31:54 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from ryzen.an3e.de (localhost [IPv6:::1])
 by ryzen.an3e.de (Postfix) with ESMTP id 66C9D12117E;
 Thu, 22 Jul 2021 13:31:52 +0200 (CEST)
Subject: Re: git: e497a16a2869 - main - ports-mgmt/pkg*: Release 1.17.0
To: Baptiste Daroussin <bapt@FreeBSD.org>
References: <202107220806.16M862GC052436@gitrepo.freebsd.org>
Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Matthias Andree <mandree@FreeBSD.org>
Message-ID: <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org>
Date: Thu, 22 Jul 2021 13:31:52 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <202107220806.16M862GC052436@gitrepo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
 <dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2021 11:31:54 -0000

Am 22.07.21 um 10:06 schrieb Baptiste Daroussin:
> The branch main has been updated by bapt:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=e497a16a286972bfcab908209b11ee6a13d99dc9
> 
> commit e497a16a286972bfcab908209b11ee6a13d99dc9
> Author:     Baptiste Daroussin <bapt@FreeBSD.org>
> AuthorDate: 2021-07-22 07:54:38 +0000
> Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
> CommitDate: 2021-07-22 08:05:59 +0000
> 
>     ports-mgmt/pkg*: Release 1.17.0
>     
...

> diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
> index 228644a1845f..5eba5d89da95 100644
> --- a/Mk/bsd.port.mk
> +++ b/Mk/bsd.port.mk
> @@ -1211,6 +1211,14 @@ _OSVERSION_MAJOR=	${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/}
>  .if !defined(_PKG_VERSION)
>  _PKG_VERSION!=	${PKG_BIN} -v
>  .endif
> +# XXX hack for smooth transition towards pkg 1.17
> +_PKG_BEFORE_PKGEXT!= ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g} 1.17.0
> +.if ${_PKG_BEFORE_PKGEXT} == "<"
> +_PKG_TRANSITIONING_TO_NEW_EXT=	yes
> +_EXPORTED_VARS+=	_PKG_TRANSITIONING_TO_NEW_EXT
> +.warning "It is strongly recommanded to upgrade to a newer vertion of pkg first"
> +.endif
> +# XXX End of hack

I wish this hack were less verbose. Can we move this to some other place
or make sure it's not inherited by sub-makes?

To see what I mean,
1. grab a system with pkg 1.16.x,
2. update the ports tree,
3. install portmaster and type "portmaster pkg". I guess "make -C
/usr/ports/ports-mgmt/pkg clean all" will also trigger it, but I haven't
tried this.

=> Its configure script shoots this warning on what feels every other
"checking for..." line.

=> I wish we had only one line...  and I guess this will stick until
November or so (some time into 2021Q4).

You've also mistyped the .warning, and I think I deserve a pointy brown
paperbag to pull over my head and eyes after my first fix was incomplete...