OK.
It can be simplified a bit with this on top:
--- Makefile- Fri May 26 11:14:17 2023
+++ Makefile Fri May 26 11:16:03 2023
@@ -12,12 +12,9 @@ MAINTAINER = Paco Esteban <paco@openbsd.org>
# GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_PYPI:=n/nbxmpp/}
-
MODULES = lang/python
+MODPY_PI = Yes
MODPY_PYBUILD = setuptools
-MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS = test
RUN_DEPENDS = devel/glib2>=2.60.0 \
devel/libsoup3 \
On 2023/05/20 19:19, Paco Esteban wrote:
> Hi ports@,
>
> This is an update of net/py-nbxmpp to its latest version 4.2.2
> It's needed for an upcoming update of net/gajim
>
> Main changes are now python 3.10 is needed and they moved from libsoup
> 2 to 3. Full changelog here:
>
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/4.2.2/ChangeLog
>
> Nothing really special on the port itself.
>
> Ok to commit ?
>
> diff /usr/ports
> commit - 630d98e3b12a74e52362425cf2d761365414e347
> path + /usr/ports
> blob - 337888249008cd57a876734605f787d6812516df
> file + net/py-nbxmpp/Makefile
> --- net/py-nbxmpp/Makefile
> +++ net/py-nbxmpp/Makefile
> @@ -1,10 +1,9 @@
> COMMENT = Python XMPP and Jabber implementation
>
> -MODPY_EGG_VERSION = 3.2.4
> +MODPY_EGG_VERSION = 4.2.2
> DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = net devel
> -REVISION = 0
>
> HOMEPAGE = https://python-nbxmpp.gajim.org/
>
> @@ -20,8 +19,8 @@ RUN_DEPENDS = devel/glib2>=2.6.0 \
> MODPY_PYTEST = Yes
> MODPY_PYTEST_ARGS = test
>
> -RUN_DEPENDS = devel/glib2>=2.6.0 \
> - devel/libsoup \
> +RUN_DEPENDS = devel/glib2>=2.60.0 \
> + devel/libsoup3 \
> devel/py-gobject3${MODPY_FLAVOR} \
> net/py-idna${MODPY_FLAVOR} \
> sysutils/py-packaging${MODPY_FLAVOR} \
> blob - d7ad69572af4ab366b3c8905877c70805d0972a3
> file + net/py-nbxmpp/distinfo
> --- net/py-nbxmpp/distinfo
> +++ net/py-nbxmpp/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
> -SIZE (nbxmpp-3.2.4.tar.gz) = 161470
> +SHA256 (nbxmpp-4.2.2.tar.gz) = hvSIVtrwV3l/+WPtdUKvxsZEoN5m9hdxho1GuY33tiQ=
> +SIZE (nbxmpp-4.2.2.tar.gz) = 166998
> blob - a8138138b501a3f2181360deb7dfd4bdeb46afe1
> file + net/py-nbxmpp/pkg/PLIST
> --- net/py-nbxmpp/pkg/PLIST
> +++ net/py-nbxmpp/pkg/PLIST
> @@ -26,6 +26,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -65,15 +67,8 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/exampl
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/const.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/dispatcher.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/errors.py
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/__init__.py
> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/nbxmpp/examples/client.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/http.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/idlequeue.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/__init__.py
> @@ -158,8 +153,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/module
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}reactions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}reactions.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}replies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}replies.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/${MODPY_PYCACHE}rsm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -250,6 +249,7 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/module
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/ping.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/presence.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/pubsub.py
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/reactions.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/receipts.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/register/
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/register/__init__.py
> @@ -262,6 +262,7 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/module
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/register/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/register/register.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/register/util.py
> +lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/replies.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/roster.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/rsm.py
> lib/python${MODPY_VERSION}/site-packages/nbxmpp/modules/security_labels.py
>
> --
> Paco Esteban.
> 0x5818130B8A6DBC03
>
No comments:
Post a Comment