3 files changed, 198 insertions, 196 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index af59f245e0c2..76d8fc8e18c7 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -16,27 +16,29 @@ DISTNAME=	Imaging-${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 DIST_SUBDIR=	python
+USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/libImaging
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jpeg=${PREFIX}/lib
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-PILDIR=		${PYTHONSCRIPTDIR}/site-packages/PIL
+PILDIR=		${PYTHON_SITELIBDIR}/PIL
 PILDOCDIR=	${PREFIX}/share/doc/PIL
 PILEXDIR=	${PREFIX}/share/examples/PIL
-PILINCDIR=	${PREFIX}/include/python1.5
+PILINCDIR=	${PREFIX}/include/${PYTHON_VERSION}
 
 post-extract:
 	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..
+	@${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}/..
 
 post-configure:
-	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC}/..; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
 
 post-build:
 	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} sharedmods)
@@ -46,8 +48,8 @@ do-install:
 	@${MKDIR} ${PILDIR}
 	${INSTALL_DATA} ${WRKSRC}/../PIL/* ${PILDIR}
 	${INSTALL_DATA} ${WRKSRC}/../PIL.pth ${PILDIR}/..
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${PILDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${PILDIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
 	@${MKDIR} ${PILDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/../FORMATS ${PILDOCDIR}
diff --git a/graphics/py-imaging/files/Setup b/graphics/py-imaging/files/Setup
index 17221d410e39..7e7f2cbb62cb 100644
--- a/graphics/py-imaging/files/Setup
+++ b/graphics/py-imaging/files/Setup
@@ -1,4 +1,4 @@
 *shared*
 
 _imaging _imaging.c decode.c encode.c map.c display.c outline.c path.c -IlibImaging libImaging/libImaging.a -I${PREFIX}/include -L${PREFIX}/lib -ljpeg -lz
-_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 -L${PREFIX}/lib -ltk82 -ltcl82 -L${X11BASE}/lib -lX11
+_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3 -L${PREFIX}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11
diff --git a/graphics/py-imaging/pkg-plist b/graphics/py-imaging/pkg-plist
index 53d73ed38dd5..a6f115a7d8f5 100644
--- a/graphics/py-imaging/pkg-plist
+++ b/graphics/py-imaging/pkg-plist
@@ -1,189 +1,189 @@
-include/python1.5/ImConfig.h
-include/python1.5/ImPlatform.h
-include/python1.5/Imaging.h
-lib/python1.5/site-packages/PIL/ArgImagePlugin.py
-lib/python1.5/site-packages/PIL/ArgImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ArgImagePlugin.pyo
-lib/python1.5/site-packages/PIL/BdfFontFile.py
-lib/python1.5/site-packages/PIL/BdfFontFile.pyc
-lib/python1.5/site-packages/PIL/BdfFontFile.pyo
-lib/python1.5/site-packages/PIL/BmpImagePlugin.py
-lib/python1.5/site-packages/PIL/BmpImagePlugin.pyc
-lib/python1.5/site-packages/PIL/BmpImagePlugin.pyo
-lib/python1.5/site-packages/PIL/ContainerIO.py
-lib/python1.5/site-packages/PIL/ContainerIO.pyc
-lib/python1.5/site-packages/PIL/ContainerIO.pyo
-lib/python1.5/site-packages/PIL/CurImagePlugin.py
-lib/python1.5/site-packages/PIL/CurImagePlugin.pyc
-lib/python1.5/site-packages/PIL/CurImagePlugin.pyo
-lib/python1.5/site-packages/PIL/DcxImagePlugin.py
-lib/python1.5/site-packages/PIL/DcxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/DcxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/EpsImagePlugin.py
-lib/python1.5/site-packages/PIL/EpsImagePlugin.pyc
-lib/python1.5/site-packages/PIL/EpsImagePlugin.pyo
-lib/python1.5/site-packages/PIL/FliImagePlugin.py
-lib/python1.5/site-packages/PIL/FliImagePlugin.pyc
-lib/python1.5/site-packages/PIL/FliImagePlugin.pyo
-lib/python1.5/site-packages/PIL/FontFile.py
-lib/python1.5/site-packages/PIL/FontFile.pyc
-lib/python1.5/site-packages/PIL/FontFile.pyo
-lib/python1.5/site-packages/PIL/FpxImagePlugin.py
-lib/python1.5/site-packages/PIL/FpxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/FpxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GbrImagePlugin.py
-lib/python1.5/site-packages/PIL/GbrImagePlugin.pyc
-lib/python1.5/site-packages/PIL/GbrImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GdImageFile.py
-lib/python1.5/site-packages/PIL/GdImageFile.pyc
-lib/python1.5/site-packages/PIL/GdImageFile.pyo
-lib/python1.5/site-packages/PIL/GifImagePlugin.py
-lib/python1.5/site-packages/PIL/GifImagePlugin.pyc
-lib/python1.5/site-packages/PIL/GifImagePlugin.pyo
-lib/python1.5/site-packages/PIL/GimpGradientFile.py
-lib/python1.5/site-packages/PIL/GimpGradientFile.pyc
-lib/python1.5/site-packages/PIL/GimpGradientFile.pyo
-lib/python1.5/site-packages/PIL/GimpPaletteFile.py
-lib/python1.5/site-packages/PIL/GimpPaletteFile.pyc
-lib/python1.5/site-packages/PIL/GimpPaletteFile.pyo
-lib/python1.5/site-packages/PIL/IcoImagePlugin.py
-lib/python1.5/site-packages/PIL/IcoImagePlugin.pyc
-lib/python1.5/site-packages/PIL/IcoImagePlugin.pyo
-lib/python1.5/site-packages/PIL/ImImagePlugin.py
-lib/python1.5/site-packages/PIL/ImImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ImImagePlugin.pyo
-lib/python1.5/site-packages/PIL/Image.py
-lib/python1.5/site-packages/PIL/Image.pyc
-lib/python1.5/site-packages/PIL/Image.pyo
-lib/python1.5/site-packages/PIL/ImageChops.py
-lib/python1.5/site-packages/PIL/ImageChops.pyc
-lib/python1.5/site-packages/PIL/ImageChops.pyo
-lib/python1.5/site-packages/PIL/ImageDraw.py
-lib/python1.5/site-packages/PIL/ImageDraw.pyc
-lib/python1.5/site-packages/PIL/ImageDraw.pyo
-lib/python1.5/site-packages/PIL/ImageEnhance.py
-lib/python1.5/site-packages/PIL/ImageEnhance.pyc
-lib/python1.5/site-packages/PIL/ImageEnhance.pyo
-lib/python1.5/site-packages/PIL/ImageFile.py
-lib/python1.5/site-packages/PIL/ImageFile.pyc
-lib/python1.5/site-packages/PIL/ImageFile.pyo
-lib/python1.5/site-packages/PIL/ImageFileIO.py
-lib/python1.5/site-packages/PIL/ImageFileIO.pyc
-lib/python1.5/site-packages/PIL/ImageFileIO.pyo
-lib/python1.5/site-packages/PIL/ImageFilter.py
-lib/python1.5/site-packages/PIL/ImageFilter.pyc
-lib/python1.5/site-packages/PIL/ImageFilter.pyo
-lib/python1.5/site-packages/PIL/ImageFont.py
-lib/python1.5/site-packages/PIL/ImageFont.pyc
-lib/python1.5/site-packages/PIL/ImageFont.pyo
-lib/python1.5/site-packages/PIL/ImagePalette.py
-lib/python1.5/site-packages/PIL/ImagePalette.pyc
-lib/python1.5/site-packages/PIL/ImagePalette.pyo
-lib/python1.5/site-packages/PIL/ImagePath.py
-lib/python1.5/site-packages/PIL/ImagePath.pyc
-lib/python1.5/site-packages/PIL/ImagePath.pyo
-lib/python1.5/site-packages/PIL/ImageSequence.py
-lib/python1.5/site-packages/PIL/ImageSequence.pyc
-lib/python1.5/site-packages/PIL/ImageSequence.pyo
-lib/python1.5/site-packages/PIL/ImageStat.py
-lib/python1.5/site-packages/PIL/ImageStat.pyc
-lib/python1.5/site-packages/PIL/ImageStat.pyo
-lib/python1.5/site-packages/PIL/ImageTk.py
-lib/python1.5/site-packages/PIL/ImageTk.pyc
-lib/python1.5/site-packages/PIL/ImageTk.pyo
-lib/python1.5/site-packages/PIL/ImageWin.py
-lib/python1.5/site-packages/PIL/ImageWin.pyc
-lib/python1.5/site-packages/PIL/ImageWin.pyo
-lib/python1.5/site-packages/PIL/ImtImagePlugin.py
-lib/python1.5/site-packages/PIL/ImtImagePlugin.pyc
-lib/python1.5/site-packages/PIL/ImtImagePlugin.pyo
-lib/python1.5/site-packages/PIL/IptcImagePlugin.py
-lib/python1.5/site-packages/PIL/IptcImagePlugin.pyc
-lib/python1.5/site-packages/PIL/IptcImagePlugin.pyo
-lib/python1.5/site-packages/PIL/JpegImagePlugin.py
-lib/python1.5/site-packages/PIL/JpegImagePlugin.pyc
-lib/python1.5/site-packages/PIL/JpegImagePlugin.pyo
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.py
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.pyc
-lib/python1.5/site-packages/PIL/McIdasImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MicImagePlugin.py
-lib/python1.5/site-packages/PIL/MicImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MicImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MpegImagePlugin.py
-lib/python1.5/site-packages/PIL/MpegImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MpegImagePlugin.pyo
-lib/python1.5/site-packages/PIL/MspImagePlugin.py
-lib/python1.5/site-packages/PIL/MspImagePlugin.pyc
-lib/python1.5/site-packages/PIL/MspImagePlugin.pyo
-lib/python1.5/site-packages/PIL/OleFileIO.py
-lib/python1.5/site-packages/PIL/OleFileIO.pyc
-lib/python1.5/site-packages/PIL/OleFileIO.pyo
-lib/python1.5/site-packages/PIL/PSDraw.py
-lib/python1.5/site-packages/PIL/PSDraw.pyc
-lib/python1.5/site-packages/PIL/PSDraw.pyo
-lib/python1.5/site-packages/PIL/PaletteFile.py
-lib/python1.5/site-packages/PIL/PaletteFile.pyc
-lib/python1.5/site-packages/PIL/PaletteFile.pyo
-lib/python1.5/site-packages/PIL/PcdImagePlugin.py
-lib/python1.5/site-packages/PIL/PcdImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PcdImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PcfFontFile.py
-lib/python1.5/site-packages/PIL/PcfFontFile.pyc
-lib/python1.5/site-packages/PIL/PcfFontFile.pyo
-lib/python1.5/site-packages/PIL/PcxImagePlugin.py
-lib/python1.5/site-packages/PIL/PcxImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PcxImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PdfImagePlugin.py
-lib/python1.5/site-packages/PIL/PdfImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PdfImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PixarImagePlugin.py
-lib/python1.5/site-packages/PIL/PixarImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PixarImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PngImagePlugin.py
-lib/python1.5/site-packages/PIL/PngImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PngImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PpmImagePlugin.py
-lib/python1.5/site-packages/PIL/PpmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PpmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/PsdImagePlugin.py
-lib/python1.5/site-packages/PIL/PsdImagePlugin.pyc
-lib/python1.5/site-packages/PIL/PsdImagePlugin.pyo
-lib/python1.5/site-packages/PIL/SgiImagePlugin.py
-lib/python1.5/site-packages/PIL/SgiImagePlugin.pyc
-lib/python1.5/site-packages/PIL/SgiImagePlugin.pyo
-lib/python1.5/site-packages/PIL/SunImagePlugin.py
-lib/python1.5/site-packages/PIL/SunImagePlugin.pyc
-lib/python1.5/site-packages/PIL/SunImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TarIO.py
-lib/python1.5/site-packages/PIL/TarIO.pyc
-lib/python1.5/site-packages/PIL/TarIO.pyo
-lib/python1.5/site-packages/PIL/TgaImagePlugin.py
-lib/python1.5/site-packages/PIL/TgaImagePlugin.pyc
-lib/python1.5/site-packages/PIL/TgaImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TiffImagePlugin.py
-lib/python1.5/site-packages/PIL/TiffImagePlugin.pyc
-lib/python1.5/site-packages/PIL/TiffImagePlugin.pyo
-lib/python1.5/site-packages/PIL/TiffTags.py
-lib/python1.5/site-packages/PIL/TiffTags.pyc
-lib/python1.5/site-packages/PIL/TiffTags.pyo
-lib/python1.5/site-packages/PIL/WmfImagePlugin.py
-lib/python1.5/site-packages/PIL/WmfImagePlugin.pyc
-lib/python1.5/site-packages/PIL/WmfImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XbmImagePlugin.py
-lib/python1.5/site-packages/PIL/XbmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XbmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XpmImagePlugin.py
-lib/python1.5/site-packages/PIL/XpmImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XpmImagePlugin.pyo
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.py
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.pyc
-lib/python1.5/site-packages/PIL/XVThumbImagePlugin.pyo
-lib/python1.5/site-packages/PIL/__init__.py
-lib/python1.5/site-packages/PIL/__init__.pyc
-lib/python1.5/site-packages/PIL/__init__.pyo
-lib/python1.5/site-packages/PIL.pth
-lib/python1.5/site-packages/_imaging.so
-lib/python1.5/site-packages/_imagingtk.so
+include/%%PYTHON_VERSION%%/ImConfig.h
+include/%%PYTHON_VERSION%%/ImPlatform.h
+include/%%PYTHON_VERSION%%/Imaging.h
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BdfFontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/CurImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/DcxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/EpsImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/FpxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GbrImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GdImageFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GifImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpGradientFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/Image.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageChops.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageDraw.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageEnhance.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFileIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFilter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePalette.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImagePath.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageSequence.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageStat.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageTk.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageWin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/ImtImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/IptcImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/JpegImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/McIdasImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MicImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MpegImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/MspImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/OleFileIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PSDraw.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PaletteFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcdImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcfFontFile.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PcxImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PdfImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PixarImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PngImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PpmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/PsdImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TarIO.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TgaImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/TiffTags.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/WmfImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XbmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/XVThumbImagePlugin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/PIL.pth
+lib/%%PYTHON_VERSION%%/site-packages/_imaging.so
+lib/%%PYTHON_VERSION%%/site-packages/_imagingtk.so
 share/doc/PIL/FORMATS
 share/doc/PIL/README
 share/examples/PIL/README
@@ -201,6 +201,6 @@ share/examples/PIL/pilprint.py
 share/examples/PIL/player.py
 share/examples/PIL/thresholder.py
 share/examples/PIL/viewer.py
-@dirrm lib/python1.5/site-packages/PIL
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/PIL
 @dirrm share/doc/PIL
 @dirrm share/examples/PIL