On 2022/06/26 19:19, Matthieu Herrb wrote:
> Hi,
>
> The patch below updates py-xcbgen to version 1.15.2, in prepration for
> an update ot xcb-protos in xenocara.
>
> But I see those .opt-2.pyc files appearing in PLIST in addition
> .opt-1.pyc files handled by MODPY_PYOEXTENSION
>
> My python module knowledge is too weak to tell how to deal with the
> situation. afaict there are a few other ports that set
> MODPY_PYOEXTENSION to opt-2.pyc, but I haven't found a port that
> generate both extentions so far.
>
> A suggestion ?
MODPY_PYOEXTENSION is primarily so that a PLIST can be shared between python 2
and python 3 without too much extra mess, in the case of a py3-only port
we can ignore it.
OK sthen@ as-is
> Index: Makefile
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/x11/py-xcbgen/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 Makefile
> --- Makefile 11 Mar 2022 20:16:58 -0000 1.11
> +++ Makefile 26 Jun 2022 17:14:16 -0000
> @@ -1,10 +1,9 @@
> COMMENT = X C Binding - protocol binding generator
>
> # please keep in sync with the version in proto/xcb-proto in Xenocara
> -VERSION = 1.14.1
> +VERSION = 1.15.2
> DISTNAME = xcb-proto-${VERSION}
> PKGNAME = py-xcbgen-${VERSION}
> -REVISION = 1
>
> CATEGORIES = x11
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/x11/py-xcbgen/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 distinfo
> --- distinfo 20 Dec 2020 15:37:02 -0000 1.4
> +++ distinfo 26 Jun 2022 16:57:52 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (xcb-proto-1.14.1.tar.xz) =
> 8ErdmpcqwzTqEdnX60/H+Ig4Ndo+SFnJr6lx799X/MM=
> -SIZE (xcb-proto-1.14.1.tar.xz) = 143588
> +SHA256 (xcb-proto-1.15.2.tar.xz) =
> cHK+sfaAov4/nlNbeXwUbSJSiZDHL2PdtJ0vNQo2U+0=
> +SIZE (xcb-proto-1.15.2.tar.xz) = 148108
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/x11/py-xcbgen/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -r1.4 PLIST
> --- pkg/PLIST 11 Mar 2022 20:16:58 -0000 1.4
> +++ pkg/PLIST 26 Jun 2022 16:59:10 -0000
> @@ -3,18 +3,25 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/xcbgen/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}align.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}align.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}align.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}matcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}matcher.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}matcher.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}xtypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}xtypes.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>
> lib/python${MODPY_VERSION}/site-packages/xcbgen/${MODPY_PYCACHE}xtypes.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/xcbgen/align.py
> lib/python${MODPY_VERSION}/site-packages/xcbgen/error.py
>
> --
> Matthieu Herrb
>
