ok (you'll need to merge conflicts in quirks)
On 2023/11/25 15:16, Daniel Dickman wrote: > As part of the spyder 5.x we need cookiecutter (which was never imported). > > An attempt was made to import cookiecutter a few years ago, but then some > of required ports were removed when the cookiecutter efforts stalled. > > Now spyder 5.5.0 requires cookiecutter. > > In this first step I'd like to revive 2 cookiecutter dependencies first: > - binaryornot > - whichcraft > > Now, these were both python2 and python3 before they were retired up, so > the new ports also make them python3 only, while trying to make sure we > don't go backwards from the old versions that were in ports. > > In theory, someone who still has the old ports installed should be able to > update to the new ports. The diff to devel/quirks is shown below. > > ok to re-import these and update devel/quirks? > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/quirks/Makefile,v > diff -u -p -u -r1.1582 Makefile > --- Makefile 20 Nov 2023 11:53:55 -0000 1.1582 > +++ Makefile 25 Nov 2023 20:11:09 -0000 > @@ -3,7 +3,7 @@ CATEGORIES = devel databases > DISTFILES = > > # API.rev > -PKGNAME = quirks-6.198 > +PKGNAME = quirks-6.199 > PKG_ARCH = * > MAINTAINER = Marc Espie <[email protected]> > > Index: files/Quirks.pm > =================================================================== > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v > diff -u -p -u -r1.1594 Quirks.pm > --- files/Quirks.pm 20 Nov 2023 11:53:55 -0000 1.1594 > +++ files/Quirks.pm 25 Nov 2023 20:11:09 -0000 > @@ -803,6 +803,8 @@ my $stem_extensions = { > 'py-future' => 'py3-future', > 'py-capstone' => 'py3-capstone', > 'iosevka-fixed-slab' => 'iosevka-slab', > + 'py-binaryornot' => 'py3-binaryornot', > + 'py-whichcraft' => 'py3-whichcraft', > }; > > my $obsolete_reason = {}; > @@ -1187,10 +1189,6 @@ setup_obsolete_reason( > 5 => 'qucs', > 1 => 'py-chai', > 1 => 'py3-chai', > - 1 => 'py-binaryornot', > - 1 => 'py3-binaryornot', > - 1 => 'py-whichcraft', > - 1 => 'py3-whichcraft', > 20 => 'celt07', > 1 => qr{^terraform-provider-}, > 6 => 'radare2-bindings',
