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

4 files changed, 39 insertions, 4 deletions

diff --git a/sysutils/dupeguru/Makefile b/sysutils/dupeguru/Makefile
index 4fd4cdf1b4a..d7adef5ef65 100644
--- a/sysutils/dupeguru/Makefile
+++ b/sysutils/dupeguru/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:44 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/26 12:55:00 rhialto Exp $
 
 DISTNAME=	dupeguru-src-4.0.3
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.hardcoded.net/
 
@@ -29,10 +29,12 @@ USE_TOOLS=		gmake pax
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 REPLACE_PYTHON+=		qt/run_template.py
 
+MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
 INSTALLATION_DIRS=	bin share/applications share/dupeguru
 
 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/sysutils/dupeguru/distinfo b/sysutils/dupeguru/distinfo
index 3bd7738a4c0..6bf196a7798 100644
--- a/sysutils/dupeguru/distinfo
+++ b/sysutils/dupeguru/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.2 2018/03/14 17:11:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/01/26 12:55:00 rhialto Exp $
 
 SHA1 (dupeguru-src-4.0.3.tar.gz) = a794780e187a36d45c384395e9bd8c2b8f5018bf
 RMD160 (dupeguru-src-4.0.3.tar.gz) = 5cd2b7f93276fcd8f09b699cfec5246f7dc5abed
 SHA512 (dupeguru-src-4.0.3.tar.gz) = dc8a5a122ad1d3d235825a498fb75b192566d3b5a33382ebb0002a361428af5cc453b143002ea3f57a9cb6ee30ce49f0b9f5a54bce2a90364fb1b92e102a289a
 Size (dupeguru-src-4.0.3.tar.gz) = 686580 bytes
+SHA1 (patch-Makefile) = 809ee7de40622a0e348df60b1251f2bed3c49b97
+SHA1 (patch-build.py) = 074a9adb4e48c07b637abe9183d49ece7d5520dc
 SHA1 (patch-hscommon_sphinxgen.py) = cd558d14733d394e7adf2b6b0c826dda5eed689f
 SHA1 (patch-qt_platform.py) = e97e226b53f57f8c4e9bf21f4726e024bb0b2d67
diff --git a/sysutils/dupeguru/patches/patch-Makefile b/sysutils/dupeguru/patches/patch-Makefile
new file mode 100644
index 00000000000..0bba5f9b17c
--- /dev/null
+++ b/sysutils/dupeguru/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/26 12:55:00 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- Makefile.orig	2016-11-25 01:04:31.000000000 +0000
++++ Makefile
+@@ -54,7 +54,7 @@ build/help : | env
+ 	./env/bin/python build.py --doc
+ 
+ qt/dg_rc.py : qt/dg.qrc
+-	pyrcc5 qt/dg.qrc > qt/dg_rc.py
++	pyrcc5-${PYVERSSUFFIX} qt/dg.qrc > qt/dg_rc.py
+ 
+ i18n: $(mofiles)
+ 
diff --git a/sysutils/dupeguru/patches/patch-build.py b/sysutils/dupeguru/patches/patch-build.py
new file mode 100644
index 00000000000..7b8b32eaf43
--- /dev/null
+++ b/sysutils/dupeguru/patches/patch-build.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-build.py,v 1.1 2020/01/26 12:55:00 rhialto Exp $
+
+pyrcc5 is python-version-specific.
+
+--- build.py.orig	2016-11-25 01:04:31.000000000 +0000
++++ build.py
+@@ -164,7 +164,8 @@ def build_qt(dev):
+     print("Building localizations")
+     build_localizations('qt')
+     print("Building Qt stuff")
+-    print_and_do("pyrcc5 {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
++    pyrcc5 = "pyrcc5-" + os.environ["PYVERSSUFFIX"]
++    print_and_do(pyrcc5 +" {0} > {1}".format(op.join('qt', 'dg.qrc'), op.join('qt', 'dg_rc.py')))
+     fix_qt_resource_file(op.join('qt', 'dg_rc.py'))
+     build_help()
+     print("Creating the run.py file")