Date: Thu, 22 Jul 2021 16:22:24 +0200 From: Stefan Esser <se@freebsd.org> To: Matthias Andree <mandree@FreeBSD.org>, 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: <e41fdf39-8739-5476-0cbd-afb6728e59ff@freebsd.org> In-Reply-To: <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org> References: <202107220806.16M862GC052436@gitrepo.freebsd.org> <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aDetBm69WiVFqar1e6zOkpHQMKDXEOMBR Content-Type: multipart/mixed; boundary="bCcZD75BONPb241x18qqrU1Y160dNWOMj"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: Matthias Andree <mandree@FreeBSD.org>, Baptiste Daroussin <bapt@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Message-ID: <e41fdf39-8739-5476-0cbd-afb6728e59ff@freebsd.org> Subject: Re: git: e497a16a2869 - main - ports-mgmt/pkg*: Release 1.17.0 References: <202107220806.16M862GC052436@gitrepo.freebsd.org> <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org> In-Reply-To: <a900d741-9cdd-466a-5a53-9f492cbeff9f@FreeBSD.org> --bCcZD75BONPb241x18qqrU1Y160dNWOMj Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 22.07.21 um 13:31 schrieb Matthias Andree: > 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=3De497a16a286972bfcab90= 8209b11ee6a13d99dc9 >> >> 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 >> =20 > ... >=20 >> 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=3D ${OSVERSION:C/([0-9]?[0-9])= ([0-9][0-9])[0-9]{3}/\1/} >> .if !defined(_PKG_VERSION) >> _PKG_VERSION!=3D ${PKG_BIN} -v >> .endif >> +# XXX hack for smooth transition towards pkg 1.17 >> +_PKG_BEFORE_PKGEXT!=3D ${PKG_BIN} version -t ${_PKG_VERSION:C/-.*//g}= 1.17.0 >> +.if ${_PKG_BEFORE_PKGEXT} =3D=3D "<" >> +_PKG_TRANSITIONING_TO_NEW_EXT=3D yes >> +_EXPORTED_VARS+=3D _PKG_TRANSITIONING_TO_NEW_EXT >> +.warning "It is strongly recommanded to upgrade to a newer vertion of= pkg first" >> +.endif >> +# XXX End of hack >=20 > I wish this hack were less verbose. Can we move this to some other plac= e > or make sure it's not inherited by sub-makes? >=20 > 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. >=20 > =3D> Its configure script shoots this warning on what feels every other= > "checking for..." line. >=20 > =3D> I wish we had only one line... and I guess this will stick until > November or so (some time into 2021Q4). >=20 > 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 incomplet= e... I have tried to make portmaster work with the new package name convention= =2E Maybe it was premature to remove support for files named in the old way, but I do not want to spend too much time on issues that are only relevant= for the duration of the conversion to the new naming scheme. If you have built a local repository then you'd best rename all the existing packages to the new extension (or create symbolic links). This is easily done with the mmv (or mln) program. Please let me know if there are any issues with that new version. I plan to sort out any portmaster problems that might be caused by this change. Regards, STefan --bCcZD75BONPb241x18qqrU1Y160dNWOMj-- --aDetBm69WiVFqar1e6zOkpHQMKDXEOMBR Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmD5fyEFAwAAAAAACgkQR+u171r99UQ5 dQf/a6eyFo9G/YtImCVxVNj/6A8RJob5gaD9QBUaRi9G5TQxs2e8Hje90fx8IS5qgKmoRk+E4SQx /0Bag8PhESnJK1t/inWRDOnm6LpEzc+R4OMCNJGgG8ln90vDO0u7XBec7OSZpNCeHOkalhZaYKkn Eq6D6VOcLsJRWhR8bt5k9hcX+BWEdwIMiqEuTPJDoaPrggTBpEBGg9n+We1YEzUHQTdLbUrH+xM3 9RfM6hoaI4IerixE3A0IdSDRi+gbOLKUg6/yhE+A0wY/uB0vCgNXP9N5qffcKPjrKScVkHPOFJNn 1fhYkNdzzwpXsgEmwJNqI9TyLQK9MEltC+mUFyhddA== =5Shl -----END PGP SIGNATURE----- --aDetBm69WiVFqar1e6zOkpHQMKDXEOMBR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e41fdf39-8739-5476-0cbd-afb6728e59ff>