Received: by mail.netbsd.org (Postfix, from userid 605) id 0BBFD84D41; Mon, 5 Sep 2022 07:38:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 44FCB84D27 for ; Mon, 5 Sep 2022 07:38:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id oDn7AhucN4Nv for ; Mon, 5 Sep 2022 07:38:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 96FDE84C71 for ; Mon, 5 Sep 2022 07:38:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 90483FA90; Mon, 5 Sep 2022 07:38:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166236352112860" MIME-Version: 1.0 Date: Mon, 5 Sep 2022 07:38:41 +0000 From: "Martin Husemann" Subject: CVS commit: pkgsrc/textproc/py-pygments To: pkgsrc-changes@NetBSD.org Reply-To: martin@netbsd.org X-Mailer: log_accum Message-Id: <20220905073841.90483FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166236352112860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: martin Date: Mon Sep 5 07:38:41 UTC 2022 Modified Files: pkgsrc/textproc/py-pygments: Makefile Log Message: Revert previous - this seems to be only papering over a not yet discovered bug somewhere else that (sometimes) makes _PYTHON_VERSION non-numerical. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/textproc/py-pygments/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166236352112860 Content-Disposition: inline Content-Length: 987 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/py-pygments/Makefile diff -u pkgsrc/textproc/py-pygments/Makefile:1.42 pkgsrc/textproc/py-pygments/Makefile:1.43 --- pkgsrc/textproc/py-pygments/Makefile:1.42 Sun Sep 4 05:48:05 2022 +++ pkgsrc/textproc/py-pygments/Makefile Mon Sep 5 07:38:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2022/09/04 05:48:05 martin Exp $ +# $NetBSD: Makefile,v 1.43 2022/09/05 07:38:41 martin Exp $ DISTNAME= Pygments-2.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -18,11 +18,10 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 -# XXXX the < comparision does not work! -# .include "../../lang/python/pyversion.mk" -# .if ${_PYTHON_VERSION} < 38 -# DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata -# .endif +.include "../../lang/python/pyversion.mk" +.if ${_PYTHON_VERSION} < 38 +DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata +.endif USE_PKG_RESOURCES= yes --_----------=_166236352112860--