update to 1.1.3

changes:
+ Adapted to Python 1.6, 2.0, 2.1 and 2.2.  This version also
  runs under 1.5.2, but probably not under versions older than
  that.
+ To reduce module dependencies, the Tkinter support has been
  moved to a separate binary module.
+ The JPEG decoder is more tolerant for broken files.  As long
  as all image data can be read, it won't complain.
+ An ANTIALIAS downsampling filter has been added.
+ Includes distutils build script (setup.py) for 2.0 and later.
+ The usual crop of bug fixes and performance tweaks.

6 files changed, 235 insertions, 58 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 547e6f8a9d8..e814ca7897b 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/02/14 11:39:46 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/03 20:31:02 drochner Exp $
 
-DISTNAME=	Imaging-1.1.2
-PKGNAME=	${PYPKGPREFIX}-imaging-1.1.2
+DISTNAME=	Imaging-1.1.3
+PKGNAME=	${PYPKGPREFIX}-imaging-1.1.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pythonware.com/downloads/
 
@@ -9,56 +9,21 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
 COMMENT=	PIL, the Python Imaging Library
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
+#DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
 DIST_SUBDIR=    python
-
-PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
-
-# this pkg uses Makefile.pre.in
-PYTHON_VERSIONS_ACCEPTED=	20 21
-BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21=	python21>=2.1.1nb1
-
+PYDISTUTILSPKG= yes
 PY_PATCHPLIST=	yes
+GNU_CONGIGURE=	yes
+USE_BUILDLINK2=	yes
 
 do-configure:
-	(cd ${WRKSRC}/libImaging; CC="cc -fPIC" LIBS="${LDFLAGS}" ./configure)
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/Setup.in \
-		>${WRKSRC}/Setup.in
-	${CP} ${LOCALBASE}/${PYLIB}/config/Makefile.pre.in ${WRKSRC}
-	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
-
-do-build:
-	(cd ${WRKSRC}/libImaging; ${SETENV} ${MAKE_ENV} ${MAKE}; cd ..; ${MAKE})
-
-post-build:
-	(cd ${WRKSRC}/PIL; ${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py .)
-	(cd ${WRKSRC}/PIL; ${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py .)
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}
-	${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}/PIL
-	${INSTALL_SCRIPT} ${WRKSRC}/PIL.pth \
-		${PREFIX}/${PYSITELIB}
-	${INSTALL_SCRIPT} ${WRKSRC}/_imaging.so \
-		${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
-		${PREFIX}/${PYSITELIB}/PIL
-	${INSTALL_DATA_DIR} ${PREFIX}/${PYINC}/PIL
-	${INSTALL_DATA} ${WRKSRC}/libImaging/*.h ${PREFIX}/${PYINC}/PIL
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}/PIL; ${FIND} . -name \*.py\* -print \
-		| ${SED} -e 's,^./,${PYSITELIB}/PIL/,g' \
-		>>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} ${PYINC}/PIL -type f -print >>${PLIST_SRC})
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging
-	(cd ${WRKSRC}/Scripts; \
-	 for i in  README bdf2pil.py explode.py gifmaker.py image2py.py pil*.py; do \
-	 ${INSTALL_DATA} $$i ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging; \
-	 ${ECHO} share/examples/${PYPKGPREFIX}-imaging/$$i >>${PLIST_SRC}; done )
-	${ECHO} "@dirrm share/examples/${PYPKGPREFIX}-imaging" >>${PLIST_SRC}
-	${ECHO} "@dirrm ${PYINC}/PIL" >>${PLIST_SRC}
-	${ECHO} "@dirrm ${PYSITELIB}/PIL" >> ${PLIST_SRC}
+	(cd ${WRKSRC}/libImaging && ${SETENV} ${CONFIGURE_ENV} ./configure \
+	 ${CONFIGURE_ARGS} && ${SETENV} ${MAKE_ENV} ${MAKE})
+	${SED} "s|@JPEGDIR@|${BUILDLINK_PREFIX.jpeg}|g" <${WRKSRC}/setup.py \
+	 >${WRKSRC}/setup.py.tmp && ${MV} -f ${WRKSRC}/setup.py.tmp \
+	 ${WRKSRC}/setup.py
 
 .include "../../lang/python/extension.buildlink.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/PLIST b/graphics/py-imaging/PLIST
new file mode 100644
index 00000000000..33109fd925c
--- /dev/null
+++ b/graphics/py-imaging/PLIST
@@ -0,0 +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
diff --git a/graphics/py-imaging/PLIST.pre b/graphics/py-imaging/PLIST.pre
deleted file mode 100644
index fc9abf03f1e..00000000000
--- a/graphics/py-imaging/PLIST.pre
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.2 2002/01/19 17:34:25 drochner Exp $
-${PYSITELIB}/PIL.pth
-${PYSITELIB}/PIL/_imaging.so
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index a17dc571b60..a3191831cf8 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/02/14 11:39:46 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/09/03 20:31:02 drochner Exp $
 
-SHA1 (python/Imaging-1.1.2.tar.gz) = 506e714bbac14a9f531ec529b8010ffc3a7f85f8
-Size (python/Imaging-1.1.2.tar.gz) = 336739 bytes
-SHA1 (patch-aa) = 6ba6af7d779894ad4a024f84430c55bae56bdd59
+SHA1 (python/Imaging-1.1.3.tar.gz) = a926c722f26f2b19cd2eaf052fc5db1940d68e4b
+Size (python/Imaging-1.1.3.tar.gz) = 346194 bytes
+SHA1 (patch-aa) = fbc1fb67af7c024e379216e03993786365082dde
+SHA1 (patch-ab) = e7800848d9cab91261c6df129e1a6c9809228aad
diff --git a/graphics/py-imaging/patches/patch-aa b/graphics/py-imaging/patches/patch-aa
index 340db2f5cb2..73fe8edc0a1 100644
--- a/graphics/py-imaging/patches/patch-aa
+++ b/graphics/py-imaging/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2001/03/10 13:46:30 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/09/03 20:31:03 drochner Exp $
 
---- libImaging/Makefile.in.org	Thu Dec 28 00:47:57 2000
-+++ libImaging/Makefile.in	Thu Dec 28 00:49:51 2000
+--- libImaging/Makefile.in.orig	Sun Mar 10 17:57:40 2002
++++ libImaging/Makefile.in	Tue Sep  3 21:16:00 2002
 @@ -30,7 +30,7 @@
  # Other things that are customizable but not by configure
  
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.2 2001/03/10 13:46:30 wiz Exp $
  OPT=		@OPT@
  #OPT=		-g
  CFLAGS=		$(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)
+@@ -81,7 +81,7 @@
+ all:		coretest $(LIB)
+ 
+ coretest:	coretest.o $(LIB)
+-		$(CC) -o coretest coretest.o $(LIB) $(LIBS)
++		$(CC) $(LDFLAGS) -o coretest coretest.o $(LIB) $(LIBS)
+ 
+ $(LIB):		$& $(OBJS)
+ 		-rm -f $(LIB)
diff --git a/graphics/py-imaging/patches/patch-ab b/graphics/py-imaging/patches/patch-ab
new file mode 100644
index 00000000000..e3fb1ed98fd
--- /dev/null
+++ b/graphics/py-imaging/patches/patch-ab
@@ -0,0 +1,79 @@
+$NetBSD: patch-ab,v 1.1 2002/09/03 20:31:03 drochner Exp $
+
+--- setup.py.orig	Thu Mar 14 20:55:04 2002
++++ setup.py	Tue Sep  3 21:53:45 2002
+@@ -23,7 +23,7 @@
+ 
+ # on windows, the build script expects to find both library files and
+ # include files in the directories below.  tweak as necessary.
+-JPEGDIR = "../../kits/jpeg-6b"
++JPEGDIR = "/usr/pkg"
+ ZLIBDIR = "../../kits/zlib-1.1.3"
+ 
+ # on windows, the following is used to control how and where to search
+@@ -61,6 +61,8 @@
+                 LIBRARY_DIRS.append(JPEGDIR)
+             else:
+                 LIBRARIES.append("jpeg")
++		INCLUDE_DIRS.append(JPEGDIR + "/include")
++		LIBRARY_DIRS.append(JPEGDIR + "/lib")
+         elif lib == "TIFF":
+             HAVE_LIBTIFF = 1
+             LIBRARIES.append("tiff")
+@@ -109,56 +111,6 @@
+                 break
+ 
+ # --------------------------------------------------------------------
+-# configure imagingtk module
+-
+-try:
+-    import _tkinter
+-    TCL_VERSION = _tkinter.TCL_VERSION[:3]
+-except (ImportError, AttributeError):
+-    pass
+-else:
+-    INCLUDE_DIRS = ["libImaging"]
+-    LIBRARY_DIRS = ["libImaging"]
+-    LIBRARIES = ["Imaging"]
+-    if sys.platform == "win32":
+-        # locate tcl/tk on windows
+-        if TCLROOT:
+-            path = [TCLROOT]
+-        else:
+-            path = [
+-                os.path.join("/py" + PY_VERSION, "Tcl"),
+-                os.path.join(os.environ.get("ProgramFiles", ""), "Tcl"),
+-                # FIXME: add more directories here?
+-                ]
+-        for root in path:
+-            TCLROOT = os.path.abspath(root)
+-            if os.path.isfile(os.path.join(TCLROOT, "include", "tk.h")):
+-                break
+-        else:
+-            print "*** cannot find Tcl/Tk headers and library files"
+-            print "    change the TCLROOT variable in the setup.py file"
+-            sys.exit(1)
+-
+-        # print "using Tcl/Tk libraries at", TCLROOT
+-        # print "using Tcl/Tk version", TCL_VERSION
+-
+-        version = TCL_VERSION[0] + TCL_VERSION[2]
+-        INCLUDE_DIRS.append(os.path.join(TCLROOT, "include"))
+-        LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib"))
+-        LIBRARIES.extend(["tk" + version, "tcl" + version])
+-    else:
+-        # assume the libraries are installed in the default location
+-        LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
+-
+-    MODULES.append(
+-        Extension(
+-            "_imagingtk",
+-            ["_imagingtk.c", "Tk/tkImaging.c"],
+-            include_dirs=INCLUDE_DIRS,
+-            library_dirs=LIBRARY_DIRS,
+-            libraries=LIBRARIES
+-            )
+-        )
+ 
+ # build!
+