>Number:         10807
>Category:       pkg
>Synopsis:       upate for py-imaging
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 10 13:12:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Jarkko Torppa
>Release:        1.4Y and 1.4.2
>Organization:
 Jarkko Torppa                torppa@staff.megabaud.fi
>Environment:
	
System: NetBSD polykoira.megabaud.fi 1.4.2 NetBSD 1.4.2 (POLY) #1: Wed Aug 9 19:57:22 EEST 2000 root@polykoira.megabaud.fi:/usr/src/sys/arch/i386/compile/POLY i386


>Description:
py-imaging is quite aged, with newer version it's much easier to build
Tkinter support in separate package
>How-To-Repeat:
check the distribution site
>Fix:
either get the tar from
http://staff.megabaud.fi/%7etorppa/py-imaging-1.1.tar.gz or apply this 
patch

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imaging/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2000/01/02 03:36:53	1.6
+++ Makefile	2000/08/10 20:05:10
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2000/01/02 03:36:53 wiz Exp $
 
-DISTNAME=	Imaging-1.0b1
-PKGNAME=	py-imaging-1.0b1
+DISTNAME=	Imaging-1.1
+PKGNAME=	py-imaging-1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pythonware.com/downloads/
 
@@ -28,16 +28,28 @@
 	(cd ${WRKSRC}/PIL; python ${PREFIX}/lib/python1.5/compileall.py .)
 	(cd ${WRKSRC}/PIL; python -O ${PREFIX}/lib/python1.5/compileall.py .)
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/python1.5/site-packages
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/python1.5/site-packages/PIL
+	${INSTALL_SCRIPT} ${WRKSRC}/PIL.pth \
 		${PREFIX}/lib/python1.5/site-packages
+	${INSTALL_SCRIPT} ${WRKSRC}/_imaging.so \
+		${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
+		${PREFIX}/lib/python1.5/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/python1.5/site-packages/,g' \
+		| ${SED} -e 's,^./,lib/python1.5/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/python1.5/site-packages/PIL" >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
Index: files/Setup.in
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imaging/files/Setup.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Setup.in
--- Setup.in	1998/12/26 23:42:01	1.1.1.1
+++ Setup.in	2000/08/10 20:05:10
@@ -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
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imaging/files/md5,v
retrieving revision 1.2
diff -u -r1.2 md5
--- md5	1999/04/14 15:54:47	1.2
+++ md5	2000/08/10 20:05:10
@@ -1,3 +1,3 @@
 $NetBSD: md5,v 1.2 1999/04/14 15:54:47 tsarna Exp $
 
-MD5 (python/Imaging-1.0b1.tar.gz) = 6882fc433402898839494fb6276d28cf
+MD5 (python/Imaging-1.1.tar.gz) = 8f9a338b65b774747e8585d679e8622e
Index: pkg/PLIST.pre
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imaging/pkg/PLIST.pre,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST.pre
--- PLIST.pre	1998/12/26 23:42:01	1.1.1.1
+++ PLIST.pre	2000/08/10 20:05:10
@@ -1,2 +1,3 @@
 @comment $NetBSD: PLIST.pre,v 1.1.1.1 1998/12/26 23:42:01 tsarna Exp $
-lib/python1.5/site-packages/_imaging.so
+lib/python1.5/site-packages/PIL.pth
+lib/python1.5/site-packages/PIL/_imaging.so

>Release-Note:
>Audit-Trail:
>Unformatted: