mitmproxy: Switch to real urwid

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jan 7 00:06:14 2024 +0100
Changeset:	ede37f2126e289be098a20d0a36ec6486570bbc5

Modified Files:
	mitmproxy/Makefile

Log Message:
mitmproxy: Switch to real urwid

From a skim of commits it seems that urwid-mitmproxy should only helps
Windows. Avoid that fork so we will not need to maintain an extra
package and some kludges!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ede37f2126e289be098a20d0a36ec6486570bbc5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mitmproxy/Makefile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diffs:
diff --git a/mitmproxy/Makefile b/mitmproxy/Makefile
index 8a12bbf55d..718d9e64b8 100644
--- a/mitmproxy/Makefile
+++ b/mitmproxy/Makefile
@@ -32,7 +32,7 @@ DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip
 DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.3:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-tornado>=6.2:../../www/py-tornado
-DEPENDS+=	${PYPKGPREFIX}-urwid-mitmproxy>=2.1.1:../../wip/py-urwid-mitmproxy
+DEPENDS+=	${PYPKGPREFIX}-urwid>=2.1.1:../../devel/py-urwid
 DEPENDS+=	${PYPKGPREFIX}-wsproto>=1.0:../../www/py-wsproto
 DEPENDS+=	${PYPKGPREFIX}-zstandard>=0.11:../../archivers/py-zstandard
 
@@ -42,20 +42,21 @@ DEPENDS+=	${PYPKGPREFIX}-zstandard>=0.11:../../archivers/py-zstandard
 DEPENDS+=	${PYPKGPREFIX}-typing-extensions>=4.3:../../devel/py-typing-extensions
 .endif
 
+# Forked urwid-mitmproxy-2.1.2.1 contains patches for Windows. They should be
+# not needed in pkgsrc and this spare us some kludges and maintainance due
+# forked urwid.
+SUBST_CLASSES+=		urwid
+SUBST_STAGE.urwid=	pre-configure
+SUBST_MESSAGE.urwid=	Use non-forked urwid
+SUBST_FILES.urwid=	pyproject.toml
+SUBST_SED.urwid+=	-e 's/urwid-mitmproxy/urwid/g'
+
 SUBST_CLASSES+=				pyprojecttomlversions
 SUBST_STAGE.pyprojecttomlversions=	pre-configure
 SUBST_MESSAGE.pyprojecttomlversions=	Avoid too strict version requirements
 SUBST_FILES.pyprojecttomlversions=	pyproject.toml
 SUBST_SED.pyprojecttomlversions+=	-E -e '/[>=]=/ s/, *<[0-9.]+(",|;)/\1/g'
 
-# XXX: This is very dirty and fragile!
-SUBST_CLASSES+=			urwid_mitmproxy
-SUBST_STAGE.urwid_mitmproxy=	pre-configure
-SUBST_MESSAGE.urwid_mitmproxy=	Avoid conflicts with urwid
-SUBST_FILES.urwid_mitmproxy+=	mitmproxy/tools/console/*.py
-SUBST_FILES.urwid_mitmproxy+=	mitmproxy/tools/console/*/*.py
-SUBST_SED.urwid_mitmproxy+=	-e 's/urwid/urwid_mitmproxy/g'
-
 REPLACE_SH+=	mitmproxy/contrib/kaitaistruct/make.sh
 
 USE_LANGUAGES=			# none