From 90b405ebad2217bad9b88150eb6f0b50e871860b Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 16 Feb 2021 23:02:06 +0000 Subject: [PATCH] py3-only for py-twisted, a handful of ports that are used as dependencies of twisted (and deps of deps, and maybe another odd one crept in). --- devel/Makefile | 13 +--- devel/py-asn1-modules/Makefile | 10 +-- devel/py-asn1-modules/pkg/PLIST | 32 +++++---- devel/py-automat/Makefile | 12 +--- devel/py-automat/pkg/PLIST | 6 +- devel/py-constantly/Makefile | 6 +- devel/py-constantly/pkg/PLIST | 3 +- devel/py-hamcrest/Makefile | 6 +- devel/py-hamcrest/pkg/PLIST | 3 +- devel/py-incremental/Makefile | 6 +- devel/py-incremental/pkg/PLIST | 3 +- devel/py-twisted/Makefile | 28 ++------ ...atch-src_Twisted_egg-info_entry_points_txt | 26 ------- ...tch-src_twisted_conch_test_test_ckeygen_py | 23 ------ .../patch-src_twisted_python__setup_py | 35 ---------- devel/py-twisted/pkg/PFRAG.no-python3 | 70 ------------------- devel/py-twisted/pkg/PLIST | 20 +++--- devel/py-zopecomponent/Makefile | 6 +- devel/py-zopecomponent/pkg/PLIST | 3 +- devel/py-zopeevent/Makefile | 6 +- devel/py-zopeevent/pkg/PLIST | 3 +- devel/py-zopeinterface/Makefile | 6 +- devel/py-zopeinterface/pkg/PLIST | 3 +- devel/quirks/Makefile | 4 +- devel/quirks/files/Quirks.pm | 17 ++++- security/py-service_identity/Makefile | 6 +- security/py-service_identity/pkg/PLIST | 3 +- textproc/Makefile | 3 +- textproc/py-m2r/Makefile | 13 +--- textproc/py-m2r/pkg/PLIST | 6 +- www/py-hyperlink/Makefile | 6 +- www/py-hyperlink/pkg/PLIST | 3 +- 32 files changed, 112 insertions(+), 278 deletions(-) delete mode 100644 devel/py-twisted/patches/patch-src_Twisted_egg-info_entry_points_txt delete mode 100644 devel/py-twisted/patches/patch-src_twisted_conch_test_test_ckeygen_py delete mode 100644 devel/py-twisted/patches/patch-src_twisted_python__setup_py delete mode 100644 devel/py-twisted/pkg/PFRAG.no-python3 diff --git a/devel/Makefile b/devel/Makefile index 8ae053d0448..edf32a267c0 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2064 2021/02/16 20:31:17 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.2065 2021/02/16 23:02:06 sthen Exp $ SUBDIR = SUBDIR += 64tass @@ -1360,7 +1360,6 @@ SUBDIR += py-argh,python3 SUBDIR += py-asn1 SUBDIR += py-asn1,python3 - SUBDIR += py-asn1-modules SUBDIR += py-asn1-modules,python3 SUBDIR += py-astroid,python3 SUBDIR += py-async-timeout @@ -1368,7 +1367,6 @@ SUBDIR += py-atomicwrites,python3 SUBDIR += py-attrs SUBDIR += py-attrs,python3 - SUBDIR += py-automat SUBDIR += py-automat,python3 SUBDIR += py-babel SUBDIR += py-babel,python3 @@ -1428,7 +1426,6 @@ SUBDIR += py-configobj SUBDIR += py-configobj,python3 SUBDIR += py-configparser - SUBDIR += py-constantly SUBDIR += py-constantly,python3 SUBDIR += py-construct,python3 SUBDIR += py-contextlib2 @@ -1518,7 +1515,6 @@ SUBDIR += py-hachoir-core SUBDIR += py-hachoir-metadata SUBDIR += py-hachoir-parser - SUBDIR += py-hamcrest SUBDIR += py-hamcrest,python3 SUBDIR += py-html5lib SUBDIR += py-html5lib,python3 @@ -1527,7 +1523,6 @@ SUBDIR += py-icalendar SUBDIR += py-icalendar,python3 SUBDIR += py-importlib-metadata,python3 - SUBDIR += py-incremental SUBDIR += py-incremental,python3 SUBDIR += py-intervaltree SUBDIR += py-intervaltree,python3 @@ -1745,7 +1740,6 @@ SUBDIR += py-tqdm,python3 SUBDIR += py-traceback2 SUBDIR += py-traitlets,python3 - SUBDIR += py-twisted SUBDIR += py-twisted,python3 SUBDIR += py-txaio,python3 SUBDIR += py-typing @@ -1788,13 +1782,10 @@ SUBDIR += py-yapf,python3 SUBDIR += py-zc-lockfile SUBDIR += py-zc-lockfile,python3 - SUBDIR += py-zopecomponent SUBDIR += py-zopecomponent,python3 - SUBDIR += py-zopeevent SUBDIR += py-zopeevent,python3 - SUBDIR += py-zopeinterface SUBDIR += py-zopeinterface,python3 - SUBDIR += py-zopetesting + SUBDIR += py-zopetesting,python3 SUBDIR += pyflakes SUBDIR += pyflakes,python3 SUBDIR += pygame diff --git a/devel/py-asn1-modules/Makefile b/devel/py-asn1-modules/Makefile index 2bd6148c21b..8ff3a6fe92b 100644 --- a/devel/py-asn1-modules/Makefile +++ b/devel/py-asn1-modules/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2020/07/03 21:12:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2021/02/16 23:02:07 sthen Exp $ COMMENT = collection of ASN.1 data structures for py-asn1 @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 0.2.7 DISTNAME = pyasn1-modules-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:S/py/py-/} CATEGORIES = devel -REVISION = 0 +REVISION = 1 HOMEPAGE = https://github.com/etingof/pyasn1 @@ -18,7 +18,7 @@ MODPY_PI = Yes MODULES = lang/python FLAVORS = python3 -FLAVOR?= +FLAVOR = python3 MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes @@ -29,8 +29,4 @@ MODPY_ADJ_FILES = tools/*.py TEST_ENV += PYTHONPATH=${WRKINST}/${MODPY_SITEPKG} -post-install: - cd ${WRKSRC}/tools; for i in *; do \ - ${INSTALL_SCRIPT} $$i ${PREFIX}/bin/$$i${MODPY_BIN_SUFFIX}; done - .include diff --git a/devel/py-asn1-modules/pkg/PLIST b/devel/py-asn1-modules/pkg/PLIST index 0ddf551e9c1..92ba3040f77 100644 --- a/devel/py-asn1-modules/pkg/PLIST +++ b/devel/py-asn1-modules/pkg/PLIST @@ -1,18 +1,20 @@ -@comment $OpenBSD: PLIST,v 1.5 2019/11/18 00:39:29 kmos Exp $ -bin/cmcdump.py${MODPY_BIN_SUFFIX} -bin/cmpdump.py${MODPY_BIN_SUFFIX} -bin/crldump.py${MODPY_BIN_SUFFIX} -bin/crmfdump.py${MODPY_BIN_SUFFIX} -bin/ocspclient.py${MODPY_BIN_SUFFIX} -bin/ocspreqdump.py${MODPY_BIN_SUFFIX} -bin/ocsprspdump.py${MODPY_BIN_SUFFIX} -bin/pkcs10dump.py${MODPY_BIN_SUFFIX} -bin/pkcs1dump.py${MODPY_BIN_SUFFIX} -bin/pkcs7dump.py${MODPY_BIN_SUFFIX} -bin/pkcs8dump.py${MODPY_BIN_SUFFIX} -bin/snmpget.py${MODPY_BIN_SUFFIX} -bin/x509dump-rfc5280.py${MODPY_BIN_SUFFIX} -bin/x509dump.py${MODPY_BIN_SUFFIX} +@comment $OpenBSD: PLIST,v 1.6 2021/02/16 23:02:07 sthen Exp $ +@conflict py-asn1-modules-* +@pkgpath devel/py-asn1-modules +bin/cmcdump.py +bin/cmpdump.py +bin/crldump.py +bin/crmfdump.py +bin/ocspclient.py +bin/ocspreqdump.py +bin/ocsprspdump.py +bin/pkcs10dump.py +bin/pkcs1dump.py +bin/pkcs7dump.py +bin/pkcs8dump.py +bin/snmpget.py +bin/x509dump-rfc5280.py +bin/x509dump.py lib/python${MODPY_VERSION}/site-packages/pyasn1_modules/ lib/python${MODPY_VERSION}/site-packages/pyasn1_modules-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/pyasn1_modules-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/devel/py-automat/Makefile b/devel/py-automat/Makefile index 1150e4894d2..bdde2c89897 100644 --- a/devel/py-automat/Makefile +++ b/devel/py-automat/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2020/07/22 19:25:36 landry Exp $ +# $OpenBSD: Makefile,v 1.9 2021/02/16 23:02:06 sthen Exp $ COMMENT = finite-state machines in Python MODPY_EGG_VERSION = 0.8.0 +REVISION = 0 DISTNAME = Automat-${MODPY_EGG_VERSION} PKGNAME = py-automat-${MODPY_EGG_VERSION} @@ -29,13 +30,6 @@ RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR} \ TEST_DEPENDS = devel/py-twisted${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= - -.if ${FLAVOR:Mpython3} -TEST_DEPENDS += devel/py-six${MODPY_FLAVOR} -.endif - -post-install: - mv ${PREFIX}/bin/automat-visualize{,${MODPY_BIN_SUFFIX}} +FLAVOR = python3 .include diff --git a/devel/py-automat/pkg/PLIST b/devel/py-automat/pkg/PLIST index 7c257c4d2fd..df6bd0c0941 100644 --- a/devel/py-automat/pkg/PLIST +++ b/devel/py-automat/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.2 2018/04/04 08:23:14 pvk Exp $ -bin/automat-visualize${MODPY_BIN_SUFFIX} +@comment $OpenBSD: PLIST,v 1.3 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-automat +@conflict py-automat-* +bin/automat-visualize lib/python${MODPY_VERSION}/site-packages/Automat-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/Automat-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/Automat-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt diff --git a/devel/py-constantly/Makefile b/devel/py-constantly/Makefile index a6a2e5e4ac0..c49423f2eaa 100644 --- a/devel/py-constantly/Makefile +++ b/devel/py-constantly/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2020/07/03 21:12:42 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2021/02/16 23:02:07 sthen Exp $ COMMENT = symbolic constants in Python @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 15.1.0 DISTNAME = constantly-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel @@ -18,7 +18,7 @@ MODPY_PI = Yes MODPY_SETUPTOOLS= Yes FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 NO_TEST = Yes diff --git a/devel/py-constantly/pkg/PLIST b/devel/py-constantly/pkg/PLIST index 507188754c6..da516b60d99 100644 --- a/devel/py-constantly/pkg/PLIST +++ b/devel/py-constantly/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/03 12:07:02 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-constantly lib/python${MODPY_VERSION}/site-packages/constantly/ lib/python${MODPY_VERSION}/site-packages/constantly-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/constantly-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/devel/py-hamcrest/Makefile b/devel/py-hamcrest/Makefile index 25744c47358..8b1d5f1f3e1 100644 --- a/devel/py-hamcrest/Makefile +++ b/devel/py-hamcrest/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2020/07/03 21:12:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2021/02/16 23:02:06 sthen Exp $ COMMENT = Hamcrest matchers for Python MODPY_EGG_VERSION = 1.9.0 DISTNAME = PyHamcrest-${MODPY_EGG_VERSION} PKGNAME = py-hamcrest-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = devel @@ -17,7 +17,7 @@ PERMIT_PACKAGE = Yes MODULES = lang/python MODPY_PI = Yes FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 MODPY_SETUPTOOLS = Yes diff --git a/devel/py-hamcrest/pkg/PLIST b/devel/py-hamcrest/pkg/PLIST index 748510e1ecf..f882d00bf87 100644 --- a/devel/py-hamcrest/pkg/PLIST +++ b/devel/py-hamcrest/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/20 21:30:50 pvk Exp $ +@comment $OpenBSD: PLIST,v 1.2 2021/02/16 23:02:06 sthen Exp $ +@pkgpath devel/py-hamcrest lib/python${MODPY_VERSION}/site-packages/PyHamcrest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/PyHamcrest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/PyHamcrest-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt diff --git a/devel/py-incremental/Makefile b/devel/py-incremental/Makefile index ea002babeae..6034f69c656 100644 --- a/devel/py-incremental/Makefile +++ b/devel/py-incremental/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/07/03 21:12:45 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2021/02/16 23:02:07 sthen Exp $ COMMENT = versioning library for Python projects @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 17.5.0 DISTNAME = incremental-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel @@ -23,6 +23,6 @@ TEST_DEPENDS = devel/py-click${MODPY_FLAVOR} \ devel/py-twisted${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 .include diff --git a/devel/py-incremental/pkg/PLIST b/devel/py-incremental/pkg/PLIST index 4be7c55c5e5..7ebfba99bae 100644 --- a/devel/py-incremental/pkg/PLIST +++ b/devel/py-incremental/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/06 09:46:48 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-incremental lib/python${MODPY_VERSION}/site-packages/incremental/ lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/incremental-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile index 8756c9cec86..32f7760301d 100644 --- a/devel/py-twisted/Makefile +++ b/devel/py-twisted/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2021/01/04 14:06:31 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2021/02/16 23:02:06 sthen Exp $ COMMENT = asynchronous networking Python framework @@ -7,11 +7,11 @@ MODPY_EGG_VERSION = 20.3.0 EXTRACT_SUFX = .tar.bz2 DISTNAME = Twisted-${MODPY_EGG_VERSION} PKGNAME = py-twisted-${MODPY_EGG_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = devel -HOMEPAGE = http://twistedmatrix.com/ +HOMEPAGE = https://twistedmatrix.com/ # MIT PERMIT_PACKAGE = Yes @@ -25,10 +25,10 @@ MODPY_SETUPTOOLS = Yes BUILD_DEPENDS = devel/py-incremental${MODPY_FLAVOR} -RUN_DEPENDS = devel/py-hamcrest${MODPY_FLAVOR} \ - devel/py-asn1${MODPY_FLAVOR} \ +RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ devel/py-automat${MODPY_FLAVOR} \ devel/py-constantly${MODPY_FLAVOR} \ + devel/py-hamcrest${MODPY_FLAVOR} \ devel/py-incremental${MODPY_FLAVOR} \ devel/py-zopeinterface${MODPY_FLAVOR} \ net/py-idna${MODPY_FLAVOR} \ @@ -38,28 +38,14 @@ RUN_DEPENDS = devel/py-hamcrest${MODPY_FLAVOR} \ www/py-hyperlink${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= - -.if !${FLAVOR:Mpython3} -RUN_DEPENDS += devel/py-SOAPpy -.endif - -SUBST_FILES = ${WRKSRC}/src/Twisted.egg-info/entry_points.txt \ - ${WRKSRC}/src/twisted/python/_setup.py \ - ${WRKSRC}/src/twisted/conch/test/test_ckeygen.py +FLAVOR = python3 TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} TEST_ENV = LC_ALL=en_US.UTF-8 TESTDIR = ${WRKSRC}/regress -pre-configure: - ${SUBST_CMD} ${SUBST_FILES} -.for f in ${SUBST_FILES} - rm ${WRKSRC}/$f.{orig,beforesubst} -.endfor - do-test: mkdir -p ${TESTDIR} - cd ${TESTDIR} && ${LOCALBASE}/bin/trial${MODPY_BIN_SUFFIX} twisted + cd ${TESTDIR} && ${LOCALBASE}/bin/trial twisted .include diff --git a/devel/py-twisted/patches/patch-src_Twisted_egg-info_entry_points_txt b/devel/py-twisted/patches/patch-src_Twisted_egg-info_entry_points_txt deleted file mode 100644 index d3b45d91ffc..00000000000 --- a/devel/py-twisted/patches/patch-src_Twisted_egg-info_entry_points_txt +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_Twisted_egg-info_entry_points_txt,v 1.1 2018/04/06 19:14:00 pvk Exp $ - -Index: src/Twisted.egg-info/entry_points.txt ---- src/Twisted.egg-info/entry_points.txt.orig -+++ src/Twisted.egg-info/entry_points.txt -@@ -1,11 +1,11 @@ - [console_scripts] --cftp = twisted.conch.scripts.cftp:run --ckeygen = twisted.conch.scripts.ckeygen:run --conch = twisted.conch.scripts.conch:run --mailmail = twisted.mail.scripts.mailmail:run --pyhtmlizer = twisted.scripts.htmlizer:run --tkconch = twisted.conch.scripts.tkconch:run --trial = twisted.scripts.trial:run --twist = twisted.application.twist._twist:Twist.main --twistd = twisted.scripts.twistd:run -+cftp${MODPY_BIN_SUFFIX} = twisted.conch.scripts.cftp:run -+ckeygen${MODPY_BIN_SUFFIX} = twisted.conch.scripts.ckeygen:run -+conch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.conch:run -+mailmail${MODPY_BIN_SUFFIX} = twisted.mail.scripts.mailmail:run -+pyhtmlizer${MODPY_BIN_SUFFIX} = twisted.scripts.htmlizer:run -+tkconch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.tkconch:run -+trial${MODPY_BIN_SUFFIX} = twisted.scripts.trial:run -+twist${MODPY_BIN_SUFFIX} = twisted.application.twist._twist:Twist.main -+twistd${MODPY_BIN_SUFFIX} = twisted.scripts.twistd:run - diff --git a/devel/py-twisted/patches/patch-src_twisted_conch_test_test_ckeygen_py b/devel/py-twisted/patches/patch-src_twisted_conch_test_test_ckeygen_py deleted file mode 100644 index 4dde9112959..00000000000 --- a/devel/py-twisted/patches/patch-src_twisted_conch_test_test_ckeygen_py +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_twisted_conch_test_test_ckeygen_py,v 1.2 2020/06/17 07:49:59 landry Exp $ - -Index: src/twisted/conch/test/test_ckeygen.py ---- src/twisted/conch/test/test_ckeygen.py.orig -+++ src/twisted/conch/test/test_ckeygen.py -@@ -66,7 +66,7 @@ class KeyGenTests(TestCase): - - def _testrun(self, keyType, keySize=None, privateKeySubtype=None): - filename = self.mktemp() -- args = ['ckeygen', '-t', keyType, '-f', filename, '--no-passphrase'] -+ args = ['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, '-f', filename, '--no-passphrase'] - if keySize is not None: - args.extend(['-b', keySize]) - if privateKeySubtype is not None: -@@ -100,7 +100,7 @@ class KeyGenTests(TestCase): - def test_runBadKeytype(self): - filename = self.mktemp() - with self.assertRaises(subprocess.CalledProcessError): -- subprocess.check_call(['ckeygen', '-t', 'foo', '-f', filename]) -+ subprocess.check_call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', 'foo', '-f', filename]) - - - diff --git a/devel/py-twisted/patches/patch-src_twisted_python__setup_py b/devel/py-twisted/patches/patch-src_twisted_python__setup_py deleted file mode 100644 index a35b2310813..00000000000 --- a/devel/py-twisted/patches/patch-src_twisted_python__setup_py +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-src_twisted_python__setup_py,v 1.5 2020/06/17 07:49:59 landry Exp $ - -Add suffix for py3 FLAVOR - -Don't install files used to build the extension modules it uses: -https://github.com/twisted/twisted/commit/80e67a6775a190cba77e0d4229d12b9859ba12fc - -Index: src/twisted/python/_setup.py ---- src/twisted/python/_setup.py.orig -+++ src/twisted/python/_setup.py -@@ -146,15 +146,15 @@ _EXTRAS_REQUIRE['osx_platform'] = _EXTRAS_REQUIRE['mac - - # Scripts provided by Twisted on Python 2 and 3. - _CONSOLE_SCRIPTS = [ -- "ckeygen = twisted.conch.scripts.ckeygen:run", -- "cftp = twisted.conch.scripts.cftp:run", -- "conch = twisted.conch.scripts.conch:run", -- "mailmail = twisted.mail.scripts.mailmail:run", -- "pyhtmlizer = twisted.scripts.htmlizer:run", -- "tkconch = twisted.conch.scripts.tkconch:run", -- "trial = twisted.scripts.trial:run", -- "twist = twisted.application.twist._twist:Twist.main", -- "twistd = twisted.scripts.twistd:run", -+ "ckeygen${MODPY_BIN_SUFFIX} = twisted.conch.scripts.ckeygen:run", -+ "cftp${MODPY_BIN_SUFFIX} = twisted.conch.scripts.cftp:run", -+ "conch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.conch:run", -+ "mailmail${MODPY_BIN_SUFFIX} = twisted.mail.scripts.mailmail:run", -+ "pyhtmlizer${MODPY_BIN_SUFFIX} = twisted.scripts.htmlizer:run", -+ "tkconch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.tkconch:run", -+ "trial${MODPY_BIN_SUFFIX} = twisted.scripts.trial:run", -+ "twist${MODPY_BIN_SUFFIX} = twisted.application.twist._twist:Twist.main", -+ "twistd${MODPY_BIN_SUFFIX} = twisted.scripts.twistd:run", - ] - - diff --git a/devel/py-twisted/pkg/PFRAG.no-python3 b/devel/py-twisted/pkg/PFRAG.no-python3 deleted file mode 100644 index 6a392d49a74..00000000000 --- a/devel/py-twisted/pkg/PFRAG.no-python3 +++ /dev/null @@ -1,70 +0,0 @@ -@comment $OpenBSD: PFRAG.no-python3,v 1.4 2020/06/18 05:54:06 landry Exp $ -lib/python${MODPY_VERSION}/site-packages/twisted/mail/alias.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/alias.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/mail.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/mail.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/maildir.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/maildir.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.py -lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/ -lib/python${MODPY_VERSION}/site-packages/twisted/news/__init__.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/database.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/database.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/news.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/news.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/nntp.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/nntp.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/tap.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/tap.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/ -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/__init__.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_database.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_database.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_news.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_news.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_nntp.py -lib/python${MODPY_VERSION}/site-packages/twisted/news/test/test_nntp.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_mail.py -lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_mail.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_news.py -lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_news.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/protocols/shoutcast.py -lib/python${MODPY_VERSION}/site-packages/twisted/protocols/shoutcast.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/python/_pydoctor.py -lib/python${MODPY_VERSION}/site-packages/twisted/python/_pydoctor.pyc -@so lib/python${MODPY_VERSION}/site-packages/twisted/python/_sendmsg.so -lib/python${MODPY_VERSION}/site-packages/twisted/python/finalize.py -lib/python${MODPY_VERSION}/site-packages/twisted/python/finalize.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/python/hook.py -lib/python${MODPY_VERSION}/site-packages/twisted/python/hook.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/python/test/cmodulepullpipe.py -lib/python${MODPY_VERSION}/site-packages/twisted/python/test/cmodulepullpipe.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_pydoctor.py -lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_pydoctor.pyc -@comment lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_win32.py -@comment lib/python${MODPY_VERSION}/site-packages/twisted/python/test/test_win32.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/test/test_hook.py -lib/python${MODPY_VERSION}/site-packages/twisted/test/test_hook.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/web/soap.py -lib/python${MODPY_VERSION}/site-packages/twisted/web/soap.pyc -lib/python${MODPY_VERSION}/site-packages/twisted/web/test/test_soap.py -lib/python${MODPY_VERSION}/site-packages/twisted/web/test/test_soap.pyc diff --git a/devel/py-twisted/pkg/PLIST b/devel/py-twisted/pkg/PLIST index 78b70424b59..965eb686392 100644 --- a/devel/py-twisted/pkg/PLIST +++ b/devel/py-twisted/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2021/01/04 14:06:31 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.8 2021/02/16 23:02:06 sthen Exp $ @conflict py-twisted-core-* @conflict py-twisted-conch-* @conflict py-twisted-lore-* @@ -22,15 +22,15 @@ @pkgpath devel/py-twisted/web2 @pkgpath devel/py-twisted/words !%%python3%% -bin/cftp${MODPY_BIN_SUFFIX} -bin/ckeygen${MODPY_BIN_SUFFIX} -bin/conch${MODPY_BIN_SUFFIX} -bin/mailmail${MODPY_BIN_SUFFIX} -bin/pyhtmlizer${MODPY_BIN_SUFFIX} -bin/tkconch${MODPY_BIN_SUFFIX} -bin/trial${MODPY_BIN_SUFFIX} -bin/twist${MODPY_BIN_SUFFIX} -bin/twistd${MODPY_BIN_SUFFIX} +bin/cftp +bin/ckeygen +bin/conch +bin/mailmail +bin/pyhtmlizer +bin/tkconch +bin/trial +bin/twist +bin/twistd lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt diff --git a/devel/py-zopecomponent/Makefile b/devel/py-zopecomponent/Makefile index 195d3cf3b77..0adff4d3d32 100644 --- a/devel/py-zopecomponent/Makefile +++ b/devel/py-zopecomponent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2020/07/03 21:12:52 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2021/02/16 23:02:07 sthen Exp $ COMMENT= component architecture from Zope @@ -7,7 +7,7 @@ MODPY_EGG_VERSION= 4.2.2 DISTNAME= zope.component-${MODPY_EGG_VERSION} PKGNAME= py-zopecomponent-${MODPY_EGG_VERSION} CATEGORIES= devel -REVISION= 4 +REVISION= 5 # Zope Public License PERMIT_PACKAGE= Yes @@ -17,7 +17,7 @@ MODPY_PI= Yes MODPY_SETUPTOOLS= Yes FLAVORS= python3 -FLAVOR?= +FLAVOR= python3 RUN_DEPENDS= devel/py-zopeinterface${MODPY_FLAVOR} \ devel/py-zopeevent${MODPY_FLAVOR} diff --git a/devel/py-zopecomponent/pkg/PLIST b/devel/py-zopecomponent/pkg/PLIST index dc588511242..04ca212af26 100644 --- a/devel/py-zopecomponent/pkg/PLIST +++ b/devel/py-zopecomponent/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2018/08/10 19:49:21 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-zopecomponent lib/python${MODPY_VERSION}/site-packages/zope.component-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth lib/python${MODPY_VERSION}/site-packages/zope.component-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/zope.component-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/devel/py-zopeevent/Makefile b/devel/py-zopeevent/Makefile index b0b005eaafb..72ca4847a11 100644 --- a/devel/py-zopeevent/Makefile +++ b/devel/py-zopeevent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2020/07/03 21:12:52 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2021/02/16 23:02:07 sthen Exp $ COMMENT= very basic event publishing system from Zope @@ -7,7 +7,7 @@ MODPY_EGG_VERSION= 4.3.0 DISTNAME= zope.event-${MODPY_EGG_VERSION} PKGNAME= py-zopeevent-${MODPY_EGG_VERSION} CATEGORIES= devel -REVISION= 1 +REVISION= 2 # Zope Public License PERMIT_PACKAGE= Yes @@ -17,7 +17,7 @@ MODPY_PI = Yes MODULES= lang/python FLAVORS= python3 -FLAVOR?= +FLAVOR= python3 MODPY_SETUPTOOLS= Yes diff --git a/devel/py-zopeevent/pkg/PLIST b/devel/py-zopeevent/pkg/PLIST index 69838bb6776..2fb9faab836 100644 --- a/devel/py-zopeevent/pkg/PLIST +++ b/devel/py-zopeevent/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2016/09/02 09:18:20 eric Exp $ +@comment $OpenBSD: PLIST,v 1.3 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-zopeevent lib/python${MODPY_VERSION}/site-packages/zope/ lib/python${MODPY_VERSION}/site-packages/zope.event-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth lib/python${MODPY_VERSION}/site-packages/zope.event-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ diff --git a/devel/py-zopeinterface/Makefile b/devel/py-zopeinterface/Makefile index 4dc83209384..1161651a872 100644 --- a/devel/py-zopeinterface/Makefile +++ b/devel/py-zopeinterface/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2021/01/04 14:06:31 sthen Exp $ +# $OpenBSD: Makefile,v 1.30 2021/02/16 23:02:07 sthen Exp $ COMMENT= object interface infrastructure from Zope @@ -7,7 +7,7 @@ MODPY_EGG_VERSION= 4.4.3 DISTNAME= zope.interface-${MODPY_EGG_VERSION} PKGNAME= py-zopeinterface-${MODPY_EGG_VERSION} CATEGORIES= devel -REVISION= 2 +REVISION= 3 # Zope Public License PERMIT_PACKAGE= Yes @@ -23,6 +23,6 @@ TEST_DEPENDS= devel/py-zopeevent${MODPY_FLAVOR} MODPY_SETUPTOOLS= Yes FLAVORS= python3 -FLAVOR?= +FLAVOR= python3 .include diff --git a/devel/py-zopeinterface/pkg/PLIST b/devel/py-zopeinterface/pkg/PLIST index 4ccb05e15f1..14ff70400ae 100644 --- a/devel/py-zopeinterface/pkg/PLIST +++ b/devel/py-zopeinterface/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.7 2021/01/04 14:06:31 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.8 2021/02/16 23:02:07 sthen Exp $ +@pkgpath devel/py-zopeinterface lib/python${MODPY_VERSION}/site-packages/zope/ lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth lib/python${MODPY_VERSION}/site-packages/zope.interface-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 9b5d4063dda..dcb46582c54 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.1168 2021/02/16 22:22:49 kn Exp $ +# $OpenBSD: Makefile,v 1.1169 2021/02/16 23:02:08 sthen Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.556 +PKGNAME = quirks-3.557 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index a5cb06ce1c3..69e7efbfe25 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.1184 2021/02/16 22:22:50 kn Exp $ +# $OpenBSD: Quirks.pm,v 1.1185 2021/02/16 23:02:08 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -549,6 +549,20 @@ my $stem_extensions = { 'py-ripe.atlas.cousteau' => 'py3-ripe.atlas.cousteau', 'py-ripe.atlas.sagan' => 'py3-ripe.atlas.sagan', 'py-qtawesome' => 'py3-qtawesome', + 'py-twisted' => 'py3-twisted', + 'py-hamcrest' => 'py3-hamcrest', + 'py-automat' => 'py3-automat', + 'py-constantly' => 'py3-constantly', + 'py-incremental' => 'py3-incremental', + 'py-zopeevent' => 'py3-zopeevent', + 'py-zopeinterface' => 'py3-zopeinterface', + 'py-zopetesting' => 'py3-zopetesting', + 'py-zopecomponent' => 'py3-zopecomponent', + 'py-service_identity' => 'py3-service_identity', + 'py-hyperlink' => 'py3-hyperlink', + 'py-asn1-modules' => 'py3-asn1-modules', + 'py-ldap' => 'py3-ldap', + 'py-ldap-examples' => 'py3-ldap-examples', }; my $obsolete_reason = { @@ -2097,6 +2111,7 @@ my $obsolete_reason = { 'viz' => 4, 'drifntet' => 40, 'enjoympeg' => 6, + 'trac-ldapplugin' => 6, 'xboing' => 0, }; diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile index 725e7ff5030..490c4521c0f 100644 --- a/security/py-service_identity/Makefile +++ b/security/py-service_identity/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2020/07/03 21:13:07 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2021/02/16 23:02:07 sthen Exp $ COMMENT = service identity verification for pyOpenSSL/py-cryptography MODPY_EGG_VERSION = 18.1.0 DISTNAME = service_identity-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 # also on pypi, but no tests present GH_ACCOUNT = pyca @@ -29,7 +29,7 @@ RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ security/py-openssl${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 TEST_ENV += PYTHONPATH=${WRKSRC}/lib diff --git a/security/py-service_identity/pkg/PLIST b/security/py-service_identity/pkg/PLIST index 15daf33dae3..102940ef77f 100644 --- a/security/py-service_identity/pkg/PLIST +++ b/security/py-service_identity/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2019/02/04 19:38:55 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2021/02/16 23:02:07 sthen Exp $ +@pkgpath security/py-service_identity lib/python${MODPY_VERSION}/site-packages/service_identity/ lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/textproc/Makefile b/textproc/Makefile index 9f35010bb57..47684e5e300 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.662 2021/02/08 09:57:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.663 2021/02/16 23:02:06 sthen Exp $ SUBDIR = SUBDIR += TclXML @@ -414,7 +414,6 @@ SUBDIR += py-lxml,python3 SUBDIR += py-markdown SUBDIR += py-markdown,python3 - SUBDIR += py-m2r SUBDIR += py-m2r,python3 SUBDIR += py-mistune SUBDIR += py-mistune,python3 diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile index a898e2c990c..3e55ef86d9b 100644 --- a/textproc/py-m2r/Makefile +++ b/textproc/py-m2r/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/07/03 21:13:14 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2021/02/16 23:02:07 sthen Exp $ COMMENT = markdown to reStructuredText converter @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 0.1.6 DISTNAME = m2r-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel textproc @@ -24,13 +24,6 @@ RUN_DEPENDS = textproc/py-mistune${MODPY_FLAVOR} \ textproc/py-docutils${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= - -.if ! ${FLAVOR:Mpython3} -TEST_DEPENDS += devel/py-mock${MODPY_FLAVOR} -.endif - -post-install: - mv ${PREFIX}/bin/m2r{,${MODPY_BIN_SUFFIX}} +FLAVOR = python3 .include diff --git a/textproc/py-m2r/pkg/PLIST b/textproc/py-m2r/pkg/PLIST index c7a8b7e56e7..8fcd7918aea 100644 --- a/textproc/py-m2r/pkg/PLIST +++ b/textproc/py-m2r/pkg/PLIST @@ -1,5 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/06 09:51:45 landry Exp $ -bin/m2r${MODPY_BIN_SUFFIX} +@comment $OpenBSD: PLIST,v 1.2 2021/02/16 23:02:07 sthen Exp $ +@conflict py-m2r-* +@pkgpath textproc/py-m2r +bin/m2r lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}m2r.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/m2r-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/m2r-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO diff --git a/www/py-hyperlink/Makefile b/www/py-hyperlink/Makefile index 0cdb6e5340a..b8eb7a7c762 100644 --- a/www/py-hyperlink/Makefile +++ b/www/py-hyperlink/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/07/03 21:13:19 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2021/02/16 23:02:07 sthen Exp $ COMMENT = pure-Python implementation of immutable URLs @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 19.0.0 DISTNAME = hyperlink-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = www @@ -22,6 +22,6 @@ MODPY_PYTEST_ARGS = lib/hyperlink/test TEST_DEPENDS = net/py-idna${MODPY_FLAVOR} FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 .include diff --git a/www/py-hyperlink/pkg/PLIST b/www/py-hyperlink/pkg/PLIST index d0bc4c68ab2..f6feffd5c4a 100644 --- a/www/py-hyperlink/pkg/PLIST +++ b/www/py-hyperlink/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2020/02/11 10:20:56 benoit Exp $ +@comment $OpenBSD: PLIST,v 1.3 2021/02/16 23:02:07 sthen Exp $ +@pkgpath www/py-hyperlink lib/python${MODPY_VERSION}/site-packages/hyperlink/ lib/python${MODPY_VERSION}/site-packages/hyperlink-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/hyperlink-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO