diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 25f75e9bc4a..2b3f2b36978 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1067 2020/10/17 12:59:19 jasper Exp $ +# $OpenBSD: Makefile,v 1.1068 2020/10/18 09:55:07 semarie Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.459 +PKGNAME = quirks-3.460 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index c0557bd4464..8e2d144e31e 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1085 2020/10/17 12:59:19 jasper Exp $ +# $OpenBSD: Quirks.pm,v 1.1086 2020/10/18 09:55:08 semarie Exp $ # # Copyright (c) 2009 Marc Espie # @@ -494,6 +494,7 @@ my $stem_extensions = { 'py-kiwisolver' => 'py3-kiwisolver', 'py-scipy' => 'py3-scipy', 'spidermonkey68' => 'spidermonkey78', + 'py-relatorio' => 'py3-relatorio', }; my $obsolete_reason = { diff --git a/print/Makefile b/print/Makefile index 3317db9e0b3..6149617e8d7 100644 --- a/print/Makefile +++ b/print/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.134 2020/09/02 10:35:05 bentley Exp $ +# $OpenBSD: Makefile,v 1.135 2020/10/18 09:55:08 semarie Exp $ SUBDIR = SUBDIR += a2ps @@ -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 diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile index e17f9905bd4..daa62de9e55 100644 --- a/print/py-relatorio/Makefile +++ b/print/py-relatorio/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2020/08/07 17:32:46 semarie Exp $ +# $OpenBSD: Makefile,v 1.17 2020/10/18 09:55:08 semarie Exp $ COMMENT= templating library able to output odt and pdf files MODPY_EGG_VERSION= 0.9.2 DISTNAME= relatorio-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= print textproc @@ -21,18 +22,13 @@ 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} .include diff --git a/print/py-relatorio/pkg/PLIST b/print/py-relatorio/pkg/PLIST index 4e8df4b2019..7384f2489f2 100644 --- a/print/py-relatorio/pkg/PLIST +++ b/print/py-relatorio/pkg/PLIST @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.4 2017/12/12 01:45:10 danj Exp $ +@comment $OpenBSD: PLIST,v 1.5 2020/10/18 09:55:08 semarie 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