4 files changed, 22 insertions, 24 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index b48b2acee792..0fd4cac8296b 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,27 +1,25 @@
 # New ports collection makefile for:    PIL
-# Version required:     0.3b2
+# Version required:     1.0
 # Date created:         02 November 1998
-# Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1999/02/02 08:04:14 asami Exp $
+# $Id: Makefile,v 1.5 1999/05/06 10:12:36 tg Exp $
 #
 
-DISTNAME=	Imaging-0.3b2
-PKGNAME=	py-imaging-0.3b2
+DISTNAME=	Imaging-1.0
+PKGNAME=	py-imaging-1.0
 CATEGORIES=	graphics python
 MASTER_SITES=	http://www.pythonware.com/downloads/ \
 		ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} py152.tgz
 
-MAINTAINER=	tg@FreeBSD.ORG
+MAINTAINER=	tg@FreeBSD.org
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 DIST_SUBDIR=	python
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/${DISTNAME}/libImaging
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jpeg=${PREFIX}/lib
@@ -32,13 +30,8 @@ PILDIR=		${PYTHONSCRIPTDIR}/site-packages/PIL
 PILDOCDIR=	${PREFIX}/share/doc/PIL
 PILEXDIR=	${PREFIX}/share/examples/PIL
 PILINCDIR=	${PREFIX}/include/python1.5
-TKINTERORIG=	${PYTHONSCRIPTDIR}/lib-dynload/_tkinter.so
 
 post-extract:
-	@(cd ${WRKDIR}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	    ${_DISTDIR}/py152.tgz ${EXTRACT_AFTER_ARGS} \
-	    Python-1.5.2/Modules/_tkinter.c Python-1.5.2/Modules/tkappinit.c)
-	@${MV} ${WRKDIR}/Python-1.5.2/Modules/* ${WRKSRC}/..
 	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..
 
 post-configure:
@@ -48,10 +41,6 @@ post-build:
 	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} sharedmods)
 
 do-install:
-	if test -f ${TKINTERORIG}; then \
-		${MV} ${TKINTERORIG} ${TKINTERORIG}.save; \
-	else true; \
-	fi
 	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} install)
 	@${MKDIR} ${PILDIR}
 	${INSTALL_DATA} ${WRKSRC}/../PIL/* ${PILDIR}
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index 36331339b929..e1ebc9db77d9 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,2 +1,2 @@
-MD5 (python/Imaging-0.3b2.tar.gz) = 843b3cd31b1a7f7acfc651630c8862bd
+MD5 (python/Imaging-1.0.tar.gz) = aa42c8a7eede77a54973a150c90af78a
 MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
diff --git a/graphics/py-imaging/files/Setup b/graphics/py-imaging/files/Setup
index bfddbd4ba17d..2eae4579e183 100644
--- a/graphics/py-imaging/files/Setup
+++ b/graphics/py-imaging/files/Setup
@@ -1,4 +1,3 @@
-*noconfig*
+*shared*
 
-_imaging _imaging.c decode.c encode.c map.c display.c path.c -IlibImaging libImaging/libImaging.a -I${PREFIX}/include -L${PREFIX}/lib -ljpeg -lz
-_tkinter _tkinter.c Tk/tkImaging.c tkappinit.c -DWITH_APPINIT -DWITH_PIL -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0 -L${PREFIX}/lib -ltk80 -ltcl80 -L${X11BASE}/lib -lX11 -lc
+_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 Tk/tkImaging.c -DWITH_TKINTER -I${X11BASE}/include -I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0 -L${PREFIX}/lib -ltk80 -ltcl80 -L${X11BASE}/lib -lX11
diff --git a/graphics/py-imaging/pkg-plist b/graphics/py-imaging/pkg-plist
index 2fcc58002d53..d8c496c0b804 100644
--- a/graphics/py-imaging/pkg-plist
+++ b/graphics/py-imaging/pkg-plist
@@ -67,6 +67,9 @@ 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
@@ -160,6 +163,9 @@ 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
@@ -169,9 +175,14 @@ 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/_tkinter.so
 share/doc/PIL/FORMATS
 share/doc/PIL/README
 share/examples/PIL/README
@@ -182,6 +193,7 @@ share/examples/PIL/gifmaker.py
 share/examples/PIL/image2py.py
 share/examples/PIL/painter.py
 share/examples/PIL/pilconvert.py
+share/examples/PIL/pildriver.py
 share/examples/PIL/pilfile.py
 share/examples/PIL/pilfont.py
 share/examples/PIL/pilprint.py
@@ -191,5 +203,3 @@ share/examples/PIL/viewer.py
 @dirrm lib/python1.5/site-packages/PIL
 @dirrm share/doc/PIL
 @dirrm share/examples/PIL
-@exec [ -f %D/lib/python1.5/lib-dynload/_tkinter.so ] && mv %D/lib/python1.5/lib-dynload/_tkinter.so %D/lib/python1.5/lib-dynload/_tkinter.so.save || true
-@unexec [ -f %D/lib/python1.5/lib-dynload/_tkinter.so.save ] && mv %D/lib/python1.5/lib-dynload/_tkinter.so.save %D/lib/python1.5/lib-dynload/_tkinter.so || true