Update to 1.1.1, provided by Jarkko Torppa in pkg/10807.

Major changes since 1.0b1:
RGBa support, improved 16bit support, PCX support, improved GIF encoder,
and lots of bugfixes.

6 files changed, 33 insertions, 18 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index cb661b881ad..474e5f8855e 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/10 13:46:29 wiz Exp $
 
-DISTNAME=	Imaging-1.0b1
-PKGNAME=	py-imaging-1.0b1
+DISTNAME=	Imaging-1.1.1
+PKGNAME=	py-imaging-1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pythonware.com/downloads/
 
@@ -29,16 +29,28 @@ post-build:
 	(cd ${WRKSRC}/PIL; python ${PREFIX}/lib/python2.0/compileall.py .)
 	(cd ${WRKSRC}/PIL; python -O ${PREFIX}/lib/python2.0/compileall.py .)
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/python2.0/site-packages
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/python2.0/site-packages/PIL
+	${INSTALL_SCRIPT} ${WRKSRC}/PIL.pth \
 		${PREFIX}/lib/python2.0/site-packages
+	${INSTALL_SCRIPT} ${WRKSRC}/_imaging.so \
+		${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
+		${PREFIX}/lib/python2.0/site-packages/PIL
 	${INSTALL_DATA_DIR} ${PREFIX}/include/PIL
 	${INSTALL_DATA} ${WRKSRC}/libImaging/*.h ${PREFIX}/include/PIL
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 	(cd ${WRKSRC}/PIL; ${FIND} . -name \*.py\* -print \
-		| ${SED} -e 's,^./,lib/python2.0/site-packages/,g' \
+		| ${SED} -e 's,^./,lib/python2.0/site-packages/PIL/,g' \
 		>>${PLIST_SRC})
 	(cd ${PREFIX}; ${FIND} include/PIL -type f -print >>${PLIST_SRC})
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-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/py-imaging; \
+	 ${ECHO} share/examples/py-imaging/$$i >>${PLIST_SRC}; done )
+	${ECHO} "@dirrm share/examples/py-imaging" >>${PLIST_SRC}
 	${ECHO} "@dirrm include/PIL" >>${PLIST_SRC}
+	${ECHO} "@dirrm lib/python2.0/site-packages/PIL" >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/files/Setup.in b/graphics/py-imaging/files/Setup.in
index 4204ba36c96..69d7c1b25b0 100644
--- a/graphics/py-imaging/files/Setup.in
+++ b/graphics/py-imaging/files/Setup.in
@@ -1,4 +1,4 @@
-# $NetBSD: Setup.in,v 1.1.1.1 1998/12/26 23:42:01 tsarna Exp $
+# $NetBSD: Setup.in,v 1.2 2001/03/10 13:46:30 wiz Exp $
 #
 
 *shared*
@@ -9,6 +9,6 @@
 # 6.0a and zlib 1.0.4 (or newer versions of these libraries) in a
 # standard location.
 
-_imaging _imaging.c decode.c encode.c map.c display.c path.c \
+_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 -R@PREFIX@/lib -ljpeg -lz
diff --git a/graphics/py-imaging/files/md5 b/graphics/py-imaging/files/md5
index bfff1c00b4f..e3dffc6351a 100644
--- a/graphics/py-imaging/files/md5
+++ b/graphics/py-imaging/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/04/14 15:54:47 tsarna Exp $
+$NetBSD: md5,v 1.3 2001/03/10 13:46:30 wiz Exp $
 
-MD5 (python/Imaging-1.0b1.tar.gz) = 6882fc433402898839494fb6276d28cf
+SHA1 (python/Imaging-1.1.1.tar.gz) = 5262a4388ab0723dc0c5fd3c04c222aff616b7a9
diff --git a/graphics/py-imaging/files/patch-sum b/graphics/py-imaging/files/patch-sum
index 40be52d74c3..3ac8ca370f2 100644
--- a/graphics/py-imaging/files/patch-sum
+++ b/graphics/py-imaging/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/09/20 04:58:31 sakamoto Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/10 13:46:30 wiz Exp $
 
-MD5 (patch-aa) = ffb7e1901394acdd1cd078999a831064
+SHA1 (patch-aa) = 6ba6af7d779894ad4a024f84430c55bae56bdd59
diff --git a/graphics/py-imaging/patches/patch-aa b/graphics/py-imaging/patches/patch-aa
index a7793c4b911..340db2f5cb2 100644
--- a/graphics/py-imaging/patches/patch-aa
+++ b/graphics/py-imaging/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.1 1999/09/20 04:58:32 sakamoto Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/10 13:46:30 wiz Exp $
 
---- ./libImaging/Makefile.in.orig	Sun Jan 10 05:00:22 1999
-+++ ./libImaging/Makefile.in	Mon Sep 20 09:02:53 1999
-@@ -31,5 +31,5 @@
+--- libImaging/Makefile.in.org	Thu Dec 28 00:47:57 2000
++++ libImaging/Makefile.in	Thu Dec 28 00:49:51 2000
+@@ -30,7 +30,7 @@
+ # Other things that are customizable but not by configure
  
  INCLDIR=	$(srcdir)/.
 -JPEGINCLUDE=	/usr/local/include
 +JPEGINCLUDE=	$(PREFIX)/include
  OPT=		@OPT@
  #OPT=		-g
+ CFLAGS=		$(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)
diff --git a/graphics/py-imaging/pkg/PLIST.pre b/graphics/py-imaging/pkg/PLIST.pre
index d5a796b4a84..b4b905f3151 100644
--- a/graphics/py-imaging/pkg/PLIST.pre
+++ b/graphics/py-imaging/pkg/PLIST.pre
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.pre,v 1.2 2000/12/28 15:08:46 wiz Exp $
-lib/python2.0/site-packages/_imaging.so
+@comment $NetBSD: PLIST.pre,v 1.3 2001/03/10 13:46:30 wiz Exp $
+lib/python2.0/site-packages/PIL.pth
+lib/python2.0/site-packages/PIL/_imaging.so