Received: by mail.netbsd.org (Postfix, from userid 605) id 17D6F84FE3; Fri, 2 Dec 2022 16:01:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED05A84ECC for ; Fri, 2 Dec 2022 16:01:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id IoD9639Ow_B0 for ; Fri, 2 Dec 2022 16:01:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6882684CBC for ; Fri, 2 Dec 2022 16:01:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 61921FA90; Fri, 2 Dec 2022 16:01:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669996880131250" MIME-Version: 1.0 Date: Fri, 2 Dec 2022 16:01:20 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/misc/calibre To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221202160120.61921FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669996880131250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Dec 2 16:01:20 UTC 2022 Modified Files: pkgsrc/misc/calibre: Makefile Log Message: calibre: some cleanups DEPEND on py-qt5, stop using versioned_dependencies. To generate a diff of this commit: cvs rdiff -u -r1.273 -r1.274 pkgsrc/misc/calibre/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669996880131250 Content-Disposition: inline Content-Length: 2157 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/calibre/Makefile diff -u pkgsrc/misc/calibre/Makefile:1.273 pkgsrc/misc/calibre/Makefile:1.274 --- pkgsrc/misc/calibre/Makefile:1.273 Sun Nov 27 23:08:07 2022 +++ pkgsrc/misc/calibre/Makefile Fri Dec 2 16:01:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.273 2022/11/27 23:08:07 wiz Exp $ +# $NetBSD: Makefile,v 1.274 2022/12/02 16:01:20 wiz Exp $ DISTNAME= calibre-5.44.0 PKGREVISION= 1 @@ -23,12 +23,14 @@ DEPENDS+= ${PYPKGPREFIX}-feedparser>=6.0 DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser DEPENDS+= ${PYPKGPREFIX}-jeepney>=0.6.0:../../sysutils/py-jeepney +DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments +DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 DEPENDS+= ${PYPKGPREFIX}-qt5-webengine-[0-9]*:../../x11/py-qt5-webengine DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex DEPENDS+= ${PYPKGPREFIX}-sip5>=5.5<6:../../x11/py-sip5 @@ -44,9 +46,7 @@ BUILD_DEPENDS+= xdg-utils>=1.0.2:../../m EXTRACT_USING= bsdtar PYTHON_VERSIONS_INCOMPATIBLE= 27 # as of 5.x -PYTHON_VERSIONS_INCOMPATIBLE+= 310 # as of 5.40.0 -PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip via py-qt5-webengine -PYTHON_VERSIONED_DEPENDENCIES+= markdown +PYTHON_VERSIONS_INCOMPATIBLE+= 310 311 # as of 5.40.0 USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -159,6 +159,4 @@ BUILDLINK_API_DEPENDS.poppler+= poppler> .include "../../databases/shared-mime-info/mimedb.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtwebengine/buildlink3.mk" -.include "../../x11/py-qt5/buildlink3.mk" -.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1669996880131250--