Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714235588167790"
MIME-Version: 1.0
Date: Sat, 27 Apr 2024 16:33:08 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-tortoisehg
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240427163308.EF338FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714235588167790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Apr 27 16:33:08 UTC 2024

Modified Files:
	pkgsrc/devel/py-tortoisehg: Makefile

Log Message:
py-tortoisehg: switch to qt6.

With help from adam@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/py-tortoisehg/Makefile

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


--_----------=_1714235588167790
Content-Disposition: inline
Content-Length: 2229
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.98 pkgsrc/devel/py-tortoisehg/Makefile:1.99
--- pkgsrc/devel/py-tortoisehg/Makefile:1.98	Mon Feb 19 12:47:39 2024
+++ pkgsrc/devel/py-tortoisehg/Makefile	Sat Apr 27 16:33:08 2024
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.98 2024/02/19 12:47:39 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2024/04/27 16:33:08 wiz Exp $
 
-DISTNAME=		tortoisehg-6.6.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		devel python
-MASTER_SITES=		https://www.mercurial-scm.org/release/tortoisehg/targz/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://tortoisehg.bitbucket.io/
-COMMENT=		GUI for Mercurial
-LICENSE=		gnu-gpl-v2
+DISTNAME=	tortoisehg-6.6.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
+CATEGORIES=	devel python
+MASTER_SITES=	https://www.mercurial-scm.org/release/tortoisehg/targz/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://tortoisehg.bitbucket.io/
+COMMENT=	GUI for Mercurial
+LICENSE=	gnu-gpl-v2
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx>=7.0.0:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-DEPENDS+=	${PYPKGPREFIX}-qt5-qscintilla-[0-9]*:../../x11/py-qt5-qscintilla
-DEPENDS+=	${PYPKGPREFIX}-sip-qt5-[0-9]*:../../x11/py-sip-qt5
+DEPENDS+=	${PYPKGPREFIX}-qt6-qscintilla-[0-9]*:../../x11/py-qt6-qscintilla
+DEPENDS+=	${PYPKGPREFIX}-sip-qt6-[0-9]*:../../x11/py-sip-qt6
 
-USE_TOOLS+=		pax
+USE_TOOLS+=	pax
+MAKE_ENV+=	THG_QT_API=PyQt6
 
 REPLACE_PYTHON+=	thg
 
@@ -37,10 +39,10 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27 38
 
 pre-build:
 	${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
-	${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
+	${RM} -f ${WRKSRC}/doc/build/html/.buildinfo
 	# conflicts with mercurial
 	# https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4629
-	${RM} ${WRKSRC}/hgext3rd/__init__.py
+	${RM} -f ${WRKSRC}/hgext3rd/__init__.py
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${DESTDIR}${PREFIX}/share/applications/thg.desktop


--_----------=_1714235588167790--