diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile
index 87b108d21033..0e0ce99de065 100644
--- a/graphics/piddle/Makefile
+++ b/graphics/piddle/Makefile
@@ -14,13 +14,11 @@ DISTFILES=	${DISTNAME}-5.tgz
 
 MAINTAINER=	dom@myrddin.demon.co.uk
 
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON=	yes
+WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_BUILD=	yes
 
-PYTHON?=	${LOCALBASE}/bin/python
-PYTHONLIBDIR?=	${LOCALBASE}/lib/python1.5
-PIDDLEDIR=	${PYTHONLIBDIR}/site-packages/piddle
+PIDDLEDIR=	${PYTHON_SITELIBDIR}/piddle
 PIDDLEDOCDIR=	${PREFIX}/share/doc/piddle
 PIDDLEEGDIR=	${PREFIX}/share/examples/piddle
 
@@ -38,8 +36,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pilfonts/*.pbm ${PIDDLEDIR}/pilfonts
 	${INSTALL_DATA} ${WRKSRC}/pilfonts/metrics.dat ${PIDDLEDIR}/pilfonts
 	${ECHO} 'piddle' > ${PIDDLEDIR}.pth
-	@${PYTHON} ${PYTHONLIBDIR}/compileall.py ${PIDDLEDIR}
-	@${PYTHON} -O ${PYTHONLIBDIR}/compileall.py ${PIDDLEDIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PIDDLEDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PIDDLEDIR}
 	${MKDIR} ${PIDDLEDOCDIR}
 	(cd ${WRKSRC}/docs ; tar cf - *) | \
 		(cd ${PIDDLEDOCDIR} ; tar xf -)
diff --git a/graphics/piddle/pkg-plist b/graphics/piddle/pkg-plist
index 6f557542e071..8300674d9cd8 100644
--- a/graphics/piddle/pkg-plist
+++ b/graphics/piddle/pkg-plist
@@ -1,155 +1,155 @@
-lib/python1.5/site-packages/piddle.pth
-lib/python1.5/site-packages/piddle/PixMapWrapper.py
-lib/python1.5/site-packages/piddle/PixMapWrapper.pyc
-lib/python1.5/site-packages/piddle/PixMapWrapper.pyo
-lib/python1.5/site-packages/piddle/aigen.py
-lib/python1.5/site-packages/piddle/aigen.pyc
-lib/python1.5/site-packages/piddle/aigen.pyo
-lib/python1.5/site-packages/piddle/discipline.py
-lib/python1.5/site-packages/piddle/discipline.pyc
-lib/python1.5/site-packages/piddle/discipline.pyo
-lib/python1.5/site-packages/piddle/pagesizes.py
-lib/python1.5/site-packages/piddle/pagesizes.pyc
-lib/python1.5/site-packages/piddle/pagesizes.pyo
-lib/python1.5/site-packages/piddle/pdfdoc.py
-lib/python1.5/site-packages/piddle/pdfdoc.pyc
-lib/python1.5/site-packages/piddle/pdfdoc.pyo
-lib/python1.5/site-packages/piddle/pdfgen.py
-lib/python1.5/site-packages/piddle/pdfgen.pyc
-lib/python1.5/site-packages/piddle/pdfgen.pyo
-lib/python1.5/site-packages/piddle/pdfgeom.py
-lib/python1.5/site-packages/piddle/pdfgeom.pyc
-lib/python1.5/site-packages/piddle/pdfgeom.pyo
-lib/python1.5/site-packages/piddle/pdfmetrics.py
-lib/python1.5/site-packages/piddle/pdfmetrics.pyc
-lib/python1.5/site-packages/piddle/pdfmetrics.pyo
-lib/python1.5/site-packages/piddle/pdfutils.py
-lib/python1.5/site-packages/piddle/pdfutils.pyc
-lib/python1.5/site-packages/piddle/pdfutils.pyo
-lib/python1.5/site-packages/piddle/piddle.py
-lib/python1.5/site-packages/piddle/piddle.pyc
-lib/python1.5/site-packages/piddle/piddle.pyo
-lib/python1.5/site-packages/piddle/piddleAI.py
-lib/python1.5/site-packages/piddle/piddleAI.pyc
-lib/python1.5/site-packages/piddle/piddleAI.pyo
-lib/python1.5/site-packages/piddle/piddleGL.py
-lib/python1.5/site-packages/piddle/piddleGL.pyc
-lib/python1.5/site-packages/piddle/piddleGL.pyo
-lib/python1.5/site-packages/piddle/piddlePDF.py
-lib/python1.5/site-packages/piddle/piddlePDF.pyc
-lib/python1.5/site-packages/piddle/piddlePDF.pyo
-lib/python1.5/site-packages/piddle/piddlePIL.py
-lib/python1.5/site-packages/piddle/piddlePIL.pyc
-lib/python1.5/site-packages/piddle/piddlePIL.pyo
-lib/python1.5/site-packages/piddle/piddlePS.py
-lib/python1.5/site-packages/piddle/piddlePS.pyc
-lib/python1.5/site-packages/piddle/piddlePS.pyo
-lib/python1.5/site-packages/piddle/piddleQD.py
-lib/python1.5/site-packages/piddle/piddleQD.pyc
-lib/python1.5/site-packages/piddle/piddleQD.pyo
-lib/python1.5/site-packages/piddle/piddleTK.py
-lib/python1.5/site-packages/piddle/piddleTK.pyc
-lib/python1.5/site-packages/piddle/piddleTK.pyo
-lib/python1.5/site-packages/piddle/piddleVCR.py
-lib/python1.5/site-packages/piddle/piddleVCR.pyc
-lib/python1.5/site-packages/piddle/piddleVCR.pyo
-lib/python1.5/site-packages/piddle/piddleWX.py
-lib/python1.5/site-packages/piddle/piddleWX.pyc
-lib/python1.5/site-packages/piddle/piddleWX.pyo
-lib/python1.5/site-packages/piddle/piddleWxDc.py
-lib/python1.5/site-packages/piddle/piddleWxDc.pyc
-lib/python1.5/site-packages/piddle/piddleWxDc.pyo
-lib/python1.5/site-packages/piddle/piddletest.py
-lib/python1.5/site-packages/piddle/piddletest.pyc
-lib/python1.5/site-packages/piddle/piddletest.pyo
-lib/python1.5/site-packages/piddle/pilfonts/courier-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/courier-bold-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/helvetica-bold-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/metrics.dat
-lib/python1.5/site-packages/piddle/pilfonts/symbol-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/symbol-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/symbol-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/symbol-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/symbol-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/symbol-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/symbol-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-8.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-10.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-10.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-12.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-12.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-14.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-14.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-18.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-18.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-24.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-24.pil
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-8.pbm
-lib/python1.5/site-packages/piddle/pilfonts/times-bold-8.pil
-lib/python1.5/site-packages/piddle/stringformat.py
-lib/python1.5/site-packages/piddle/stringformat.pyc
-lib/python1.5/site-packages/piddle/stringformat.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle.pth
+lib/%%PYTHON_VERSION%%/site-packages/piddle/PixMapWrapper.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/PixMapWrapper.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/PixMapWrapper.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/aigen.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/aigen.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/aigen.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/discipline.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/discipline.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/discipline.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pagesizes.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pagesizes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pagesizes.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfdoc.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfdoc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfdoc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgen.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgen.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgen.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgeom.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgeom.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfgeom.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfmetrics.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfmetrics.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfmetrics.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfutils.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pdfutils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddle.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddle.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddle.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleAI.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleAI.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleAI.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGL.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGL.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGL.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePDF.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePDF.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePDF.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePIL.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePIL.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePIL.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePS.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePS.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePS.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleQD.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleQD.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleQD.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleVCR.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleVCR.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleVCR.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWX.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWX.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWX.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWxDc.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWxDc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleWxDc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddletest.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddletest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/piddletest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/metrics.dat
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-10.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-10.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-12.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-12.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-14.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-14.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-18.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-18.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-24.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-24.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-8.pbm
+lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-8.pil
+lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.py
+lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.pyo
 share/doc/piddle/README
 share/doc/piddle/index.html
 share/doc/piddle/notesAI/PiddifyAI/Icon_
@@ -204,8 +204,8 @@ share/examples/piddle/piddleWxDcDemo.py
 share/examples/piddle/textClasses.py
 share/examples/piddle/using-piddleTK.py
 share/examples/piddle/using-piddleWX.py
-@dirrm lib/python1.5/site-packages/piddle/pilfonts
-@dirrm lib/python1.5/site-packages/piddle
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle
 @dirrm share/doc/piddle/notesAI/PiddifyAI
 @dirrm share/doc/piddle/notesAI
 @dirrm share/doc/piddle/notesPDF