From owner-dev-commits-ports-main@freebsd.org Thu Jul 22 11:41:40 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 A8D92658F26; Thu, 22 Jul 2021 11:41:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4GVrBr4Mbtz4Tr2; Thu, 22 Jul 2021 11:41:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 690C5332FF; Thu, 22 Jul 2021 11:41:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id CAD957C400; Thu, 22 Jul 2021 13:41:38 +0200 (CEST) Date: Thu, 22 Jul 2021 13:41:38 +0200 From: Baptiste Daroussin To: Matthias Andree Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: e497a16a2869 - main - ports-mgmt/pkg*: Release 1.17.0 Message-ID: <20210722114138.6gnpuqgf7ab2jlhd@aniel.nours.eu> References: <202107220806.16M862GC052436@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 11:41:40 -0000 On Thu, Jul 22, 2021 at 01:31:52PM +0200, Matthias Andree wrote: > 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 > > AuthorDate: 2021-07-22 07:54:38 +0000 > > Commit: Baptiste Daroussin > > 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... I am fine with any better proposal, including removing the warning entirely, it was just put to not take anyone by surprise when the next bump of minimal version will be made. People complained in the past when there was no warning, so I added a warning this time. What ever better proposal I am fine with it. Best regards, Bapt