Adjust to python-versioned py-qt5 and/or x11/py-qt5-qscintilla files.

4 files changed, 42 insertions, 4 deletions

diff --git a/finance/moneyguru/Makefile b/finance/moneyguru/Makefile
index f3e211e4d64..24bfe34da87 100644
--- a/finance/moneyguru/Makefile
+++ b/finance/moneyguru/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2019/11/02 16:08:47 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2020/01/26 12:55:00 rhialto Exp $
 
 DISTNAME=	moneyguru-src-2.11.0
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	https://download.hardcoded.net/
 
@@ -40,8 +40,10 @@ BASE_ARCH=	${MACHINE_ARCH}
 
 PLIST_SUBST+=	BASE_ARCH=${BASE_ARCH:Q}
 
+MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
 do-build:
-	cd ${WRKSRC} && ${PYTHONBIN} build.py
+	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} build.py
 	${CHMOD} +x ${WRKSRC}/run.py
 
 do-install:
diff --git a/finance/moneyguru/distinfo b/finance/moneyguru/distinfo
index 86738a9463a..f9a2add03da 100644
--- a/finance/moneyguru/distinfo
+++ b/finance/moneyguru/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/09/04 14:45:43 wiz Exp $
+$NetBSD: distinfo,v 1.11 2020/01/26 12:55:00 rhialto Exp $
 
 SHA1 (moneyguru-src-2.11.0.tar.gz) = f3c787c45f5057d8f348a0c37b2da010f4444057
 RMD160 (moneyguru-src-2.11.0.tar.gz) = 8e04b57bd3100ce28fb003c528000463f9d0eb87
 SHA512 (moneyguru-src-2.11.0.tar.gz) = fae1c8140ed36f3bd33a7533938ba59bffeda898932c005c5a5e115d6108dc43a6f53cc65608340fd5501945b13604d136b8ac083d2daa3876bdc070d619c022
 Size (moneyguru-src-2.11.0.tar.gz) = 2658749 bytes
+SHA1 (patch-Makefile) = 1dced1ca961e74e5adcb2f7013dee04efd78d44e
+SHA1 (patch-build.py) = e7084efd4ba8543c4fd5f93cddde7a840bf19d27
diff --git a/finance/moneyguru/patches/patch-Makefile b/finance/moneyguru/patches/patch-Makefile
new file mode 100644
index 00000000000..ca8f64f46ed
--- /dev/null
+++ b/finance/moneyguru/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/26 12:55:01 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- Makefile.orig	2017-08-23 23:26:50.000000000 +0000
++++ Makefile
+@@ -71,7 +71,7 @@ endif
+ 	$(VENV_PYTHON) build.py --doc
+ 
+ qt/mg_rc.py : qt/mg.qrc
+-	pyrcc5 qt/mg.qrc > qt/mg_rc.py
++	pyrcc5-${PYVERSSUFFIX} qt/mg.qrc > qt/mg_rc.py
+ 
+ i18n: $(mofiles)
+ 
diff --git a/finance/moneyguru/patches/patch-build.py b/finance/moneyguru/patches/patch-build.py
new file mode 100644
index 00000000000..fdd64d13a8d
--- /dev/null
+++ b/finance/moneyguru/patches/patch-build.py
@@ -0,0 +1,19 @@
+$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:01 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- build.py.orig	2017-08-23 23:26:50.000000000 +0000
++++ build.py
+@@ -81,9 +81,10 @@ def clean():
+ def build_qt(dev):
+     qrc_path = op.join('qt', 'mg.qrc')
+     pyrc_path = op.join('qt', 'mg_rc.py')
+-    ret = print_and_do("pyrcc5 {} > {}".format(qrc_path, pyrc_path))
++    pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
++    ret = print_and_do(pyrcc5 +" {} > {}".format(qrc_path, pyrc_path))
+     if ret != 0:
+-        raise RuntimeError("pyrcc5 call failed with code {}. Aborting build".format(ret))
++        raise RuntimeError(pyrcc5 + " call failed with code {}. Aborting build".format(ret))
+     build_help()
+ 
+ def build_help():