On Sun, Oct 11, 2020 at 12:38:08AM -0400, Daniel Dickman wrote: > pcbasic uses numpy and numpy has gone python3 only.
> in order to update numpy we need consumers like pcbasic to move to > python3. > diff below updates pcbasic to v2.0.2 which is advertized to support > python3. > ok? > (p.s. I note that pcbasic 2.0.3 does away with the numpy dependency, so > another choice could be to do an update to the newer version if you > wanted). I'd just say go to 2.0.3 now. Is there a reason not to? The only other thing I'd recommend is switching it to MODPY_PI=Yes so you don't need the whole GH_* dance. --Kurt > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/pcbasic/Makefile,v > retrieving revision 1.4 > diff -u -p -u -r1.4 Makefile > --- Makefile 12 Jul 2019 20:47:21 -0000 1.4 > +++ Makefile 11 Oct 2020 04:25:45 -0000 > @@ -1,8 +1,13 @@ > # $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:21 sthen Exp $ > > -MODPY_EGG_VERSION = 2.0.1 > COMMENT = free, cross-platform emulator for GW-BASIC family (PC-BASIC) > -DISTNAME = pcbasic-${MODPY_EGG_VERSION} > + > +MODPY_EGG_VERSION = 2.0.2 > +GH_ACCOUNT = robhagemans > +GH_PROJECT = pcbasic > +GH_TAGNAME = v${MODPY_EGG_VERSION} > +DISTNAME = pcbasic-${MODPY_EGG_VERSION} > + > CATEGORIES = lang > > HOMEPAGE = http://www.pc-basic.org/ > @@ -11,24 +16,13 @@ MAINTAINER = Brian Callahan <bcallah@ope > # GPLv3+ > PERMIT_PACKAGE = Yes > > -MASTER_SITES = > https://github.com/robhagemans/pcbasic/releases/download/v${MODPY_EGG_VERSION}/ > - > MODULES = lang/python > +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} > MODPY_SETUPTOOLS = Yes > > -RUN_DEPENDS = devel/py-parallel \ > - devel/py-serial \ > +RUN_DEPENDS = devel/py-parallel${MODPY_FLAVOR} \ > + devel/py-serial${MODPY_FLAVOR} \ > devel/sdl2-gfx \ > - math/py-numpy > - > -post-extract: > - @gunzip -o ${WRKSRC}/doc/pcbasic.1 \ > - ${WRKSRC}/doc/pcbasic.1.gz > - > -post-install: > - ${INSTALL_MAN} ${WRKSRC}/doc/pcbasic.1 ${PREFIX}/man/man1 > - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pcbasic > - ${INSTALL_DATA} ${WRKSRC}/doc/PC-BASIC_documentation.{html,pdf} \ > - ${PREFIX}/share/doc/pcbasic > + math/py-numpy${MODPY_FLAVOR} > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/pcbasic/distinfo,v > retrieving revision 1.2 > diff -u -p -u -r1.2 distinfo > --- distinfo 11 Dec 2018 20:56:11 -0000 1.2 > +++ distinfo 11 Oct 2020 04:25:45 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (pcbasic-2.0.1.tar.gz) = PqAn+PsYBH5UN28bap4tc01wfq/zLx4L98OJC8dolBs= > -SIZE (pcbasic-2.0.1.tar.gz) = 3690546 > +SHA256 (pcbasic-2.0.2.tar.gz) = E0TCQk0AiI7/JaoZ7kDqDT7QHNFksSn7XZKL9WYp5yg= > +SIZE (pcbasic-2.0.2.tar.gz) = 3846170 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/lang/pcbasic/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -u -r1.2 PLIST > --- pkg/PLIST 11 Dec 2018 20:56:11 -0000 1.2 > +++ pkg/PLIST 11 Oct 2020 04:25:45 -0000 > @@ -9,168 +9,189 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt > > lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/pcbasic/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/__main__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/__main__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}guard.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}basicevents.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}clock.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}codepage.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}dos.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}editor.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}eventcycle.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}implementation.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}iostreams.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}machine.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}mlparser.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}program.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/${MODPY_PYCACHE}sound.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/api.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/api.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}bytestream.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}codestream.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}eascii.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}scancode.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/bytestream.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/bytestream.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/codestream.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/codestream.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/eascii.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/eascii.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/error.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/error.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/scancode.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/scancode.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/signals.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/signals.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/tokens.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/tokens.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/basicevents.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/basicevents.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/clock.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/clock.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/codepage.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/codepage.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/${MODPY_PYCACHE}lister.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/${MODPY_PYCACHE}protect.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/${MODPY_PYCACHE}tokeniser.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/lister.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/lister.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/protect.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/protect.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/tokeniser.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/tokeniser.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/debug.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/debug.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}cassette.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}devicebase.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}disk.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}diskfiles.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}parports.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/${MODPY_PYCACHE}ports.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/cassette.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/cassette.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/devicebase.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/devicebase.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/disk.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/disk.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/diskfiles.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/diskfiles.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/files.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/files.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/formatter.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/formatter.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/parports.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/parports.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/ports.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/ports.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}display.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}font.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}graphics.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}modes.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}pixels.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}textbase.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/${MODPY_PYCACHE}textscreen.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/display.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/display.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/font.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/font.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/graphics.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/graphics.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/modes.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/modes.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/pixels.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/pixels.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/text.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/text.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/textbase.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/textbase.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/textscreen.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/textscreen.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/dos.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/dos.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/editor.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/editor.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/eventcycle.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/eventcycle.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/extensions.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/extensions.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/implementation.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/implementation.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/${MODPY_PYCACHE}inputmethods.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/${MODPY_PYCACHE}keyboard.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/inputmethods.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/inputmethods.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/keyboard.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/keyboard.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/interpreter.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/interpreter.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/iostreams.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/iostreams.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/machine.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/machine.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/${MODPY_PYCACHE}arrays.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/${MODPY_PYCACHE}memory.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/${MODPY_PYCACHE}scalars.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/arrays.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/arrays.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/memory.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/memory.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/scalars.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/scalars.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/mlparser.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/mlparser.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}expressions.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}statements.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/${MODPY_PYCACHE}userfunctions.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/expressions.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/expressions.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/operators.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/operators.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/statements.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/statements.pyc > > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/userfunctions.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/userfunctions.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/program.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/program.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/sound.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/sound.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}numbers.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}randomiser.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}strings.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/${MODPY_PYCACHE}values.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/numbers.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/numbers.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/randomiser.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/randomiser.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/strings.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/strings.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/values.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/values.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}posix_console.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}python2.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}python3.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}win32_console.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/${MODPY_PYCACHE}win32_subprocess.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/base.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/base.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/posix.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/posix.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/posix_console.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/posix_console.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/python2.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/python2.pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/python3.py > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32.pyc > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32_console.c > +lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32_console.py > lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32_subprocess.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/win32_subprocess.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/config.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/config.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/ > -lib/python${MODPY_VERSION}/site-packages/pcbasic/data/USAGE.txt > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/data/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/data/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/data/${MODPY_PYCACHE}loadhex.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/data/${MODPY_PYCACHE}loaducp.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/data/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/codepages/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/codepages/1258.ucp > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/codepages/437.ucp > @@ -250,9 +271,7 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/fonts/vga_14.hex > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/fonts/vga_16.hex > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/loadhex.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/data/loadhex.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/loaducp.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/data/loaducp.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/COLOURS.BAS > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/FONTSCAN.BAS > @@ -261,58 +280,54 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/SHOWDBCS.BAS > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/SHOWFONT.BAS > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/programs/SPEED.BAS > +lib/python${MODPY_VERSION}/site-packages/pcbasic/data/release.json > lib/python${MODPY_VERSION}/site-packages/pcbasic/data/resources.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/data/resources.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/guard.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/guard.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/ > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/__init__.pyc > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/ansi.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/ansi.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}audio.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}audio_beep.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}audio_portaudio.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}audio_pygame.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}audio_sdl2.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}clipboard.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}sdl2.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}synthesiser.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video_ansi.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video_cli.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video_curses.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video_pygame.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}video_sdl2.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/${MODPY_PYCACHE}window.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_beep.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_beep.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_portaudio.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_portaudio.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_pygame.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_pygame.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_sdl2.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/audio_sdl2.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/base.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/base.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/clipboard.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/clipboard.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/interface.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/interface.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/sdl2.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/sdl2.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/synthesiser.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/synthesiser.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_ansi.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_ansi.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_cli.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_cli.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_curses.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_curses.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_pygame.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_pygame.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_sdl2.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/video_sdl2.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/window.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/window.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/ > -lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/README.md > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/darwin/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/darwin/.keep > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/win32_x64/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/win32_x64/.keep > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/win32_x86/ > +lib/python${MODPY_VERSION}/site-packages/pcbasic/lib/win32_x86/.keep > lib/python${MODPY_VERSION}/site-packages/pcbasic/main.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/main.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/metadata.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/metadata.pyc > lib/python${MODPY_VERSION}/site-packages/pcbasic/state.py > -lib/python${MODPY_VERSION}/site-packages/pcbasic/state.pyc > -@man man/man1/pcbasic.1 > -share/doc/pcbasic/ > -share/doc/pcbasic/PC-BASIC_documentation.html > -share/doc/pcbasic/PC-BASIC_documentation.pdf >