On Sat, Jul 25, 2020 at 06:03:25PM -0400, Kurt Mosiejczuk wrote:
> Move py-algorithm-munkres to the new style for python3-only ports
>
> Also update its only consumer, audio/beets to have MODPY_FLAVOR for
> that dependency.
You'll want to add the flavour to devel/Makefile as well, then OK kn.
AFAICT, a quirk is not needed since PKGSTEM did not change.
PS: You mixed diffs from different directories, these are a pain to
apply - could you send them from /usr/ports/ or at least through
attachments next time?
>
> ok?
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-algorithm-munkres/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 3 Jul 2020 21:12:40 -0000 1.9
> +++ Makefile 25 Jul 2020 21:51:11 -0000
> @@ -5,7 +5,7 @@ COMMENT = munkres algorithm for the Assi
> MODPY_EGG_VERSION = 1.1.2
> DISTNAME = munkres-${MODPY_EGG_VERSION}
> PKGNAME = py-algorithm-${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -19,6 +19,7 @@ MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +FLAVORS = python3
> +FLAVOR = python3
>
> .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-algorithm-munkres/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Jun 2017 14:41:58 -0000 1.2
> +++ pkg/PLIST 25 Jul 2020 21:51:11 -0000
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.2 2017/06/11 14:41:58 sthen Exp $
> +@pkgpath devel/py-algorithm-munkres
> +@conflict py-algorithm-munkres-*
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}munkres.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/munkres-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/munkres-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/beets/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 3 Jul 2020 21:12:34 -0000 1.46
> +++ Makefile 25 Jul 2020 21:59:26 -0000
> @@ -5,7 +5,7 @@ COMMENT= CLI tools to manage music colle
> MODPY_EGG_VERSION= 1.4.9
> DISTNAME= beets-${MODPY_EGG_VERSION}
> CATEGORIES= audio
> -REVISION= 5
> +REVISION= 6
>
> HOMEPAGE= http://beets.io/
>
> @@ -23,7 +23,7 @@ RUN_DEPENDS+= audio/py-discogs-client${M
> audio/py-last${MODPY_FLAVOR} \
> audio/py-musicbrainzngs${MODPY_FLAVOR} \
> audio/py-mutagen${MODPY_FLAVOR} \
> - devel/py-algorithm-munkres \
> + devel/py-algorithm-munkres${MODPY_FLAVOR} \
> devel/py-pathlib${MODPY_FLAVOR} \
> devel/py-six${MODPY_FLAVOR} \
> devel/py-xdg${MODPY_FLAVOR} \
>
