On Sat, Oct 17, 2020 at 05:50:07PM +0200, Sebastien Marie wrote:
> On Sat, Oct 17, 2020 at 05:24:58PM +0200, Antoine Jacoutot wrote:
> > On Sat, Oct 17, 2020 at 04:28:31PM +0200, Sebastien Marie wrote:
> > > Hi,
> > >
> > > The following diff should switch print/py-relatorio to py3-only. No
> > > ports uses the py2 version.
> > >
> > > It was requested by aja@ to help removing depends on graphics/pycha.
> >
> > Thanks, comments below.
> >
> > > @@ -21,17 +21,12 @@ MODULES= lang/python
> > >
> > > MODPY_SETUPTOOLS= Yes
> > >
> > > -FLAVOR?=
> > > +FLAVOR?= python3
> >
> > Don't put '?' here.
> >
> > > FLAVORS= python3
> > >
> > > RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> > > textproc/py-lxml${MODPY_FLAVOR} \
> > > devel/py-magic${MODPY_FLAVOR}
> > > -
> > > -.if !${FLAVOR:Mpython3}
> > > -RUN_DEPENDS+= graphics/pycha \
> > > - textproc/py-yaml
> > > -.endif
> > >
> > > TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
> >
> > You are missing @pkgpath and @conflict markers in the PLIST... and bump.
> >
>
> it seems I didn't do enough py2->py3 migration.
>
> here new diff.
OK aja
>
> Thanks.
> --
> Sebastien Marie
>
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1067
> diff -u -p -r1.1067 Makefile
> --- devel/quirks/Makefile 17 Oct 2020 12:59:19 -0000 1.1067
> +++ devel/quirks/Makefile 17 Oct 2020 15:48:49 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-3.459
> +PKGNAME = quirks-3.460
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1085
> diff -u -p -r1.1085 Quirks.pm
> --- devel/quirks/files/Quirks.pm 17 Oct 2020 12:59:19 -0000 1.1085
> +++ devel/quirks/files/Quirks.pm 17 Oct 2020 15:48:50 -0000
> @@ -494,6 +494,7 @@ my $stem_extensions = {
> 'py-kiwisolver' => 'py3-kiwisolver',
> 'py-scipy' => 'py3-scipy',
> 'spidermonkey68' => 'spidermonkey78',
> + 'py-relatorio' => 'py3-relatorio',
> };
>
> my $obsolete_reason = {
> Index: print/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- print/Makefile 2 Sep 2020 10:35:05 -0000 1.134
> +++ print/Makefile 17 Oct 2020 15:48:50 -0000
> @@ -59,7 +59,6 @@
> SUBDIR += ptouch-driver
> SUBDIR += py-cups,python3
> SUBDIR += py-poppler
> - SUBDIR += py-relatorio
> SUBDIR += py-relatorio,python3
> SUBDIR += py-reportlab
> SUBDIR += py-reportlab,python3
> Index: print/py-relatorio/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/py-relatorio/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- print/py-relatorio/Makefile 7 Aug 2020 17:32:46 -0000 1.16
> +++ print/py-relatorio/Makefile 17 Oct 2020 15:48:50 -0000
> @@ -5,6 +5,7 @@ COMMENT= templating library able to out
> MODPY_EGG_VERSION= 0.9.2
> DISTNAME= relatorio-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> +REVISION= 0
>
> CATEGORIES= print textproc
>
> @@ -21,17 +22,12 @@ MODULES= lang/python
>
> MODPY_SETUPTOOLS= Yes
>
> -FLAVOR?=
> +FLAVOR= python3
> FLAVORS= python3
>
> RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> textproc/py-lxml${MODPY_FLAVOR} \
> devel/py-magic${MODPY_FLAVOR}
> -
> -.if !${FLAVOR:Mpython3}
> -RUN_DEPENDS+= graphics/pycha \
> - textproc/py-yaml
> -.endif
>
> TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
>
> Index: print/py-relatorio/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/print/py-relatorio/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- print/py-relatorio/pkg/PLIST 12 Dec 2017 01:45:10 -0000 1.4
> +++ print/py-relatorio/pkg/PLIST 17 Oct 2020 15:48:50 -0000
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.4 2017/12/12 01:45:10 danj Exp $
> +@conflict py-relatorio-*
> +@pkgpath print/py-relatorio
> lib/python${MODPY_VERSION}/site-packages/relatorio/
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/relatorio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
--
Antoine
