Attachment #54403 for bug #82327

View | Details | Raw Unified | Return to bug 82327
Collapse All | Expand All




#

PORTNAME=	imaging
PORTVERSION=	1.1.5
CATEGORIES=	graphics python
MASTER_SITES=	http://effbot.org/downloads/ \
	        http://www.pythonware.net/storage/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=	Imaging-${PORTVERSION}


		freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter

DIST_SUBDIR=	 python
USE_PYTHON=	 yes
USE_PYDISTUTILS= yes

DOCDIR=		${PREFIX}/share/doc/py-imaging
EXAMPLEDIR=	${PREFIX}/share/examples/py-imaging
MAKE_FLAGS=	OPT="${CFLAGS} -fPIC"

.include <bsd.port.pre.mk>

PILDIR=		${PYTHON_SITELIBDIR}/PIL
PILDOCDIR=	${PREFIX}/share/doc/PIL
PILEXDIR=	${PREFIX}/share/examples/PIL
PILINCDIR=	${PREFIX}/include/${PYTHON_VERSION}

post-install:
.for file in ImPlatform.h Imaging.h
	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${PILINCDIR}

do-install:
	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS})
	@${MKDIR} ${PILDOCDIR}
	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
	@${MKDIR} ${PILEXDIR}
	${INSTALL_DATA} ${WRKSRC}/../Scripts/* ${PILEXDIR}
.for file in ImConfig.h ImPlatform.h Imaging.h
	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
.endfor
.else
post-extract:
	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..

post-configure:
	@(cd ${WRKSRC}/..; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)

post-build:
	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} sharedmods)

do-install:
	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} install)
	@${MKDIR} ${PILDIR}
	${INSTALL_DATA} ${WRKSRC}/../PIL/* ${PILDIR}
	${INSTALL_DATA} ${WRKSRC}/../PIL.pth ${PILDIR}/..
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
	@${MKDIR} ${PILDOCDIR}
	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
	@${MKDIR} ${PILEXDIR}
	${INSTALL_DATA} ${WRKSRC}/../Scripts/* ${PILEXDIR}
.for file in ImConfig.h ImPlatform.h Imaging.h
	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
.endfor
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCDIR}
	${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCDIR}
	@${MKDIR} ${EXAMPLEDIR}
	${INSTALL_DATA} ${WRKSRC}/Scripts/* ${EXAMPLEDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)py-imaging/distinfo (-2 / +2 lines)
1	MD5 (python/Imaging-1.1.4.tar.gz) = d2c03c25a9a0128832137dd536da88da	1	MD5 (python/Imaging-1.1.5.tar.gz) = a64512e39469213ced0d091b9eba76c0
2	SIZE (python/Imaging-1.1.4.tar.gz) = 416338	2	SIZE (python/Imaging-1.1.5.tar.gz) = 429570

Lines 1-5 Link Here

(-)py-imaging/files/Setup (-5 lines)
1	shared
2
3	_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
4	_imagingft _imagingft.c -IlibImaging -I${PREFIX}/include -I${PREFIX}/include/freetype2 -L${PREFIX}/lib -lfreetype
5	_imagingtk _imagingtk.c Tk/tkImaging.c -IlibImaging -I${X11BASE}/include -I${PREFIX}/include/tcl8.4 -I${PREFIX}/include/tk8.4 -L${PREFIX}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11




--- ../Makefile.pre.in.orig	Tue Apr 22 09:11:24 2003
+++ ../Makefile.pre.in	Fri Aug  8 12:08:07 2003
@@ -92,7 +92,7 @@
 TARGET=		python
 
 # Installed python binary (used only by boot target)
-PYTHON=		python
+PYTHON?=		python
 
 # Add more -I and -D options here
 CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -117,7 +117,7 @@
 SGI_ABI=	@SGI_ABI@
 OPT=		@OPT@
 LDFLAGS=	@LDFLAGS@
-DEFS=		@DEFS@
+DEFS=
 LIBS=		@LIBS@
 LIBM=		@LIBM@
 LIBC=		@LIBC@
@@ -153,7 +153,7 @@
 INCLUDEPY=	$(INCLUDEDIR)/python$(VERSION)
 EXECINCLUDEPY=	$(exec_installdir)/include/python$(VERSION)
 LIBP=		$(exec_installdir)/lib/python$(VERSION)
-DESTSHARED=	$(BINLIBDEST)/site-packages
+DESTSHARED=	$(BINLIBDEST)/site-packages/PIL
 
 LIBPL=		$(LIBP)/config
 




--- ../_imagingft.c.orig	Mon Mar 22 23:27:33 2004
+++ ../_imagingft.c	Mon Mar 22 23:28:03 2004
@@ -15,7 +15,8 @@
 #include "Python.h"
 #include "Imaging.h"
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #if PY_VERSION_HEX < 0x01060000
 #define PyObject_DEL(op) PyMem_DEL((op))




--- Makefile.in.orig	Sun Jul 19 16:34:24 1998
+++ Makefile.in	Wed Nov  4 10:00:01 1998
@@ -25,13 +25,13 @@
 
 DEFS=		@DEFS@
 
-LIBS=		@LIBS@ @LIBM@
+LIBS=		@LDFLAGS@ @LIBS@ @LIBM@
 
 # --------------------------------------------------------------------
 # 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)




--- ./setup.py	Wed Mar 23 13:16:40 2005
+++ ./setup.py	Thu Jun 16 13:24:28 2005
@@ -129,14 +129,25 @@
 if os.path.exists('/sw/lib'):
     LIBRARY_DIRS.append('/sw/lib')
 
         prefix = sysconfig.get_config_var("prefix")
         if prefix:
-            add_directory(library_dirs, os.path.join(prefix, "lib"))
-            add_directory(include_dirs, os.path.join(prefix, "include"))
+            add_directory(library_dirs,
+                          os.path.join(os.getenv("PREFIX"), "lib"))
+            add_directory(include_dirs,
+                          os.path.join(os.getenv("PREFIX"), "include"))
+            add_directory(include_dirs,
+                          os.path.join(os.getenv("X11BASE"), "include"))
+    INCLUDE_DIRS.append(os.path.join(os.getenv("X11BASE"), "include"))
+    INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
+									 "include/tcl%s" % TCL_VERSION))
+    INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
+									 "include/tk%s" % TCL_VERSION))
     LIBRARY_DIRS = ["libImaging"]
+    LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
     LIBRARIES = ["Imaging"]
     EXTRA_COMPILE_ARGS = None
     EXTRA_LINK_ARGS = None
@@ -206,7 +215,8 @@
 
         #
         # locate tkinter libraries
-            LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
+            version = TCL_VERSION[0] + TCL_VERSION[2]
+            LIBRARIES.extend(["tk" + version, "tcl" + version])
             HAVE_TCLTK = 1
 
         if _tkinter:
             TCL_VERSION = _tkinter.TCL_VERSION[:3]
+            TK_VERSION = _tkinter.TK_VERSION[:3]
+            add_directory(include_dirs,
+                          os.path.join(os.getenv("PREFIX"),
+                                       "include/tcl%s" % TCL_VERSION))
+            add_directory(include_dirs,
+                          os.path.join(os.getenv("PREFIX"),
+                                       "include/tk%s" % TK_VERSION))
 
         if _tkinter and not TCL_ROOT:
             # we have Tkinter but the TCL_ROOT variable was not set;
+        LIBRARY_DIRS.append("/usr/local/lib")
     elif os.path.isdir("/sw/include/freetype2"):
         # assume that the freetype library is installed in a
         # standard location

Lines 1-4 Link Here

(-)py-imaging/pkg-plist (-22 / +120 lines)
1	include/%%PYTHON_VERSION%%/ImConfig.h	1	bin/pilconvert.py
		2	bin/pildriver.py
		3	bin/pilfile.py
		4	bin/pilfont.py
		5	bin/pilprint.py
2	include/%%PYTHON_VERSION%%/ImPlatform.h	6	include/%%PYTHON_VERSION%%/ImPlatform.h
3	include/%%PYTHON_VERSION%%/Imaging.h	7	include/%%PYTHON_VERSION%%/Imaging.h
4	lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.py	8	lib/%%PYTHON_VERSION%%/site-packages/PIL/ArgImagePlugin.py
Lines 10-15 Link Here
10	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.py	14	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.py
11	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyc	15	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyc
12	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyo	16	lib/%%PYTHON_VERSION%%/site-packages/PIL/BmpImagePlugin.pyo
		17	lib/%%PYTHON_VERSION%%/site-packages/PIL/BufrStubImagePlugin.py
		18	lib/%%PYTHON_VERSION%%/site-packages/PIL/BufrStubImagePlugin.pyc
		19	lib/%%PYTHON_VERSION%%/site-packages/PIL/BufrStubImagePlugin.pyo
13	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.py	20	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.py
14	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyc	21	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyc
15	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyo	22	lib/%%PYTHON_VERSION%%/site-packages/PIL/ContainerIO.pyo
Lines 25-30 Link Here
25	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.py	32	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.py
26	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyc	33	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyc
27	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyo	34	lib/%%PYTHON_VERSION%%/site-packages/PIL/ExifTags.pyo
		35	lib/%%PYTHON_VERSION%%/site-packages/PIL/FitsStubImagePlugin.py
		36	lib/%%PYTHON_VERSION%%/site-packages/PIL/FitsStubImagePlugin.pyc
		37	lib/%%PYTHON_VERSION%%/site-packages/PIL/FitsStubImagePlugin.pyo
28	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.py	38	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.py
29	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyc	39	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyc
30	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyo	40	lib/%%PYTHON_VERSION%%/site-packages/PIL/FliImagePlugin.pyo
Lines 49-54 Link Here
49	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.py	59	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.py
50	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyc	60	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyc
51	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyo	61	lib/%%PYTHON_VERSION%%/site-packages/PIL/GimpPaletteFile.pyo
		62	lib/%%PYTHON_VERSION%%/site-packages/PIL/GribStubImagePlugin.py
		63	lib/%%PYTHON_VERSION%%/site-packages/PIL/GribStubImagePlugin.pyc
		64	lib/%%PYTHON_VERSION%%/site-packages/PIL/GribStubImagePlugin.pyo
		65	lib/%%PYTHON_VERSION%%/site-packages/PIL/Hdf5StubImagePlugin.py
		66	lib/%%PYTHON_VERSION%%/site-packages/PIL/Hdf5StubImagePlugin.pyc
		67	lib/%%PYTHON_VERSION%%/site-packages/PIL/Hdf5StubImagePlugin.pyo
		68	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcnsImagePlugin.py
		69	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcnsImagePlugin.pyc
		70	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcnsImagePlugin.pyo
52	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.py	71	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.py
53	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyc	72	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyc
54	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyo	73	lib/%%PYTHON_VERSION%%/site-packages/PIL/IcoImagePlugin.pyo
Lines 82-87 Link Here
82	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.py	101	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.py
83	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyc	102	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyc
84	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyo	103	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageFont.pyo
		104	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGL.py
		105	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGL.pyc
		106	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGL.pyo
85	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.py	107	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.py
86	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyc	108	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyc
87	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyo	109	lib/%%PYTHON_VERSION%%/site-packages/PIL/ImageGrab.pyo
Lines 169-174 Link Here
169	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.py	191	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.py
170	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyc	192	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyc
171	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyo	193	lib/%%PYTHON_VERSION%%/site-packages/PIL/SgiImagePlugin.pyo
		194	lib/%%PYTHON_VERSION%%/site-packages/PIL/SpiderImagePlugin.py
		195	lib/%%PYTHON_VERSION%%/site-packages/PIL/SpiderImagePlugin.pyc
		196	lib/%%PYTHON_VERSION%%/site-packages/PIL/SpiderImagePlugin.pyo
172	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.py	197	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.py
173	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyc	198	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyc
174	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyo	199	lib/%%PYTHON_VERSION%%/site-packages/PIL/SunImagePlugin.pyo
Lines 199-227 Link Here
199	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py	224	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py
200	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc	225	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc
201	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo	226	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo
202	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imaging.so
203	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imagingft.so
204	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imagingtk.so
205	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py	227	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py
206	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc	228	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc
207	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo	229	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo
		230	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imaging.so
		231	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imagingft.so
		232	lib/%%PYTHON_VERSION%%/site-packages/PIL/_imagingtk.so
208	lib/%%PYTHON_VERSION%%/site-packages/PIL.pth	233	lib/%%PYTHON_VERSION%%/site-packages/PIL.pth
209	share/doc/PIL/README
210	share/examples/PIL/README
211	share/examples/PIL/bdf2pil.py
212	share/examples/PIL/enhancer.py
213	share/examples/PIL/explode.py
214	share/examples/PIL/gifmaker.py
215	share/examples/PIL/image2py.py
216	share/examples/PIL/painter.py
217	share/examples/PIL/pilconvert.py
218	share/examples/PIL/pildriver.py
219	share/examples/PIL/pilfile.py
220	share/examples/PIL/pilfont.py
221	share/examples/PIL/pilprint.py
222	share/examples/PIL/player.py
223	share/examples/PIL/thresholder.py
224	share/examples/PIL/viewer.py
225	@dirrm lib/%%PYTHON_VERSION%%/site-packages/PIL	234	@dirrm lib/%%PYTHON_VERSION%%/site-packages/PIL
226	@dirrm share/doc/PIL	235	%%PORTDOCS%%share/doc/py-imaging/effbot.css
227	@dirrm share/examples/PIL	236	%%PORTDOCS%%share/doc/py-imaging/index.html
		237	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ArgImagePlugin.html
		238	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.BdfFontFile.html
		239	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.BmpImagePlugin.html
		240	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.BufrStubImagePlugin.html
		241	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ContainerIO.html
		242	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.CurImagePlugin.html
		243	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.DcxImagePlugin.html
		244	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.EpsImagePlugin.html
		245	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ExifTags.html
		246	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.FitsStubImagePlugin.html
		247	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.FliImagePlugin.html
		248	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.FontFile.html
		249	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.FpxImagePlugin.html
		250	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GbrImagePlugin.html
		251	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GdImageFile.html
		252	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GifImagePlugin.html
		253	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GimpGradientFile.html
		254	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GimpPaletteFile.html
		255	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.GribStubImagePlugin.html
		256	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.Hdf5StubImagePlugin.html
		257	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.IcnsImagePlugin.html
		258	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.IcoImagePlugin.html
		259	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImImagePlugin.html
		260	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.Image.html
		261	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageChops.html
		262	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageColor.html
		263	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageDraw.html
		264	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageEnhance.html
		265	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageFile.html
		266	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageFileIO.html
		267	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageFilter.html
		268	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageFont.html
		269	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageGL.html
		270	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageGrab.html
		271	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageOps.html
		272	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImagePalette.html
		273	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImagePath.html
		274	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageSequence.html
		275	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageStat.html
		276	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageTk.html
		277	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageTransform.html
		278	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImageWin.html
		279	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.ImtImagePlugin.html
		280	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.IptcImagePlugin.html
		281	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.JpegImagePlugin.html
		282	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.McIdasImagePlugin.html
		283	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.MicImagePlugin.html
		284	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.MpegImagePlugin.html
		285	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.MspImagePlugin.html
		286	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.OleFileIO.html
		287	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PSDraw.html
		288	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PaletteFile.html
		289	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PalmImagePlugin.html
		290	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PcdImagePlugin.html
		291	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PcfFontFile.html
		292	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PcxImagePlugin.html
		293	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PdfImagePlugin.html
		294	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PixarImagePlugin.html
		295	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PngImagePlugin.html
		296	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PpmImagePlugin.html
		297	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.PsdImagePlugin.html
		298	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.SgiImagePlugin.html
		299	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.SpiderImagePlugin.html
		300	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.SunImagePlugin.html
301	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.TarIO.html
302	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.TgaImagePlugin.html
303	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.TiffImagePlugin.html
304	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.TiffTags.html
305	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.WalImageFile.html
306	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.WmfImagePlugin.html
307	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.XVThumbImagePlugin.html
308	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.XbmImagePlugin.html
309	%%PORTDOCS%%share/doc/py-imaging/pythondoc-PIL.XpmImagePlugin.html
310	%%PORTDOCS%%@dirrm share/doc/py-imaging
311	%%PORTDOCS%%share/examples/py-imaging/README
312	%%PORTDOCS%%share/examples/py-imaging/enhancer.py
313	%%PORTDOCS%%share/examples/py-imaging/explode.py
314	%%PORTDOCS%%share/examples/py-imaging/gifmaker.py
315	%%PORTDOCS%%share/examples/py-imaging/image2py.py
316	%%PORTDOCS%%share/examples/py-imaging/painter.py
317	%%PORTDOCS%%share/examples/py-imaging/pilconvert.py
318	%%PORTDOCS%%share/examples/py-imaging/pildriver.py
319	%%PORTDOCS%%share/examples/py-imaging/pilfile.py
320	%%PORTDOCS%%share/examples/py-imaging/pilfont.py
321	%%PORTDOCS%%share/examples/py-imaging/pilprint.py
322	%%PORTDOCS%%share/examples/py-imaging/player.py
323	%%PORTDOCS%%share/examples/py-imaging/thresholder.py
324	%%PORTDOCS%%share/examples/py-imaging/viewer.py
325	%%PORTDOCS%%@dirrm share/examples/py-imaging

Return to bug 82327

Lines 6-14 Link Here

(-)py-imaging/Makefile (-48 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= imaging	8	PORTNAME= imaging
9	PORTVERSION= 1.1.4	9	PORTVERSION= 1.1.5
10	CATEGORIES= graphics python	10	CATEGORIES= graphics python
11	MASTER_SITES= http://www.pythonware.net/storage/	11	MASTER_SITES= http://effbot.org/downloads/ \
		12	http://www.pythonware.net/storage/
12	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
13	DISTNAME= Imaging-${PORTVERSION}	14	DISTNAME= Imaging-${PORTVERSION}
14		15
Lines 20-76 Link Here
20	freetype.9:${PORTSDIR}/print/freetype2	21	freetype.9:${PORTSDIR}/print/freetype2
21	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter	22	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
22		23
23	DIST_SUBDIR= python	24	DIST_SUBDIR= python
24	USE_PYTHON= yes	25	USE_PYTHON= yes
25	WRKSRC= ${WRKDIR}/${DISTNAME}/libImaging	26	USE_PYDISTUTILS= yes
26	GNU_CONFIGURE= yes	27
27	CONFIGURE_ARGS= --with-jpeg=${PREFIX}/lib	28	DOCDIR= ${PREFIX}/share/doc/py-imaging
28	CONFIGURE_ENV= PYTHON=${PYTHON_CMD}	29	EXAMPLEDIR= ${PREFIX}/share/examples/py-imaging
29	MAKE_FLAGS= OPT="${CFLAGS} -fPIC"
30		30
31	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
32		32
33	PILDIR= ${PYTHON_SITELIBDIR}/PIL
34	PILDOCDIR= ${PREFIX}/share/doc/PIL
35	PILEXDIR= ${PREFIX}/share/examples/PIL
36	PILINCDIR= ${PREFIX}/include/${PYTHON_VERSION}	33	PILINCDIR= ${PREFIX}/include/${PYTHON_VERSION}
37		34
38	.if ${PYTHON_REL} > 200	35	post-install:
39	post-build:	36	.for file in ImPlatform.h Imaging.h
40	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} build ${PYDISTUTILS_BUILDARGS})	37	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${PILINCDIR}
41
42	do-install:
43	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS})
44	@${MKDIR} ${PILDOCDIR}
45	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
46	@${MKDIR} ${PILEXDIR}
47	${INSTALL_DATA} ${WRKSRC}/../Scripts/* ${PILEXDIR}
48	.for file in ImConfig.h ImPlatform.h Imaging.h
49	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
50	.endfor
51	.else
52	post-extract:
53	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..
54
55	post-configure:
56	@(cd ${WRKSRC}/..; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
57
58	post-build:
59	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} sharedmods)
60
61	do-install:
62	@(cd ${WRKSRC}/..; ${SETENV} ${MAKE_ENV} ${MAKE} install)
63	@${MKDIR} ${PILDIR}
64	${INSTALL_DATA} ${WRKSRC}/../PIL/* ${PILDIR}
65	${INSTALL_DATA} ${WRKSRC}/../PIL.pth ${PILDIR}/..
66	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
67	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PILDIR}
68	@${MKDIR} ${PILDOCDIR}
69	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
70	@${MKDIR} ${PILEXDIR}
71	${INSTALL_DATA} ${WRKSRC}/../Scripts/* ${PILEXDIR}
72	.for file in ImConfig.h ImPlatform.h Imaging.h
73	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
74	.endfor	38	.endfor
		39	.if !defined(NOPORTDOCS)
		40	@${MKDIR} ${DOCDIR}
		41	${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCDIR}
		42	@${MKDIR} ${EXAMPLEDIR}
		43	${INSTALL_DATA} ${WRKSRC}/Scripts/* ${EXAMPLEDIR}
75	.endif	44	.endif
		45
76	.include <bsd.port.post.mk>	46	.include <bsd.port.post.mk>

Lines 1-29 Link Here

(-)py-imaging/files/patch-Makefile.pre.in (-29 lines)
1	--- ../Makefile.pre.in.orig Tue Apr 22 09:11:24 2003
2	+++ ../Makefile.pre.in Fri Aug 8 12:08:07 2003
3	@@ -92,7 +92,7 @@
4	TARGET= python
5
6	# Installed python binary (used only by boot target)
7	-PYTHON= python
8	+PYTHON?= python
9
10	# Add more -I and -D options here
11	CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
12	@@ -117,7 +117,7 @@
13	SGI_ABI= @SGI_ABI@
14	OPT= @OPT@
15	LDFLAGS= @LDFLAGS@
16	-DEFS= @DEFS@
17	+DEFS=
18	LIBS= @LIBS@
19	LIBM= @LIBM@
20	LIBC= @LIBC@
21	@@ -153,7 +153,7 @@
22	INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
23	EXECINCLUDEPY= $(exec_installdir)/include/python$(VERSION)
24	LIBP= $(exec_installdir)/lib/python$(VERSION)
25	-DESTSHARED= $(BINLIBDEST)/site-packages
26	+DESTSHARED= $(BINLIBDEST)/site-packages/PIL
27
28	LIBPL= $(LIBP)/config
29

Lines 1-12 Link Here

(-)py-imaging/files/patch-_imagingft.c (-12 lines)
1	--- ../_imagingft.c.orig Mon Mar 22 23:27:33 2004
2	+++ ../_imagingft.c Mon Mar 22 23:28:03 2004
3	@@ -15,7 +15,8 @@
4	#include "Python.h"
5	#include "Imaging.h"
6
7	-#include <freetype/freetype.h>
8	+#include <ft2build.h>
9	+#include FT_FREETYPE_H
10
11	#if PY_VERSION_HEX < 0x01060000
12	#define PyObject_DEL(op) PyMem_DEL((op))

Lines 1-18 Link Here

(-)py-imaging/files/patch-aa (-18 lines)
1	--- Makefile.in.orig Sun Jul 19 16:34:24 1998
2	+++ Makefile.in Wed Nov 4 10:00:01 1998
3	@@ -25,13 +25,13 @@
4
5	DEFS= @DEFS@
6
7	-LIBS= @LIBS@ @LIBM@
8	+LIBS= @LDFLAGS@ @LIBS@ @LIBM@
9
10	# --------------------------------------------------------------------
11	# Other things that are customizable but not by configure
12
13	INCLDIR= $(srcdir)/.
14	-JPEGINCLUDE= /usr/local/include
15	+JPEGINCLUDE= @prefix@/include
16	OPT= @OPT@
17	#OPT= -g
18	CFLAGS= $(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)

Lines 1-51 Link Here

(-)py-imaging/files/patch-setup.py (-48 / +27 lines)
1	--- ../setup.py.orig Fri May 9 05:00:56 2003	1	--- ./setup.py Wed Mar 23 13:16:40 2005
2	+++ ../setup.py Wed Aug 6 10:40:45 2003	2	+++ ./setup.py Thu Jun 16 13:24:28 2005
3	@@ -51,6 +51,9 @@	3	@@ -129,14 +129,25 @@
4	if os.path.exists('/sw/lib'):
5	LIBRARY_DIRS.append('/sw/lib')
6		4
7	+INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"), "include"))	5	prefix = sysconfig.get_config_var("prefix")
8	+LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))	6	if prefix:
9	+	7	- add_directory(library_dirs, os.path.join(prefix, "lib"))
10	HAVE_LIBJPEG = 0	8	- add_directory(include_dirs, os.path.join(prefix, "include"))
11	HAVE_LIBTIFF = 0	9	+ add_directory(library_dirs,
12	HAVE_LIBZ = 0	10	+ os.path.join(os.getenv("PREFIX"), "lib"))
13	@@ -126,7 +129,13 @@	11	+ add_directory(include_dirs,
14	pass	12	+ os.path.join(os.getenv("PREFIX"), "include"))
15	else:	13	+ add_directory(include_dirs,
16	INCLUDE_DIRS = ["libImaging"]	14	+ os.path.join(os.getenv("X11BASE"), "include"))
17	+ INCLUDE_DIRS.append(os.path.join(os.getenv("X11BASE"), "include"))
18	+ INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
19	+ "include/tcl%s" % TCL_VERSION))
20	+ INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"),
21	+ "include/tk%s" % TCL_VERSION))
22	LIBRARY_DIRS = ["libImaging"]
23	+ LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
24	LIBRARIES = ["Imaging"]
25	EXTRA_COMPILE_ARGS = None
26	EXTRA_LINK_ARGS = None
27	@@ -206,7 +215,8 @@
28		15
29	if not tk_framework_found:	16	#
30	# assume the libraries are installed in the default location	17	# locate tkinter libraries
31	- LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
32	+ version = TCL_VERSION[0] + TCL_VERSION[2]
33	+ LIBRARIES.extend(["tk" + version, "tcl" + version])
34	HAVE_TCLTK = 1
35		18
36	if HAVE_TCLTK:	19	if _tkinter:
37	@@ -266,6 +276,14 @@	20	TCL_VERSION = _tkinter.TCL_VERSION[:3]
38	# FIXME: search for libraries	21	+ TK_VERSION = _tkinter.TK_VERSION[:3]
39	LIBRARIES.append("freetype")	22	+ add_directory(include_dirs,
40	INCLUDE_DIRS.append("/usr/include/freetype2")	23	+ os.path.join(os.getenv("PREFIX"),
41	+ elif os.path.isdir("/usr/local/include/freetype2"):	24	+ "include/tcl%s" % TCL_VERSION))
42	+ # assume that the freetype library is installed in a	25	+ add_directory(include_dirs,
43	+ # standard location	26	+ os.path.join(os.getenv("PREFIX"),
44	+ # FIXME: search for libraries	27	+ "include/tk%s" % TK_VERSION))
45	+ LIBRARIES.append("freetype")	28
46	+ INCLUDE_DIRS.append("/usr/local/include")	29	if _tkinter and not TCL_ROOT:
47	+ INCLUDE_DIRS.append("/usr/local/include/freetype2")	30	# we have Tkinter but the TCL_ROOT variable was not set;
48	+ LIBRARY_DIRS.append("/usr/local/lib")
49	elif os.path.isdir("/sw/include/freetype2"):
50	# assume that the freetype library is installed in a
51	# standard location