ok?

new required port dev/py-cwcwidth is attached. (I would have used
textproc, but the similar py-wcwidth is in devel so I followed that
for consistency).

Index: devel/py-curtsies/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-curtsies/Makefile,v
diff -u -p -r1.18 Makefile
--- devel/py-curtsies/Makefile  21 Dec 2024 11:40:02 -0000      1.18
+++ devel/py-curtsies/Makefile  28 Dec 2024 13:01:00 -0000
@@ -1,24 +1,20 @@
 COMMENT =              curses-like terminal wrapper
 
-MODPY_DISTV =  0.3.4
+MODPY_DISTV =          0.4.2
 DISTNAME =             curtsies-${MODPY_DISTV}
 PKGNAME =              py-${DISTNAME}
 CATEGORIES =           devel
-REVISION =             3
 
 # MIT
 PERMIT_PACKAGE =       Yes
 
 MODULES =              lang/python
-
 MODPY_PYBUILD =                setuptools
 MODPY_PI =             Yes
 
-RUN_DEPENDS =          devel/py-blessings \
-                       devel/py-wcwidth
+RUN_DEPENDS =          sysutils/py-blessed \
+                       devel/py-cwcwidth
 
-TEST_DEPENDS =         devel/py-mock \
-                       devel/py-nose \
-                       devel/py-pyte
+TEST_DEPENDS =         devel/py-pyte
 
 .include <bsd.port.mk>
Index: devel/py-curtsies/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-curtsies/distinfo,v
diff -u -p -r1.4 distinfo
--- devel/py-curtsies/distinfo  2 Nov 2021 10:23:09 -0000       1.4
+++ devel/py-curtsies/distinfo  28 Dec 2024 13:01:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (curtsies-0.3.4.tar.gz) = TKVDmY2Lu6cYXbCZ+Le7MLrrR0JvesGiceTZyou7KwU=
-SIZE (curtsies-0.3.4.tar.gz) = 52733
+SHA256 (curtsies-0.4.2.tar.gz) = br4zIVvXyShRpQYEnHIMykz1wZLBZlwdepigTEcCdg4=
+SIZE (curtsies-0.4.2.tar.gz) = 53559
Index: devel/py-curtsies/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-curtsies/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- devel/py-curtsies/pkg/PLIST 21 Dec 2024 11:40:02 -0000      1.6
+++ devel/py-curtsies/pkg/PLIST 28 Dec 2024 13:01:00 -0000
@@ -1,5 +1,5 @@
-@pkgpath devel/py-curtsies,python3
 @conflict py-curtsies-*
+@pkgpath devel/py-curtsies,python3
 lib/python${MODPY_VERSION}/site-packages/curtsies/
 lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_DISTV}.dist-info/
 
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_DISTV}.dist-info/LICENSE
@@ -41,6 +41,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/curtsies/formatstring.py
 lib/python${MODPY_VERSION}/site-packages/curtsies/formatstringarray.py
 lib/python${MODPY_VERSION}/site-packages/curtsies/input.py
+lib/python${MODPY_VERSION}/site-packages/curtsies/py.typed
 lib/python${MODPY_VERSION}/site-packages/curtsies/termformatconstants.py
 lib/python${MODPY_VERSION}/site-packages/curtsies/termhelpers.py
 lib/python${MODPY_VERSION}/site-packages/curtsies/window.py
Index: devel/bpython/Makefile
===================================================================
RCS file: /cvs/ports/devel/bpython/Makefile,v
diff -u -p -r1.36 Makefile
--- devel/bpython/Makefile      21 Dec 2024 11:39:32 -0000      1.36
+++ devel/bpython/Makefile      28 Dec 2024 13:01:00 -0000
@@ -1,9 +1,8 @@
 COMMENT=       fancy interface to the Python interpreter
 
-MODPY_DISTV=0.18
+MODPY_DISTV=   0.24
 DISTNAME=      bpython-${MODPY_DISTV}
 CATEGORIES=    devel
-REVISION=      6
 
 HOMEPAGE=      https://bpython-interpreter.org/
 MAINTAINER=    Brian Callahan <bcal...@openbsd.org>
@@ -14,16 +13,20 @@ PERMIT_PACKAGE=     Yes
 SITES=         ${HOMEPAGE}/releases/
 
 MODULES=       lang/python
-
 MODPY_PYBUILD= setuptools
+MODPY_PI=      Yes
 
 RUN_DEPENDS=   devel/desktop-file-utils \
                devel/py-curtsies \
+               devel/py-cwcwidth \
                devel/py-greenlet \
-               devel/py-six \
-               devel/py-urwid \
                textproc/py-pygments \
-               www/py-requests
+               devel/py-xdg \
+               www/py-requests \
+               devel/py-jedi \
+               devel/py-urwid \
+               sysutils/py-pyperclip \
+               sysutils/py-watchdog
 BUILD_DEPENDS= devel/py-babel \
                textproc/py-sphinx
 
Index: devel/bpython/distinfo
===================================================================
RCS file: /cvs/ports/devel/bpython/distinfo,v
diff -u -p -r1.9 distinfo
--- devel/bpython/distinfo      9 Aug 2019 00:00:40 -0000       1.9
+++ devel/bpython/distinfo      28 Dec 2024 13:01:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (bpython-0.18.tar.gz) = Vswg2+VoyYyB3kmQ/d9YYsDY06sK0c9wV5iKvF92hsI=
-SIZE (bpython-0.18.tar.gz) = 213321
+SHA256 (bpython-0.24.tar.gz) = mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0=
+SIZE (bpython-0.24.tar.gz) = 222879
Index: devel/bpython/patches/patch-bpython_test_test_args_py
===================================================================
RCS file: devel/bpython/patches/patch-bpython_test_test_args_py
diff -N devel/bpython/patches/patch-bpython_test_test_args_py
--- devel/bpython/patches/patch-bpython_test_test_args_py       11 Mar 2022 
18:49:46 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-Skip three tests that just hang forever
-
-Index: bpython/test/test_args.py
---- bpython/test/test_args.py.orig
-+++ bpython/test/test_args.py
-@@ -20,6 +20,7 @@ except ImportError:
- 
- @attr(speed='slow')
- class TestExecArgs(unittest.TestCase):
-+    @unittest.skip("hangs under OpenBSD")
-     def test_exec_dunder_file(self):
-         with tempfile.NamedTemporaryFile(mode="w") as f:
-             f.write(dedent("""\
-@@ -37,6 +38,7 @@ class TestExecArgs(unittest.TestCase):
- 
-             self.assertEqual(stderr.strip(), f.name)
- 
-+    @unittest.skip("hangs under OpenBSD")
-     def test_exec_nonascii_file(self):
-         with tempfile.NamedTemporaryFile(mode="w") as f:
-             f.write(dedent('''\
-@@ -52,6 +54,7 @@ class TestExecArgs(unittest.TestCase):
-             except subprocess.CalledProcessError:
-                 self.fail('Error running module with nonascii characters')
- 
-+    @unittest.skip("hangs under OpenBSD")
-     def test_exec_nonascii_file_linenums(self):
-         with tempfile.NamedTemporaryFile(mode="w") as f:
-             f.write(dedent("""\
Index: devel/bpython/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bpython/pkg/PLIST,v
diff -u -p -r1.13 PLIST
--- devel/bpython/pkg/PLIST     21 Dec 2024 11:39:32 -0000      1.13
+++ devel/bpython/pkg/PLIST     28 Dec 2024 13:01:00 -0000
@@ -1,5 +1,5 @@
-@pkgpath devel/bpython,python3
 @conflict bpython3-*
+@pkgpath devel/bpython,python3
 bin/bpdb
 bin/bpython
 bin/bpython-curses
@@ -17,7 +17,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bpdb/debugger.py
 lib/python${MODPY_VERSION}/site-packages/bpython/
 lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_DISTV}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_DISTV}.dist-info/AUTHORS
 
lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_DISTV}.dist-info/LICENSE
 
lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_DISTV}.dist-info/METADATA
 
lib/python${MODPY_VERSION}/site-packages/bpython-${MODPY_DISTV}.dist-info/RECORD
@@ -33,8 +32,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_internal.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_py3compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_py3compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_typing_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_typing_compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -43,8 +42,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}autocomplete.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}curtsies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -75,17 +72,14 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}repl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simpleeval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simpleeval.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simplerepl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}simplerepl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}urwid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/${MODPY_PYCACHE}urwid.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bpython/_internal.py
-lib/python${MODPY_VERSION}/site-packages/bpython/_py3compat.py
+lib/python${MODPY_VERSION}/site-packages/bpython/_typing_compat.py
 lib/python${MODPY_VERSION}/site-packages/bpython/_version.py
 lib/python${MODPY_VERSION}/site-packages/bpython/args.py
 lib/python${MODPY_VERSION}/site-packages/bpython/autocomplete.py
 lib/python${MODPY_VERSION}/site-packages/bpython/cli.py
-lib/python${MODPY_VERSION}/site-packages/bpython/clipboard.py
 lib/python${MODPY_VERSION}/site-packages/bpython/config.py
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsies.py
 lib/python${MODPY_VERSION}/site-packages/bpython/curtsiesfrontend/
@@ -143,7 +137,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bpython/repl.py
 lib/python${MODPY_VERSION}/site-packages/bpython/sample-config
 lib/python${MODPY_VERSION}/site-packages/bpython/simpleeval.py
-lib/python${MODPY_VERSION}/site-packages/bpython/simplerepl.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/
 lib/python${MODPY_VERSION}/site-packages/bpython/test/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}/
@@ -153,6 +146,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_autocomplete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_autocomplete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_brackets_completion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_brackets_completion.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_crashers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -213,6 +208,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test.theme
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test_args.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test_autocomplete.py
+lib/python${MODPY_VERSION}/site-packages/bpython/test/test_brackets_completion.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test_config.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test_crashers.py
 lib/python${MODPY_VERSION}/site-packages/bpython/test/test_curtsies.py
@@ -239,9 +235,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bpython/urwid.py
 @man man/man1/bpython.1
 @man man/man5/bpython-config.5
-share/appinfo/
-share/appinfo/org.bpython-interpreter.bpython.appdata.xml
 share/applications/org.bpython-interpreter.bpython.desktop
+share/metainfo/
+share/metainfo/org.bpython-interpreter.bpython.metainfo.xml
 share/pixmaps/
-@tag update-desktop-database
 share/pixmaps/bpython.png
+@tag update-desktop-database

Attachment: py-cwcwidth.tgz
Description: application/tar-gz

Reply via email to