This moves py-algorithm-munkres to use FLAVOR=python3 rather than
using MODPY_DEFAULT_VERSION_3. Also includes the necessary changes for
its only consumer, audio/beets.
ok?
--Kurt
Index: audio/beets/Makefile
===================================================================
RCS file: /cvs/ports/audio/beets/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- audio/beets/Makefile 8 Sep 2020 18:23:35 -0000 1.48
+++ audio/beets/Makefile 19 Sep 2020 19:49:47 -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= 7
+REVISION= 8
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} \
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2016
diff -u -p -r1.2016 Makefile
--- devel/Makefile 16 Sep 2020 07:29:10 -0000 1.2016
+++ devel/Makefile 19 Sep 2020 19:49:47 -0000
@@ -1310,7 +1310,7 @@
SUBDIR += pycharm
SUBDIR += py-Checker
SUBDIR += py-SOAPpy
- SUBDIR += py-algorithm-munkres
+ SUBDIR += py-algorithm-munkres,python3
SUBDIR += py-altgraph
SUBDIR += py-altgraph,python3
SUBDIR += py-ana
Index: devel/py-algorithm-munkres/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-algorithm-munkres/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/py-algorithm-munkres/Makefile 3 Jul 2020 21:12:40 -0000 1.9
+++ devel/py-algorithm-munkres/Makefile 19 Sep 2020 19:49:47 -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: devel/py-algorithm-munkres/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-algorithm-munkres/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/py-algorithm-munkres/pkg/PLIST 11 Jun 2017 14:41:58 -0000
1.2
+++ devel/py-algorithm-munkres/pkg/PLIST 19 Sep 2020 19:49:47 -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
