On 2021/09/09 11:37, Klemens Nanni wrote:
> On Thu, Sep 09, 2021 at 11:35:16AM +0000, Klemens Nanni wrote:
> > No python 2 consumers left:
> >
> > $ show-reverse-deps `make show=PKGPATH`
> > multimedia/streamlink
> > net/py-ripe.atlas.cousteau,python3
> > net/py-ripe.atlas.tools
> > net/py-socketio-client,python3
> >
> > OK?
>
> Here's the right diff with correct PLIST.
>
>
> Index: net/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/Makefile,v
> retrieving revision 1.1266
> diff -u -p -r1.1266 Makefile
> --- net/Makefile 2 Sep 2021 13:07:31 -0000 1.1266
> +++ net/Makefile 9 Sep 2021 11:32:42 -0000
> @@ -630,7 +630,6 @@
> SUBDIR += py-transmissionrpc-ng,python3
> SUBDIR += py-twitter,python3
> SUBDIR += py-txtorcon,python3
> - SUBDIR += py-websocket-client
> SUBDIR += py-websocket-client,python3
> SUBDIR += py-xmpppy
> SUBDIR += py-zeroconf,python3
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1293
> diff -u -p -r1.1293 Makefile
> --- devel/quirks/Makefile 8 Sep 2021 07:19:52 -0000 1.1293
> +++ devel/quirks/Makefile 9 Sep 2021 11:31:55 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-4.46
> +PKGNAME = quirks-4.47
> PKG_ARCH = *
> MAINTAINER = Marc Espie <[email protected]>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1309
> diff -u -p -r1.1309 Quirks.pm
> --- devel/quirks/files/Quirks.pm 8 Sep 2021 07:19:52 -0000 1.1309
> +++ devel/quirks/files/Quirks.pm 9 Sep 2021 11:32:20 -0000
> @@ -488,6 +488,7 @@ my $stem_extensions = {
> 'py-nxos' => 'py3-nxos',
> 'py-scp' => 'py3-scp',
> 'py-bcrypt' => 'py3-bcrypt',
> + 'py-websocket-client' => 'py3-websocket-client',
> };
>
> my $obsolete_reason = {};
> Index: net/py-websocket-client/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/py-websocket-client/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- net/py-websocket-client/Makefile 21 May 2021 19:50:34 -0000 1.11
> +++ net/py-websocket-client/Makefile 9 Sep 2021 11:31:36 -0000
> @@ -5,7 +5,7 @@ COMMENT = WebSocket client for Python
> MODPY_EGG_VERSION = 0.37.0
> DISTNAME = websocket_client-${MODPY_EGG_VERSION}
> PKGNAME = py-websocket-client-${MODPY_EGG_VERSION}
> -REVISION = 5
> +REVISION = 6
>
> CATEGORIES = net
>
> @@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
>
> MODULES = lang/python
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS = devel/py-six${MODPY_FLAVOR}
>
> Index: net/py-websocket-client/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/py-websocket-client/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- net/py-websocket-client/pkg/PLIST 19 Feb 2021 23:13:05 -0000 1.3
> +++ net/py-websocket-client/pkg/PLIST 9 Sep 2021 11:37:15 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.3 2021/02/19 23:13:05 sthen Exp $
> -@conflict py-websocket-client-<0.37.0p4
> +@conflict py-websocket-client-*
> +@pkgpath net/py-websocket-client
> bin/wsdump.py${MODPY_BIN_SUFFIX}
ok, can you remove MODPY_BIN_SUFFIX bits (PLIST and post-install) while
you're at it please?
> lib/python${MODPY_VERSION}/site-packages/websocket/
> lib/python${MODPY_VERSION}/site-packages/websocket/__init__.py
>
