diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index af1cf792518..8c113cc34b8 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1083 2020/11/02 16:13:28 jasper Exp $ +# $OpenBSD: Makefile,v 1.1084 2020/11/03 13:52:13 jasper Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.475 +PKGNAME = quirks-3.476 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 956512755e0..881aca00b4b 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.1101 2020/11/02 16:13:28 jasper Exp $ +# $OpenBSD: Quirks.pm,v 1.1102 2020/11/03 13:52:13 jasper Exp $ # # Copyright (c) 2009 Marc Espie # @@ -502,6 +502,7 @@ my $stem_extensions = { 'py-carbon' => 'py3-carbon', 'py-elftools' => 'py3-elftools', 'py-lockfile' => 'py3-lockfile', + 'py-toml' => 'py3-toml', }; my $obsolete_reason = { diff --git a/textproc/Makefile b/textproc/Makefile index 2ce4e8dbd48..82c8a5ffe3c 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.650 2020/10/24 10:53:17 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.651 2020/11/03 13:52:13 jasper Exp $ SUBDIR = SUBDIR += TclXML @@ -467,7 +467,6 @@ SUBDIR += py-stemmer,python3 SUBDIR += py-textfsm SUBDIR += py-textfsm,python3 - SUBDIR += py-toml SUBDIR += py-toml,python3 SUBDIR += py-unicodecsv SUBDIR += py-unicodecsv,python3 diff --git a/textproc/py-toml/Makefile b/textproc/py-toml/Makefile index 967bfaa6a11..f1b45997240 100644 --- a/textproc/py-toml/Makefile +++ b/textproc/py-toml/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2020/07/03 21:13:16 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2020/11/03 13:52:13 jasper Exp $ COMMENT = Python library for "Tom's Obvious Minimal Language" #' -MODPY_EGG_VERSION = 0.10.0 +MODPY_EGG_VERSION = 0.10.2 DISTNAME = toml-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = textproc -REVISION = 1 - # MIT PERMIT_PACKAGE= Yes @@ -16,9 +14,9 @@ MODULES= lang/python MODPY_PI = Yes MODPY_SETUPTOOLS = Yes - +MODPY_PYTEST = Yes FLAVORS = python3 -FLAVOR ?= +FLAVOR ?= python3 .include diff --git a/textproc/py-toml/distinfo b/textproc/py-toml/distinfo index 18abbcba9ef..f24e071a5b3 100644 --- a/textproc/py-toml/distinfo +++ b/textproc/py-toml/distinfo @@ -1,2 +1,2 @@ -SHA256 (toml-0.10.0.tar.gz) = Ip+BxXeRpB1l45n8Br8ISLq1UKnf1e1m3xjOXwXnPVw= -SIZE (toml-0.10.0.tar.gz) = 16719 +SHA256 (toml-0.10.2.tar.gz) = s72h0QjV3Zn0og0k2cNI6RxNt6sbdJIAve0vg5zL5o8= +SIZE (toml-0.10.2.tar.gz) = 22253 diff --git a/textproc/py-toml/pkg/PLIST b/textproc/py-toml/pkg/PLIST index 3161a450564..96dd8f32cf2 100644 --- a/textproc/py-toml/pkg/PLIST +++ b/textproc/py-toml/pkg/PLIST @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.2 2018/11/10 16:51:23 danj Exp $ +@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $ +@conflict py-toml-* +@pkgpath textproc/py-toml lib/python${MODPY_VERSION}/site-packages/toml/ lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO