CVS commit: pkgsrc/devel/py-pexpect

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov 26 14:45:28 UTC 2023

Modified Files:
        pkgsrc/devel/py-pexpect: Makefile PLIST

Log Message:
py-pexpect: revert wheelification for now


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-pexpect/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-pexpect/PLIST

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

Modified files:

Index: pkgsrc/devel/py-pexpect/Makefile
diff -u pkgsrc/devel/py-pexpect/Makefile:1.33 pkgsrc/devel/py-pexpect/Makefile:1.34
--- pkgsrc/devel/py-pexpect/Makefile:1.33       Sun Nov 26 12:30:46 2023
+++ pkgsrc/devel/py-pexpect/Makefile    Sun Nov 26 14:45:28 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2023/11/26 12:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2023/11/26 14:45:28 wiz Exp $
 
 DISTNAME=      pexpect-4.9.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/pexpect/}
 
@@ -11,14 +10,11 @@ HOMEPAGE=   https://pexpect.readthedocs.io
 COMMENT=       Pure Python Expect-like module
 LICENSE=       mit
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-ptyprocess>=0.5:../../sysutils/py-ptyprocess
 
 USE_LANGUAGES= # none
 
 USE_TOOLS+=    bash:test
-PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/wheel.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pexpect/PLIST
diff -u pkgsrc/devel/py-pexpect/PLIST:1.13 pkgsrc/devel/py-pexpect/PLIST:1.14
--- pkgsrc/devel/py-pexpect/PLIST:1.13  Sun Nov 26 12:30:46 2023
+++ pkgsrc/devel/py-pexpect/PLIST       Sun Nov 26 14:45:28 2023
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2023/11/26 12:30:46 wiz Exp $
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.14 2023/11/26 14:45:28 wiz Exp $
+${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}
+${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
@@ -17,11 +18,11 @@ ${PYSITELIB}/pexpect/_async.py
 ${PYSITELIB}/pexpect/_async.pyc
 ${PYSITELIB}/pexpect/_async.pyo
 ${PYSITELIB}/pexpect/_async_pre_await.py
-${PYSITELIB}/pexpect/_async_pre_await.pyc
-${PYSITELIB}/pexpect/_async_pre_await.pyo
+${PLIST.py3x}${PYSITELIB}/pexpect/_async_pre_await.pyc
+${PLIST.py3x}${PYSITELIB}/pexpect/_async_pre_await.pyo
 ${PYSITELIB}/pexpect/_async_w_await.py
-${PYSITELIB}/pexpect/_async_w_await.pyc
-${PYSITELIB}/pexpect/_async_w_await.pyo
+${PLIST.py3x}${PYSITELIB}/pexpect/_async_w_await.pyc
+${PLIST.py3x}${PYSITELIB}/pexpect/_async_w_await.pyo
 ${PYSITELIB}/pexpect/bashrc.sh
 ${PYSITELIB}/pexpect/exceptions.py
 ${PYSITELIB}/pexpect/exceptions.pyc
@@ -51,8 +52,8 @@ ${PYSITELIB}/pexpect/screen.py
 ${PYSITELIB}/pexpect/screen.pyc
 ${PYSITELIB}/pexpect/screen.pyo
 ${PYSITELIB}/pexpect/socket_pexpect.py
-${PYSITELIB}/pexpect/socket_pexpect.pyc
-${PYSITELIB}/pexpect/socket_pexpect.pyo
+${PLIST.py3x}${PYSITELIB}/pexpect/socket_pexpect.pyc
+${PLIST.py3x}${PYSITELIB}/pexpect/socket_pexpect.pyo
 ${PYSITELIB}/pexpect/spawnbase.py
 ${PYSITELIB}/pexpect/spawnbase.pyc
 ${PYSITELIB}/pexpect/spawnbase.pyo