diff --git a/lang/myhdl/Makefile b/lang/myhdl/Makefile
index 5245425deac..b5f447ab302 100644
--- a/lang/myhdl/Makefile
+++ b/lang/myhdl/Makefile
@@ -3,18 +3,18 @@ COMMENT=	Python as a hardware description and verification language
 MODPY_EGG_VERSION=0.11
 DISTNAME=	myhdl-${MODPY_EGG_VERSION}
 CATEGORIES=	lang
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://www.myhdl.org/
 
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
-MODPY_PI =		Yes
+MODULES =	lang/python
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
 
-MODPY_SETUPTOOLS =	Yes
-TEST_DEPENDS =		devel/py-test${MODPY_FLAVOR}
+MODPY_TEST_DIR =	${WRKSRC}/myhdl/test/core
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/myhdl/test/core/test_Cosimulation.py \
@@ -25,9 +25,4 @@ post-install:
 	cd ${WRKSRC}/example/ && umask 022 && pax -rw . \
 		${PREFIX}/share/examples/myhdl/
 
-do-test: fake
-	cd ${WRKSRC}/myhdl/test/core && \
-		env PYTHONPATH="${WRKINST}${MODPY_LIBDIR}/site-packages/" \
-			${MAKE_PROGRAM}
-
 .include <bsd.port.mk>
diff --git a/lang/myhdl/pkg/PLIST b/lang/myhdl/pkg/PLIST
index 0248632b317..8303f7633c2 100644
--- a/lang/myhdl/pkg/PLIST
+++ b/lang/myhdl/pkg/PLIST
@@ -1,9 +1,10 @@
 lib/python${MODPY_VERSION}/site-packages/myhdl/
-lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/myhdl-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/myhdl/_Cosimulation.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/_ShadowSignal.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/_Signal.py
@@ -11,35 +12,65 @@ lib/python${MODPY_VERSION}/site-packages/myhdl/_Simulation.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/_Waiter.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Cosimulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Cosimulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_ShadowSignal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_ShadowSignal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Signal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Signal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Simulation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Simulation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Waiter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_Waiter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always_comb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always_comb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always_seq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_always_seq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_bin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_bin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_block.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_block.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_concat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_concat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_delay.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_delay.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_extractHierarchy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_extractHierarchy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_getHierarchy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_getHierarchy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_getcellvars.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_getcellvars.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_instance.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_instance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_intbv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_intbv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_join.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_join.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_modbv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_modbv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_resolverefs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_resolverefs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_simulator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_simulator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_traceSignals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_traceSignals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_tristate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_tristate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_visitors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}_visitors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/myhdl/_always.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/_always_comb.py
@@ -68,13 +99,21 @@ lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/_VHDLNameValidation.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_VHDLNameValidation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_VHDLNameValidation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_analyze.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_analyze.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVHDL.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVHDL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVHDLPackage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVHDLPackage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVerilog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_toVerilog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_verify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/${MODPY_PYCACHE}_verify.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/_analyze.py
 lib/python${MODPY_VERSION}/site-packages/myhdl/conversion/_misc.py
diff --git a/lang/pcbasic/Makefile b/lang/pcbasic/Makefile
index cffdaa8e034..0dc104a43a9 100644
--- a/lang/pcbasic/Makefile
+++ b/lang/pcbasic/Makefile
@@ -5,7 +5,7 @@ GH_ACCOUNT =		robhagemans
 GH_PROJECT =		pcbasic
 GH_TAGNAME =		v${MODPY_EGG_VERSION}
 DISTNAME =		pcbasic-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =	lang
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =	devel/py-parallel${MODPY_FLAVOR} \
 		devel/py-serial${MODPY_FLAVOR} \
diff --git a/lang/pcbasic/pkg/PLIST b/lang/pcbasic/pkg/PLIST
index 55a2d8684cf..5b59f546387 100644
--- a/lang/pcbasic/pkg/PLIST
+++ b/lang/pcbasic/pkg/PLIST
@@ -1,53 +1,85 @@
 bin/pcbasic
 lib/python${MODPY_VERSION}/site-packages/pcbasic/
-lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-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-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/LICENSE.md
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pcbasic-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pcbasic/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/__main__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/base/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/base/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/codestream.py
@@ -62,9 +94,13 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/codepage.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/converter/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/protect.py
@@ -73,14 +109,23 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/debug.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/devicebase.py
@@ -93,14 +138,23 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/devices/ports.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/display/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/font.py
@@ -118,8 +172,11 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/implementation.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/inputs/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/keyboard.py
@@ -129,9 +186,13 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/machine.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/memory/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/memory.py
@@ -140,10 +201,15 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/mlparser.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/parser/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/operators.py
@@ -154,10 +220,15 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/sound.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/randomiser.py
@@ -166,14 +237,23 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/basic/values/values.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/compat/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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/posix.py
@@ -187,9 +267,13 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/config.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/data/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/data/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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
@@ -285,23 +369,41 @@ lib/python${MODPY_VERSION}/site-packages/pcbasic/guard.py
 lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/
 lib/python${MODPY_VERSION}/site-packages/pcbasic/interface/__init__.py
 ${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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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}${MODPY_PYOEXTENSION}
 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_beep.py
diff --git a/lang/secularize/Makefile b/lang/secularize/Makefile
index b247412823b..464f335c908 100644
--- a/lang/secularize/Makefile
+++ b/lang/secularize/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.0.1.post7
 DISTNAME =	secularize-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:S/post//}
 EPOCH =		0
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	lang
 
@@ -19,9 +19,11 @@ MODULES =		lang/python
 
 MODPY_PI =		Yes
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =		setuptools
+NO_TEST =		Yes
 
-TEST_DEPENDS =		devel/py-docopt${MODPY_FLAVOR}
+RUN_DEPENDS =		devel/py-cparser${MODPY_FLAVOR} \
+			devel/py-docopt${MODPY_FLAVOR}
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/secularize/utils.py
diff --git a/lang/secularize/pkg/PLIST b/lang/secularize/pkg/PLIST
index 1d9c7464f08..a42cab700a4 100644
--- a/lang/secularize/pkg/PLIST
+++ b/lang/secularize/pkg/PLIST
@@ -1,18 +1,23 @@
 bin/secularize
 lib/python${MODPY_VERSION}/site-packages/secularize/
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/secularize-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/secularize/__init__.py
-lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}char.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}char.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secularize/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/secularize/char.py
 lib/python${MODPY_VERSION}/site-packages/secularize/parser.py