diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 9380ef8611c..a7568725602 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.72 +PKGNAME = quirks-6.73 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index b18c43f3c23..02b64efff5b 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.1467 2022/11/28 20:23:07 sthen Exp $ +# $OpenBSD: Quirks.pm,v 1.1468 2022/11/28 21:01:42 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -755,6 +755,7 @@ my $stem_extensions = { 'py3-zc-lockfilezc.lockfile' => 'py3-zc-lockfile', 'py-elfesteem' => 'py3-miasm', # merged 'py-miasm' => 'py3-miasm', + 'py-cssselect' => 'py3-cssselect', }; my $obsolete_reason = {}; diff --git a/textproc/Makefile b/textproc/Makefile index 4f1f9cb60f6..7dfc5f12ca1 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -387,7 +387,6 @@ SUBDIR += py-confuse,python3 SUBDIR += py-cson,python3 SUBDIR += py-css-parser,python3 - SUBDIR += py-cssselect SUBDIR += py-cssselect,python3 SUBDIR += py-cssselect2,python3 SUBDIR += py-cssutils,python3 diff --git a/textproc/py-cssselect/Makefile b/textproc/py-cssselect/Makefile index a21be0cf71a..6ac6cb99dd9 100644 --- a/textproc/py-cssselect/Makefile +++ b/textproc/py-cssselect/Makefile @@ -1,26 +1,22 @@ -COMMENT = parse CSS3 Selectors and translates them to XPath 1.0 +COMMENT= parse CSS3 Selectors and translates them to XPath 1.0 -MODPY_EGG_VERSION = 1.1.0 -PKGNAME = py-${DISTNAME} -REVISION = 2 +MODPY_EGG_VERSION= 1.2.0 +DISTNAME= cssselect-${MODPY_EGG_VERSION} +PKGNAME= py-${DISTNAME} -GH_ACCOUNT = scrapy -GH_PROJECT = cssselect -GH_TAGNAME = v${MODPY_EGG_VERSION} - -CATEGORIES = textproc +CATEGORIES= textproc # BSD -PERMIT_PACKAGE = Yes +PERMIT_PACKAGE= Yes -MODULES = lang/python +MODULES= lang/python -TEST_DEPENDS = textproc/py-lxml${MODPY_FLAVOR} +TEST_DEPENDS= textproc/py-lxml${MODPY_FLAVOR} -MODPY_SETUPTOOLS = Yes -MODPY_PYTEST = Yes +MODPY_PYBUILD= setuptools +MODPY_PI= Yes -FLAVORS = python3 -FLAVOR ?= +FLAVORS= python3 +FLAVOR= python3 .include diff --git a/textproc/py-cssselect/distinfo b/textproc/py-cssselect/distinfo index e479d81860a..2335c8c8db1 100644 --- a/textproc/py-cssselect/distinfo +++ b/textproc/py-cssselect/distinfo @@ -1,2 +1,2 @@ -SHA256 (cssselect-1.1.0.tar.gz) = 3ejB1KLILeaImjrxwa284abz7AiweoVNhz8/PakpYK8= -SIZE (cssselect-1.1.0.tar.gz) = 35516 +SHA256 (cssselect-1.2.0.tar.gz) = ZmsZg5z63bnOnTa/5MlpEyxke5L8kIjE4j94azDxs9w= +SIZE (cssselect-1.2.0.tar.gz) = 41423 diff --git a/textproc/py-cssselect/pkg/PLIST b/textproc/py-cssselect/pkg/PLIST index ca6bceef2e2..f4ac998d612 100644 --- a/textproc/py-cssselect/pkg/PLIST +++ b/textproc/py-cssselect/pkg/PLIST @@ -1,13 +1,20 @@ +@pkgpath textproc/py-cssselect lib/python${MODPY_VERSION}/site-packages/cssselect/ -lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ -lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO -lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt -lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt -lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/cssselect-${MODPY_EGG_VERSION}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/cssselect/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}xpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/cssselect/${MODPY_PYCACHE}xpath.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cssselect/parser.py +lib/python${MODPY_VERSION}/site-packages/cssselect/py.typed lib/python${MODPY_VERSION}/site-packages/cssselect/xpath.py