Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 4CF8A1A923C for ; Sat, 1 Jan 2022 17:43:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8CD1284D59; Sat, 1 Jan 2022 17:43:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C870784D15 for ; Sat, 1 Jan 2022 17:43:42 +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 iQRHQnUmuvq1 for ; Sat, 1 Jan 2022 17:43:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4AB7284CFC for ; Sat, 1 Jan 2022 17:43:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 425C3FAEC; Sat, 1 Jan 2022 17:43:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641059022115410" MIME-Version: 1.0 Date: Sat, 1 Jan 2022 17:43:42 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/py-pexpect To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220101174342.425C3FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641059022115410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 1 17:43:42 UTC 2022 Modified Files: pkgsrc/devel/py-pexpect: Makefile PLIST Log Message: py-pexpect: fix for python 2.7 To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-pexpect/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-pexpect/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641059022115410 Content-Disposition: inline Content-Length: 1721 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-pexpect/Makefile diff -u pkgsrc/devel/py-pexpect/Makefile:1.27 pkgsrc/devel/py-pexpect/Makefile:1.28 --- pkgsrc/devel/py-pexpect/Makefile:1.27 Sat Jan 1 12:40:32 2022 +++ pkgsrc/devel/py-pexpect/Makefile Sat Jan 1 17:43:42 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/01/01 12:40:32 martin Exp $ +# $NetBSD: Makefile,v 1.28 2022/01/01 17:43:42 wiz Exp $ DISTNAME= pexpect-4.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,4 +16,9 @@ DEPENDS+= ${PYPKGPREFIX}-ptyprocess>=0.5 USE_LANGUAGES= # none .include "../../lang/python/egg.mk" + +.if ${PYPKGPREFIX} == "py27" +_PYSETUPTOOLSINSTALLARGS:= ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed} +.endif + .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-pexpect/PLIST diff -u pkgsrc/devel/py-pexpect/PLIST:1.9 pkgsrc/devel/py-pexpect/PLIST:1.10 --- pkgsrc/devel/py-pexpect/PLIST:1.9 Sat Jan 1 12:40:32 2022 +++ pkgsrc/devel/py-pexpect/PLIST Sat Jan 1 17:43:42 2022 @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.9 2022/01/01 12:40:32 martin Exp $ -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/requires.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt +@comment $NetBSD: PLIST,v 1.10 2022/01/01 17:43:42 wiz Exp $ +${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/requires.txt +${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/pexpect/ANSI.py ${PYSITELIB}/pexpect/ANSI.pyc ${PYSITELIB}/pexpect/ANSI.pyo --_----------=_1641059022115410--