Date: Thu, 22 Jul 2021 13:31:52 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> 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: <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org> In-Reply-To: <202107220806.16M862GC052436@gitrepo.freebsd.org> References: <202107220806.16M862GC052436@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a900d741-9cdd-466a-5a53-9f492cbeff9f>