-resort to old buildlink - BUILDLINK2 doesn't work yet with Python

 packages
-fix hardwired python2.2 in PLIST

2 files changed, 130 insertions, 132 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index e814ca7897b..c40366485b2 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/03 20:31:02 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/04 13:06:54 drochner Exp $
 
 DISTNAME=	Imaging-1.1.3
 PKGNAME=	${PYPKGPREFIX}-imaging-1.1.3
@@ -9,13 +9,11 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
 COMMENT=	PIL, the Python Imaging Library
 
-#DEPENDS+=	jpeg-6b:../../graphics/jpeg
-
 DIST_SUBDIR=    python
 PYDISTUTILSPKG= yes
 PY_PATCHPLIST=	yes
-GNU_CONGIGURE=	yes
-USE_BUILDLINK2=	yes
+GNU_CONFIGURE=	yes
+USE_BUILDLINK=	yes
 
 do-configure:
 	(cd ${WRKSRC}/libImaging && ${SETENV} ${CONFIGURE_ENV} ./configure \
@@ -25,5 +23,5 @@ do-configure:
 	 ${WRKSRC}/setup.py
 
 .include "../../lang/python/extension.buildlink.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/PLIST b/graphics/py-imaging/PLIST
index 33109fd925c..d2c98dd4ab4 100644
--- a/graphics/py-imaging/PLIST
+++ b/graphics/py-imaging/PLIST
@@ -1,126 +1,126 @@
-@comment $NetBSD: PLIST,v 1.1 2002/09/03 20:31:02 drochner Exp $
-lib/python2.2/site-packages/PIL.pth
-lib/python2.2/site-packages/PIL/ArgImagePlugin.py
-lib/python2.2/site-packages/PIL/ArgImagePlugin.pyc
-lib/python2.2/site-packages/PIL/BdfFontFile.py
-lib/python2.2/site-packages/PIL/BdfFontFile.pyc
-lib/python2.2/site-packages/PIL/BmpImagePlugin.py
-lib/python2.2/site-packages/PIL/BmpImagePlugin.pyc
-lib/python2.2/site-packages/PIL/ContainerIO.py
-lib/python2.2/site-packages/PIL/ContainerIO.pyc
-lib/python2.2/site-packages/PIL/CurImagePlugin.py
-lib/python2.2/site-packages/PIL/CurImagePlugin.pyc
-lib/python2.2/site-packages/PIL/DcxImagePlugin.py
-lib/python2.2/site-packages/PIL/DcxImagePlugin.pyc
-lib/python2.2/site-packages/PIL/EpsImagePlugin.py
-lib/python2.2/site-packages/PIL/EpsImagePlugin.pyc
-lib/python2.2/site-packages/PIL/FliImagePlugin.py
-lib/python2.2/site-packages/PIL/FliImagePlugin.pyc
-lib/python2.2/site-packages/PIL/FontFile.py
-lib/python2.2/site-packages/PIL/FontFile.pyc
-lib/python2.2/site-packages/PIL/FpxImagePlugin.py
-lib/python2.2/site-packages/PIL/FpxImagePlugin.pyc
-lib/python2.2/site-packages/PIL/GbrImagePlugin.py
-lib/python2.2/site-packages/PIL/GbrImagePlugin.pyc
-lib/python2.2/site-packages/PIL/GdImageFile.py
-lib/python2.2/site-packages/PIL/GdImageFile.pyc
-lib/python2.2/site-packages/PIL/GifImagePlugin.py
-lib/python2.2/site-packages/PIL/GifImagePlugin.pyc
-lib/python2.2/site-packages/PIL/GimpGradientFile.py
-lib/python2.2/site-packages/PIL/GimpGradientFile.pyc
-lib/python2.2/site-packages/PIL/GimpPaletteFile.py
-lib/python2.2/site-packages/PIL/GimpPaletteFile.pyc
-lib/python2.2/site-packages/PIL/IcoImagePlugin.py
-lib/python2.2/site-packages/PIL/IcoImagePlugin.pyc
-lib/python2.2/site-packages/PIL/ImImagePlugin.py
-lib/python2.2/site-packages/PIL/ImImagePlugin.pyc
-lib/python2.2/site-packages/PIL/Image.py
-lib/python2.2/site-packages/PIL/Image.pyc
-lib/python2.2/site-packages/PIL/ImageChops.py
-lib/python2.2/site-packages/PIL/ImageChops.pyc
-lib/python2.2/site-packages/PIL/ImageDraw.py
-lib/python2.2/site-packages/PIL/ImageDraw.pyc
-lib/python2.2/site-packages/PIL/ImageEnhance.py
-lib/python2.2/site-packages/PIL/ImageEnhance.pyc
-lib/python2.2/site-packages/PIL/ImageFile.py
-lib/python2.2/site-packages/PIL/ImageFile.pyc
-lib/python2.2/site-packages/PIL/ImageFileIO.py
-lib/python2.2/site-packages/PIL/ImageFileIO.pyc
-lib/python2.2/site-packages/PIL/ImageFilter.py
-lib/python2.2/site-packages/PIL/ImageFilter.pyc
-lib/python2.2/site-packages/PIL/ImageFont.py
-lib/python2.2/site-packages/PIL/ImageFont.pyc
-lib/python2.2/site-packages/PIL/ImageOps.py
-lib/python2.2/site-packages/PIL/ImageOps.pyc
-lib/python2.2/site-packages/PIL/ImagePalette.py
-lib/python2.2/site-packages/PIL/ImagePalette.pyc
-lib/python2.2/site-packages/PIL/ImagePath.py
-lib/python2.2/site-packages/PIL/ImagePath.pyc
-lib/python2.2/site-packages/PIL/ImageSequence.py
-lib/python2.2/site-packages/PIL/ImageSequence.pyc
-lib/python2.2/site-packages/PIL/ImageStat.py
-lib/python2.2/site-packages/PIL/ImageStat.pyc
-lib/python2.2/site-packages/PIL/ImageTk.py
-lib/python2.2/site-packages/PIL/ImageTk.pyc
-lib/python2.2/site-packages/PIL/ImageWin.py
-lib/python2.2/site-packages/PIL/ImageWin.pyc
-lib/python2.2/site-packages/PIL/ImtImagePlugin.py
-lib/python2.2/site-packages/PIL/ImtImagePlugin.pyc
-lib/python2.2/site-packages/PIL/IptcImagePlugin.py
-lib/python2.2/site-packages/PIL/IptcImagePlugin.pyc
-lib/python2.2/site-packages/PIL/JpegImagePlugin.py
-lib/python2.2/site-packages/PIL/JpegImagePlugin.pyc
-lib/python2.2/site-packages/PIL/McIdasImagePlugin.py
-lib/python2.2/site-packages/PIL/McIdasImagePlugin.pyc
-lib/python2.2/site-packages/PIL/MicImagePlugin.py
-lib/python2.2/site-packages/PIL/MicImagePlugin.pyc
-lib/python2.2/site-packages/PIL/MpegImagePlugin.py
-lib/python2.2/site-packages/PIL/MpegImagePlugin.pyc
-lib/python2.2/site-packages/PIL/MspImagePlugin.py
-lib/python2.2/site-packages/PIL/MspImagePlugin.pyc
-lib/python2.2/site-packages/PIL/OleFileIO.py
-lib/python2.2/site-packages/PIL/OleFileIO.pyc
-lib/python2.2/site-packages/PIL/PSDraw.py
-lib/python2.2/site-packages/PIL/PSDraw.pyc
-lib/python2.2/site-packages/PIL/PaletteFile.py
-lib/python2.2/site-packages/PIL/PaletteFile.pyc
-lib/python2.2/site-packages/PIL/PcdImagePlugin.py
-lib/python2.2/site-packages/PIL/PcdImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PcfFontFile.py
-lib/python2.2/site-packages/PIL/PcfFontFile.pyc
-lib/python2.2/site-packages/PIL/PcxImagePlugin.py
-lib/python2.2/site-packages/PIL/PcxImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PdfImagePlugin.py
-lib/python2.2/site-packages/PIL/PdfImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PixarImagePlugin.py
-lib/python2.2/site-packages/PIL/PixarImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PngImagePlugin.py
-lib/python2.2/site-packages/PIL/PngImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PpmImagePlugin.py
-lib/python2.2/site-packages/PIL/PpmImagePlugin.pyc
-lib/python2.2/site-packages/PIL/PsdImagePlugin.py
-lib/python2.2/site-packages/PIL/PsdImagePlugin.pyc
-lib/python2.2/site-packages/PIL/SgiImagePlugin.py
-lib/python2.2/site-packages/PIL/SgiImagePlugin.pyc
-lib/python2.2/site-packages/PIL/SunImagePlugin.py
-lib/python2.2/site-packages/PIL/SunImagePlugin.pyc
-lib/python2.2/site-packages/PIL/TarIO.py
-lib/python2.2/site-packages/PIL/TarIO.pyc
-lib/python2.2/site-packages/PIL/TgaImagePlugin.py
-lib/python2.2/site-packages/PIL/TgaImagePlugin.pyc
-lib/python2.2/site-packages/PIL/TiffImagePlugin.py
-lib/python2.2/site-packages/PIL/TiffImagePlugin.pyc
-lib/python2.2/site-packages/PIL/TiffTags.py
-lib/python2.2/site-packages/PIL/TiffTags.pyc
-lib/python2.2/site-packages/PIL/WmfImagePlugin.py
-lib/python2.2/site-packages/PIL/WmfImagePlugin.pyc
-lib/python2.2/site-packages/PIL/XVThumbImagePlugin.py
-lib/python2.2/site-packages/PIL/XVThumbImagePlugin.pyc
-lib/python2.2/site-packages/PIL/XbmImagePlugin.py
-lib/python2.2/site-packages/PIL/XbmImagePlugin.pyc
-lib/python2.2/site-packages/PIL/XpmImagePlugin.py
-lib/python2.2/site-packages/PIL/XpmImagePlugin.pyc
-lib/python2.2/site-packages/PIL/__init__.py
-lib/python2.2/site-packages/PIL/__init__.pyc
-lib/python2.2/site-packages/PIL/_imaging.so
-@dirrm lib/python2.2/site-packages/PIL
+@comment $NetBSD: PLIST,v 1.2 2002/09/04 13:06:54 drochner Exp $
+${PYSITELIB}/PIL.pth
+${PYSITELIB}/PIL/ArgImagePlugin.py
+${PYSITELIB}/PIL/ArgImagePlugin.pyc
+${PYSITELIB}/PIL/BdfFontFile.py
+${PYSITELIB}/PIL/BdfFontFile.pyc
+${PYSITELIB}/PIL/BmpImagePlugin.py
+${PYSITELIB}/PIL/BmpImagePlugin.pyc
+${PYSITELIB}/PIL/ContainerIO.py
+${PYSITELIB}/PIL/ContainerIO.pyc
+${PYSITELIB}/PIL/CurImagePlugin.py
+${PYSITELIB}/PIL/CurImagePlugin.pyc
+${PYSITELIB}/PIL/DcxImagePlugin.py
+${PYSITELIB}/PIL/DcxImagePlugin.pyc
+${PYSITELIB}/PIL/EpsImagePlugin.py
+${PYSITELIB}/PIL/EpsImagePlugin.pyc
+${PYSITELIB}/PIL/FliImagePlugin.py
+${PYSITELIB}/PIL/FliImagePlugin.pyc
+${PYSITELIB}/PIL/FontFile.py
+${PYSITELIB}/PIL/FontFile.pyc
+${PYSITELIB}/PIL/FpxImagePlugin.py
+${PYSITELIB}/PIL/FpxImagePlugin.pyc
+${PYSITELIB}/PIL/GbrImagePlugin.py
+${PYSITELIB}/PIL/GbrImagePlugin.pyc
+${PYSITELIB}/PIL/GdImageFile.py
+${PYSITELIB}/PIL/GdImageFile.pyc
+${PYSITELIB}/PIL/GifImagePlugin.py
+${PYSITELIB}/PIL/GifImagePlugin.pyc
+${PYSITELIB}/PIL/GimpGradientFile.py
+${PYSITELIB}/PIL/GimpGradientFile.pyc
+${PYSITELIB}/PIL/GimpPaletteFile.py
+${PYSITELIB}/PIL/GimpPaletteFile.pyc
+${PYSITELIB}/PIL/IcoImagePlugin.py
+${PYSITELIB}/PIL/IcoImagePlugin.pyc
+${PYSITELIB}/PIL/ImImagePlugin.py
+${PYSITELIB}/PIL/ImImagePlugin.pyc
+${PYSITELIB}/PIL/Image.py
+${PYSITELIB}/PIL/Image.pyc
+${PYSITELIB}/PIL/ImageChops.py
+${PYSITELIB}/PIL/ImageChops.pyc
+${PYSITELIB}/PIL/ImageDraw.py
+${PYSITELIB}/PIL/ImageDraw.pyc
+${PYSITELIB}/PIL/ImageEnhance.py
+${PYSITELIB}/PIL/ImageEnhance.pyc
+${PYSITELIB}/PIL/ImageFile.py
+${PYSITELIB}/PIL/ImageFile.pyc
+${PYSITELIB}/PIL/ImageFileIO.py
+${PYSITELIB}/PIL/ImageFileIO.pyc
+${PYSITELIB}/PIL/ImageFilter.py
+${PYSITELIB}/PIL/ImageFilter.pyc
+${PYSITELIB}/PIL/ImageFont.py
+${PYSITELIB}/PIL/ImageFont.pyc
+${PYSITELIB}/PIL/ImageOps.py
+${PYSITELIB}/PIL/ImageOps.pyc
+${PYSITELIB}/PIL/ImagePalette.py
+${PYSITELIB}/PIL/ImagePalette.pyc
+${PYSITELIB}/PIL/ImagePath.py
+${PYSITELIB}/PIL/ImagePath.pyc
+${PYSITELIB}/PIL/ImageSequence.py
+${PYSITELIB}/PIL/ImageSequence.pyc
+${PYSITELIB}/PIL/ImageStat.py
+${PYSITELIB}/PIL/ImageStat.pyc
+${PYSITELIB}/PIL/ImageTk.py
+${PYSITELIB}/PIL/ImageTk.pyc
+${PYSITELIB}/PIL/ImageWin.py
+${PYSITELIB}/PIL/ImageWin.pyc
+${PYSITELIB}/PIL/ImtImagePlugin.py
+${PYSITELIB}/PIL/ImtImagePlugin.pyc
+${PYSITELIB}/PIL/IptcImagePlugin.py
+${PYSITELIB}/PIL/IptcImagePlugin.pyc
+${PYSITELIB}/PIL/JpegImagePlugin.py
+${PYSITELIB}/PIL/JpegImagePlugin.pyc
+${PYSITELIB}/PIL/McIdasImagePlugin.py
+${PYSITELIB}/PIL/McIdasImagePlugin.pyc
+${PYSITELIB}/PIL/MicImagePlugin.py
+${PYSITELIB}/PIL/MicImagePlugin.pyc
+${PYSITELIB}/PIL/MpegImagePlugin.py
+${PYSITELIB}/PIL/MpegImagePlugin.pyc
+${PYSITELIB}/PIL/MspImagePlugin.py
+${PYSITELIB}/PIL/MspImagePlugin.pyc
+${PYSITELIB}/PIL/OleFileIO.py
+${PYSITELIB}/PIL/OleFileIO.pyc
+${PYSITELIB}/PIL/PSDraw.py
+${PYSITELIB}/PIL/PSDraw.pyc
+${PYSITELIB}/PIL/PaletteFile.py
+${PYSITELIB}/PIL/PaletteFile.pyc
+${PYSITELIB}/PIL/PcdImagePlugin.py
+${PYSITELIB}/PIL/PcdImagePlugin.pyc
+${PYSITELIB}/PIL/PcfFontFile.py
+${PYSITELIB}/PIL/PcfFontFile.pyc
+${PYSITELIB}/PIL/PcxImagePlugin.py
+${PYSITELIB}/PIL/PcxImagePlugin.pyc
+${PYSITELIB}/PIL/PdfImagePlugin.py
+${PYSITELIB}/PIL/PdfImagePlugin.pyc
+${PYSITELIB}/PIL/PixarImagePlugin.py
+${PYSITELIB}/PIL/PixarImagePlugin.pyc
+${PYSITELIB}/PIL/PngImagePlugin.py
+${PYSITELIB}/PIL/PngImagePlugin.pyc
+${PYSITELIB}/PIL/PpmImagePlugin.py
+${PYSITELIB}/PIL/PpmImagePlugin.pyc
+${PYSITELIB}/PIL/PsdImagePlugin.py
+${PYSITELIB}/PIL/PsdImagePlugin.pyc
+${PYSITELIB}/PIL/SgiImagePlugin.py
+${PYSITELIB}/PIL/SgiImagePlugin.pyc
+${PYSITELIB}/PIL/SunImagePlugin.py
+${PYSITELIB}/PIL/SunImagePlugin.pyc
+${PYSITELIB}/PIL/TarIO.py
+${PYSITELIB}/PIL/TarIO.pyc
+${PYSITELIB}/PIL/TgaImagePlugin.py
+${PYSITELIB}/PIL/TgaImagePlugin.pyc
+${PYSITELIB}/PIL/TiffImagePlugin.py
+${PYSITELIB}/PIL/TiffImagePlugin.pyc
+${PYSITELIB}/PIL/TiffTags.py
+${PYSITELIB}/PIL/TiffTags.pyc
+${PYSITELIB}/PIL/WmfImagePlugin.py
+${PYSITELIB}/PIL/WmfImagePlugin.pyc
+${PYSITELIB}/PIL/XVThumbImagePlugin.py
+${PYSITELIB}/PIL/XVThumbImagePlugin.pyc
+${PYSITELIB}/PIL/XbmImagePlugin.py
+${PYSITELIB}/PIL/XbmImagePlugin.pyc
+${PYSITELIB}/PIL/XpmImagePlugin.py
+${PYSITELIB}/PIL/XpmImagePlugin.pyc
+${PYSITELIB}/PIL/__init__.py
+${PYSITELIB}/PIL/__init__.pyc
+${PYSITELIB}/PIL/_imaging.so
+@dirrm ${PYSITELIB}/PIL