8 files changed, 230 insertions, 232 deletions

diff --git a/graphics/piddle/pkg-plist b/graphics/piddle/pkg-plist
index c7b2d0ae47b5..98a8bd2ac3e1 100644
--- a/graphics/piddle/pkg-plist
+++ b/graphics/piddle/pkg-plist
@@ -1,188 +1,188 @@
-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/piddleFIG.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleFIG.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleFIG.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/piddleGTK/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/core.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/core.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/core.pyo
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/tests.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/tests.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK/tests.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/piddlePSmetrics.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePSmetrics.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddlePSmetrics.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/piddleSVG/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG/piddleSVG.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG/piddleSVG.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG/piddleSVG.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/piddleTK2/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2/piddleTK.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2/piddleTK.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2/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.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/courier-bold-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/helvetica-bold-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/metrics.dat
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/symbol-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-10.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-10.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-12.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-12.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-14.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-14.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-18.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-18.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-24.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-24.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-8.pil
-lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts/times-bold-8.png
-lib/%%PYTHON_VERSION%%/site-packages/piddle/polyfunc.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/polyfunc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/polyfunc.pyo
-lib/%%PYTHON_VERSION%%/site-packages/piddle/python.gif
-lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.py
-lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/piddle/stringformat.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle/pilfonts
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleTK2
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleSVG
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle/piddleGTK
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/piddle
+%%PYTHON_SITELIBDIR%%/piddle.pth
+%%PYTHON_SITELIBDIR%%/piddle/PixMapWrapper.py
+%%PYTHON_SITELIBDIR%%/piddle/PixMapWrapper.pyc
+%%PYTHON_SITELIBDIR%%/piddle/PixMapWrapper.pyo
+%%PYTHON_SITELIBDIR%%/piddle/aigen.py
+%%PYTHON_SITELIBDIR%%/piddle/aigen.pyc
+%%PYTHON_SITELIBDIR%%/piddle/aigen.pyo
+%%PYTHON_SITELIBDIR%%/piddle/discipline.py
+%%PYTHON_SITELIBDIR%%/piddle/discipline.pyc
+%%PYTHON_SITELIBDIR%%/piddle/discipline.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pagesizes.py
+%%PYTHON_SITELIBDIR%%/piddle/pagesizes.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pagesizes.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pdfdoc.py
+%%PYTHON_SITELIBDIR%%/piddle/pdfdoc.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pdfdoc.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pdfgen.py
+%%PYTHON_SITELIBDIR%%/piddle/pdfgen.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pdfgen.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pdfgeom.py
+%%PYTHON_SITELIBDIR%%/piddle/pdfgeom.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pdfgeom.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pdfmetrics.py
+%%PYTHON_SITELIBDIR%%/piddle/pdfmetrics.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pdfmetrics.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pdfutils.py
+%%PYTHON_SITELIBDIR%%/piddle/pdfutils.pyc
+%%PYTHON_SITELIBDIR%%/piddle/pdfutils.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddle.py
+%%PYTHON_SITELIBDIR%%/piddle/piddle.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddle.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleAI.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleAI.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleAI.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleFIG.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleFIG.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleFIG.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleGL.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleGL.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleGL.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/__init__.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/__init__.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/__init__.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/core.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/core.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/core.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/tests.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/tests.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleGTK/tests.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddlePDF.py
+%%PYTHON_SITELIBDIR%%/piddle/piddlePDF.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddlePDF.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddlePIL.py
+%%PYTHON_SITELIBDIR%%/piddle/piddlePIL.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddlePIL.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddlePS.py
+%%PYTHON_SITELIBDIR%%/piddle/piddlePS.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddlePS.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddlePSmetrics.py
+%%PYTHON_SITELIBDIR%%/piddle/piddlePSmetrics.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddlePSmetrics.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleQD.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleQD.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleQD.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/__init__.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/__init__.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/__init__.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/piddleSVG.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/piddleSVG.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleSVG/piddleSVG.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/__init__.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/piddleTK.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/piddleTK.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleTK2/piddleTK.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleVCR.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleVCR.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleVCR.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleWX.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleWX.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleWX.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddleWxDc.py
+%%PYTHON_SITELIBDIR%%/piddle/piddleWxDc.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddleWxDc.pyo
+%%PYTHON_SITELIBDIR%%/piddle/piddletest.py
+%%PYTHON_SITELIBDIR%%/piddle/piddletest.pyc
+%%PYTHON_SITELIBDIR%%/piddle/piddletest.pyo
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/courier-bold-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/helvetica-bold-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/metrics.dat
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/symbol-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-8.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-10.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-10.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-12.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-12.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-14.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-14.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-18.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-18.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-24.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-24.png
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-8.pil
+%%PYTHON_SITELIBDIR%%/piddle/pilfonts/times-bold-8.png
+%%PYTHON_SITELIBDIR%%/piddle/polyfunc.py
+%%PYTHON_SITELIBDIR%%/piddle/polyfunc.pyc
+%%PYTHON_SITELIBDIR%%/piddle/polyfunc.pyo
+%%PYTHON_SITELIBDIR%%/piddle/python.gif
+%%PYTHON_SITELIBDIR%%/piddle/stringformat.py
+%%PYTHON_SITELIBDIR%%/piddle/stringformat.pyc
+%%PYTHON_SITELIBDIR%%/piddle/stringformat.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/piddle/pilfonts
+@dirrm %%PYTHON_SITELIBDIR%%/piddle/piddleTK2
+@dirrm %%PYTHON_SITELIBDIR%%/piddle/piddleSVG
+@dirrm %%PYTHON_SITELIBDIR%%/piddle/piddleGTK
+@dirrm %%PYTHON_SITELIBDIR%%/piddle
diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile
index 3053fb29a7a0..a37fb279c57b 100644
--- a/graphics/py-exif/Makefile
+++ b/graphics/py-exif/Makefile
@@ -20,7 +20,6 @@ USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/pyexif
 DATADIR=	${PREFIX}/share/py-exif
 DOCSDIR=	${PREFIX}/share/doc/py-exif
-INSTALL_SITELIBDIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages
 
 post-patch:
 .for pyfile in exiftool exifinfo.py
@@ -33,10 +32,9 @@ do-build:
 	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib
 
 do-install:
-	@ ${MKDIR} ${INSTALL_SITELIBDIR}
 	@ ${MKDIR} ${PREFIX}/bin
 	@ cd ${WRKSRC}/lib && ${INSTALL_DATA} *.py *.pyc *.pyo \
-	  ${INSTALL_SITELIBDIR}
+	  ${PYTHON_SITELIBDIR}
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/bin/exiftool ${PREFIX}/bin/py-exiftool
 	@ ${MKDIR} ${DATADIR}
 	@ cd ${WRKSRC}/share/exiftool && ${INSTALL_DATA} *.html *.txt \
diff --git a/graphics/py-exif/pkg-plist b/graphics/py-exif/pkg-plist
index 5380f00277de..d3ef30598375 100644
--- a/graphics/py-exif/pkg-plist
+++ b/graphics/py-exif/pkg-plist
@@ -1,12 +1,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.exiftool
 bin/py-exiftool
-lib/%%PYTHON_VERSION%%/site-packages/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/exif.py
-lib/%%PYTHON_VERSION%%/site-packages/exif.pyc
-lib/%%PYTHON_VERSION%%/site-packages/exif.pyo
+%%PYTHON_SITELIBDIR%%/__init__.py
+%%PYTHON_SITELIBDIR%%/__init__.pyc
+%%PYTHON_SITELIBDIR%%/__init__.pyo
+%%PYTHON_SITELIBDIR%%/exif.py
+%%PYTHON_SITELIBDIR%%/exif.pyc
+%%PYTHON_SITELIBDIR%%/exif.pyo
 share/py-exif/template.html
 share/py-exif/template.txt
 @dirrm share/py-exif
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 1394d96d2f8e..b8b43d36badb 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Python module for Ming which allows you to create Flash 4/5 movies
 
 MASTERDIR=	${.CURDIR}/../../graphics/ming
 PLIST=		${.CURDIR}/pkg-plist
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 INSTALL_WRKSRC=		${WRKSRC}/py_ext
 USE_PYTHON=	yes
 #USE_PYDISTUTILS=	yes
diff --git a/graphics/py-ming/pkg-plist b/graphics/py-ming/pkg-plist
index 98169b99b5c5..00506701e463 100644
--- a/graphics/py-ming/pkg-plist
+++ b/graphics/py-ming/pkg-plist
@@ -1,6 +1,6 @@
-lib/%%PYTHON_VERSION%%/site-packages/_mingc.so
-lib/%%PYTHON_VERSION%%/site-packages/ming.py
-lib/%%PYTHON_VERSION%%/site-packages/ming.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mingc.py
-lib/%%PYTHON_VERSION%%/site-packages/mingc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mingc-0.4.3-py2.7.egg-info
+%%PYTHON_SITELIBDIR%%/_mingc.so
+%%PYTHON_SITELIBDIR%%/ming.py
+%%PYTHON_SITELIBDIR%%/ming.pyc
+%%PYTHON_SITELIBDIR%%/mingc.py
+%%PYTHON_SITELIBDIR%%/mingc.pyc
+%%PYTHON_SITELIBDIR%%/mingc-0.4.3-py%%PYTHON_VER%%.egg-info
diff --git a/misc/cuecat/pkg-plist b/misc/cuecat/pkg-plist
index d36288bb23a1..e1ae1e07719f 100644
--- a/misc/cuecat/pkg-plist
+++ b/misc/cuecat/pkg-plist
@@ -1,7 +1,6 @@
 bin/cuecat
 bin/xcuecat
-lib/%%PYTHON_VERSION%%/site-packages/barcode.py
-lib/%%PYTHON_VERSION%%/site-packages/barcode.pyo
-lib/%%PYTHON_VERSION%%/site-packages/cuecat.py
-lib/%%PYTHON_VERSION%%/site-packages/cuecat.pyo
-@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
+%%PYTHON_SITELIBDIR%%/barcode.py
+%%PYTHON_SITELIBDIR%%/barcode.pyo
+%%PYTHON_SITELIBDIR%%/cuecat.py
+%%PYTHON_SITELIBDIR%%/cuecat.pyo
diff --git a/misc/py-osd/pkg-plist b/misc/py-osd/pkg-plist
index 4de60ade03c1..4f0f173fa5bf 100644
--- a/misc/py-osd/pkg-plist
+++ b/misc/py-osd/pkg-plist
@@ -1,8 +1,8 @@
-lib/%%PYTHON_VERSION%%/site-packages/_pyosd.so
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.py
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pyosd/daemon.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyosd
+%%PYTHON_SITELIBDIR%%/_pyosd.so
+%%PYTHON_SITELIBDIR%%/pyosd/__init__.py
+%%PYTHON_SITELIBDIR%%/pyosd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyosd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyosd/daemon.py
+%%PYTHON_SITELIBDIR%%/pyosd/daemon.pyc
+%%PYTHON_SITELIBDIR%%/pyosd/daemon.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pyosd
diff --git a/net-p2p/py-fngrab/pkg-plist b/net-p2p/py-fngrab/pkg-plist
index 580c27e7d1e3..08571a32064a 100644
--- a/net-p2p/py-fngrab/pkg-plist
+++ b/net-p2p/py-fngrab/pkg-plist
@@ -1,17 +1,17 @@
 bin/fngrab
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.py
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyc
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/cmdline.pyo
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.py
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyc
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/fngrab.pyo
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.py
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyc
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/status.pyo
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.py
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab/xmlrpclib.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/FreenetGrab
+%%PYTHON_SITELIBDIR%%/FreenetGrab/__init__.py
+%%PYTHON_SITELIBDIR%%/FreenetGrab/__init__.pyc
+%%PYTHON_SITELIBDIR%%/FreenetGrab/__init__.pyo
+%%PYTHON_SITELIBDIR%%/FreenetGrab/cmdline.py
+%%PYTHON_SITELIBDIR%%/FreenetGrab/cmdline.pyc
+%%PYTHON_SITELIBDIR%%/FreenetGrab/cmdline.pyo
+%%PYTHON_SITELIBDIR%%/FreenetGrab/fngrab.py
+%%PYTHON_SITELIBDIR%%/FreenetGrab/fngrab.pyc
+%%PYTHON_SITELIBDIR%%/FreenetGrab/fngrab.pyo
+%%PYTHON_SITELIBDIR%%/FreenetGrab/status.py
+%%PYTHON_SITELIBDIR%%/FreenetGrab/status.pyc
+%%PYTHON_SITELIBDIR%%/FreenetGrab/status.pyo
+%%PYTHON_SITELIBDIR%%/FreenetGrab/xmlrpclib.py
+%%PYTHON_SITELIBDIR%%/FreenetGrab/xmlrpclib.pyc
+%%PYTHON_SITELIBDIR%%/FreenetGrab/xmlrpclib.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/FreenetGrab