From 79baef0afff67fabb723a3cb306800bd75320e5a Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 21 Dec 2024 11:37:43 +0000
Subject: [PATCH] handle py3.12 switchover in converters

---
 converters/Makefile               |  8 ++++----
 converters/libpst/Makefile        |  2 +-
 converters/py-html2text/Makefile  |  9 +++------
 converters/py-html2text/pkg/PLIST | 18 +++++++++---------
 converters/py-num2words/Makefile  | 10 ++++------
 converters/py-num2words/pkg/PLIST | 14 +++++++-------
 converters/py-tnefparse/Makefile  | 11 ++++-------
 converters/py-tnefparse/pkg/PLIST | 17 +++++++++--------
 converters/py-vdf/Makefile        |  9 +++------
 converters/py-vdf/pkg/PLIST       | 13 +++++++------
 converters/recode/Makefile        |  2 +-
 converters/unoconv/Makefile       |  2 +-
 12 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/converters/Makefile b/converters/Makefile
index 913e55e16ed..7528b7f147e 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -79,10 +79,10 @@
      SUBDIR += p5-Unicode-Stringprep
      SUBDIR += pflogx
      SUBDIR += ppmtoTbmp
-     SUBDIR += py-html2text,python3
-     SUBDIR += py-num2words,python3
-     SUBDIR += py-tnefparse,python3
-     SUBDIR += py-vdf,python3
+     SUBDIR += py-html2text
+     SUBDIR += py-num2words
+     SUBDIR += py-tnefparse
+     SUBDIR += py-vdf
      SUBDIR += qprint
      SUBDIR += recode
      SUBDIR += ripmime
diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile
index dad579b7ebb..3faa6843716 100644
--- a/converters/libpst/Makefile
+++ b/converters/libpst/Makefile
@@ -5,7 +5,7 @@ COMMENT-python=		python interface to libpst
 
 DISTNAME=		libpst-0.6.76
 REVISION-main=		1
-REVISION-python=	3
+REVISION-python=	4
 
 SHARED_LIBS +=  pst                  3.0      # 5.17
 
diff --git a/converters/py-html2text/Makefile b/converters/py-html2text/Makefile
index f2a7343ec80..b2ad318d356 100644
--- a/converters/py-html2text/Makefile
+++ b/converters/py-html2text/Makefile
@@ -1,9 +1,9 @@
 COMMENT=	HTML to markdown-formatted text converter
 
-MODPY_EGG_VERSION=	2024.2.26
-DISTNAME=	html2text-${MODPY_EGG_VERSION}
+MODPY_DISTV=	2024.2.26
+DISTNAME=	html2text-${MODPY_DISTV}
 PKGNAME=	py-${DISTNAME}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	converters
 HOMEPAGE=	http://alir3z4.github.io/html2text/
@@ -16,9 +16,6 @@ MODULES=	lang/python
 MODPY_PI=	Yes
 MODPY_PYBUILD=	setuptools
 
-FLAVORS=	python3
-FLAVOR=		python3
-
 post-install:
 	mv ${PREFIX}/bin/html2text ${PREFIX}/bin/${MODPY_PY_PREFIX}html2text
 
diff --git a/converters/py-html2text/pkg/PLIST b/converters/py-html2text/pkg/PLIST
index 4a0527a9ef3..9722bd5bcdd 100644
--- a/converters/py-html2text/pkg/PLIST
+++ b/converters/py-html2text/pkg/PLIST
@@ -1,15 +1,15 @@
+@pkgpath converters/py-html2text,python3
 @conflict py-html2text-*
-@pkgpath converters/py-html2text
 bin/${MODPY_PY_PREFIX}html2text
 lib/python${MODPY_VERSION}/site-packages/html2text/
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/COPYING
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/html2text-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/html2text/__init__.py
 lib/python${MODPY_VERSION}/site-packages/html2text/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/html2text/${MODPY_PYCACHE}/
diff --git a/converters/py-num2words/Makefile b/converters/py-num2words/Makefile
index 7555e4029f4..e5ed6de0dd9 100644
--- a/converters/py-num2words/Makefile
+++ b/converters/py-num2words/Makefile
@@ -1,8 +1,9 @@
 COMMENT =	convert numbers to words
 
-MODPY_EGG_VERSION =	0.5.14
-DISTNAME=	num2words-${MODPY_EGG_VERSION}
+MODPY_DISTV =	0.5.14
+DISTNAME=	num2words-${MODPY_DISTV}
 PKGNAME=	py-${DISTNAME}
+REVISION=	0
 
 CATEGORIES=	converters
 
@@ -13,14 +14,11 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
 
-FLAVORS=	python3
-FLAVOR=		python3
-
 MODPY_PI=		Yes
 MODPY_PYBUILD=		setuptools
 # needs delegator.py
 MODPY_PYTEST_ARGS=	--ignore tests/test_cli.py
 
-TEST_DEPENDS=		devel/py-docopt${MODPY_FLAVOR}
+TEST_DEPENDS=		devel/py-docopt
 
 .include <bsd.port.mk>
diff --git a/converters/py-num2words/pkg/PLIST b/converters/py-num2words/pkg/PLIST
index 3e54332045b..6a3b5229523 100644
--- a/converters/py-num2words/pkg/PLIST
+++ b/converters/py-num2words/pkg/PLIST
@@ -1,13 +1,13 @@
+@pkgpath converters/py-num2words,python3
 @conflict py-num2words-*
-@pkgpath converters/py-num2words
 bin/num2words
 lib/python${MODPY_VERSION}/site-packages/num2words/
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/COPYING
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/num2words/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/num2words/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/num2words/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
diff --git a/converters/py-tnefparse/Makefile b/converters/py-tnefparse/Makefile
index f27224e8c62..557d4ce4de8 100644
--- a/converters/py-tnefparse/Makefile
+++ b/converters/py-tnefparse/Makefile
@@ -1,8 +1,8 @@
 COMMENT=	TNEF decoding and attachment extraction
 
-MODPY_EGG_VERSION=	1.4.0
-REVISION=	1
-DISTNAME=	tnefparse-${MODPY_EGG_VERSION}
+MODPY_DISTV=	1.4.0
+REVISION=	2
+DISTNAME=	tnefparse-${MODPY_DISTV}
 PKGNAME=	py-${DISTNAME}
 
 CATEGORIES=	converters
@@ -16,10 +16,7 @@ MODULES=	lang/python
 MODPY_PI=	Yes
 MODPY_PYBUILD=	setuptools
 
-FLAVORS=	python3
-FLAVOR=		python3
-
-RUN_DEPENDS=	archivers/py-compressed_rtf${MODPY_FLAVOR}
+RUN_DEPENDS=	archivers/py-compressed_rtf
 
 # tests in this file require pytest-console-scripts
 MODPY_PYTEST_ARGS= --ignore tests/test_cmdline.py
diff --git a/converters/py-tnefparse/pkg/PLIST b/converters/py-tnefparse/pkg/PLIST
index c6abd087cec..28b5d435a9f 100644
--- a/converters/py-tnefparse/pkg/PLIST
+++ b/converters/py-tnefparse/pkg/PLIST
@@ -1,13 +1,14 @@
+@pkgpath converters/py-tnefparse,python3
 bin/tnefparse
 lib/python${MODPY_VERSION}/site-packages/tnefparse/
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_EGG_VERSION}.dist-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tnefparse-${MODPY_DISTV}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/tnefparse/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tnefparse/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/tnefparse/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
diff --git a/converters/py-vdf/Makefile b/converters/py-vdf/Makefile
index 60cf250b6b8..914bcf8a740 100644
--- a/converters/py-vdf/Makefile
+++ b/converters/py-vdf/Makefile
@@ -1,8 +1,8 @@
 COMMENT =		Library for working with Valve's VDF text format
 
-MODPY_EGG_VERSION =	3.4
-REVISION =		2
-DISTNAME =		vdf-${MODPY_EGG_VERSION}
+MODPY_DISTV =	3.4
+REVISION =		3
+DISTNAME =		vdf-${MODPY_DISTV}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		converters
 HOMEPAGE =		https://github.com/ValvePython/vdf
@@ -14,9 +14,6 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools
 
-FLAVORS =		python3
-FLAVOR =		python3
-
 # tests not included in pypi tarball
 NO_TEST =		Yes
 
diff --git a/converters/py-vdf/pkg/PLIST b/converters/py-vdf/pkg/PLIST
index bf616565c79..3760b749541 100644
--- a/converters/py-vdf/pkg/PLIST
+++ b/converters/py-vdf/pkg/PLIST
@@ -1,10 +1,11 @@
+@pkgpath converters/py-vdf,python3
 lib/python${MODPY_VERSION}/site-packages/vdf/
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_EGG_VERSION}.dist-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/vdf-${MODPY_DISTV}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/vdf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vdf/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/vdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index df12c0339d1..892f2d01ee6 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -21,7 +21,7 @@ MODPY_RUNDEP=	No
 
 BUILD_DEPENDS=	devel/help2man
 LIB_DEPENDS=	devel/gettext,-runtime
-TEST_DEPENDS=	lang/cython${MODPY_FLAVOR}
+TEST_DEPENDS=	lang/cython
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--without-included-gettext
diff --git a/converters/unoconv/Makefile b/converters/unoconv/Makefile
index 37f8b523154..e9153453908 100644
--- a/converters/unoconv/Makefile
+++ b/converters/unoconv/Makefile
@@ -8,7 +8,7 @@ COMMENT=		UNiversal Office CONVerter
 GH_ACCOUNT=		unoconv
 GH_PROJECT=		unoconv
 GH_TAGNAME=		0.9.0
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		converters textproc