Attachment #33983 for bug #55399

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

Lines 16-22 Link Here

(-)py-imaging/Makefile (-3 / +21 lines)
16	COMMENT= The Python Imaging Library	16	COMMENT= The Python Imaging Library
17		17
18	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter	18	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg	19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
		20	freetype.9:${PORTSDIR}/print/freetype2
20	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter	21	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
21		22
22	DIST_SUBDIR= python	23	DIST_SUBDIR= python
Lines 25-37 Link Here
25	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-jpeg=${PREFIX}/lib	27	CONFIGURE_ARGS= --with-jpeg=${PREFIX}/lib
27	CONFIGURE_ENV= PYTHON=${PYTHON_CMD}	28	CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
		29	SETUP_ENV= X11BASE=${X11BASE} PREFIX=${PREFIX}
28	MAKE_FLAGS= OPT="${CFLAGS}"	30	MAKE_FLAGS= OPT="${CFLAGS}"
29		31
		32	.include <bsd.port.pre.mk>
		33
30	PILDIR= ${PYTHON_SITELIBDIR}/PIL	34	PILDIR= ${PYTHON_SITELIBDIR}/PIL
31	PILDOCDIR= ${PREFIX}/share/doc/PIL	35	PILDOCDIR= ${PREFIX}/share/doc/PIL
32	PILEXDIR= ${PREFIX}/share/examples/PIL	36	PILEXDIR= ${PREFIX}/share/examples/PIL
33	PILINCDIR= ${PREFIX}/include/${PYTHON_VERSION}	37	PILINCDIR= ${PREFIX}/include/${PYTHON_VERSION}
34		38
		39	.if ${PYTHON_REL} > 200
		40	post-build:
		41	@(cd ${WRKSRC}/..; ${SETENV} ${SETUP_ENV} ${PYTHON_CMD} setup.py build)
		42
		43	do-install:
		44	@(cd ${WRKSRC}/..; ${SETENV} ${SETUP_ENV} ${PYTHON_CMD} setup.py install -O1)
		45	@${MKDIR} ${PILDOCDIR}
		46	${INSTALL_DATA} ${WRKSRC}/../README ${PILDOCDIR}
		47	@${MKDIR} ${PILEXDIR}
		48	${INSTALL_DATA} ${WRKSRC}/../Scripts/* ${PILEXDIR}
		49	.for file in ImConfig.h ImPlatform.h Imaging.h
		50	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
		51	.endfor
		52	.else
35	post-extract:	53	post-extract:
36	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..	54	@${CP} ${FILESDIR}/Setup ${WRKSRC}/..
37		55
Lines 55-59 Link Here
55	.for file in ImConfig.h ImPlatform.h Imaging.h	73	.for file in ImConfig.h ImPlatform.h Imaging.h
56	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}	74	${INSTALL_DATA} ${WRKSRC}/${file} ${PILINCDIR}
57	.endfor	75	.endfor
58		76	.endif
59	.include <bsd.port.mk>	77	.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)py-imaging/files/Setup (+1 lines)
1	shared	1	shared
2		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	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
4	_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	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
 

 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
 




--- ../setup.py.orig	Fri May  9 05:00:56 2003
+++ ../setup.py	Wed Aug  6 10:40:45 2003
@@ -51,6 +51,9 @@
 if os.path.exists('/sw/lib'):
     LIBRARY_DIRS.append('/sw/lib')
 
+INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"), "include"))
+LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
+
 HAVE_LIBJPEG = 0
 HAVE_LIBTIFF = 0
 HAVE_LIBZ = 0
@@ -126,7 +129,13 @@
     pass
 else:
     INCLUDE_DIRS = ["libImaging"]
+    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 @@
 
         if not tk_framework_found:
             # assume the libraries are installed in the default location
-            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 HAVE_TCLTK:
@@ -266,6 +276,14 @@
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
         INCLUDE_DIRS.append("/usr/include/freetype2")
+    elif os.path.isdir("/usr/local/include/freetype2"):
+        # assume that the freetype library is installed in a
+        # standard location
+        # FIXME: search for libraries
+        LIBRARIES.append("freetype")
+        INCLUDE_DIRS.append("/usr/local/include")
+        INCLUDE_DIRS.append("/usr/local/include/freetype2")
+        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 199-210 Link Here

(-)py-imaging/pkg-plist (-2 / +3 lines)
199	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py	199	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.py
200	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc	200	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyc
201	lib/%%PYTHON_VERSION%%/site-packages/PIL/XpmImagePlugin.pyo	201	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
202	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py	205	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.py
203	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc	206	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyc
204	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo	207	lib/%%PYTHON_VERSION%%/site-packages/PIL/__init__.pyo
205	lib/%%PYTHON_VERSION%%/site-packages/PIL.pth	208	lib/%%PYTHON_VERSION%%/site-packages/PIL.pth
206	lib/%%PYTHON_VERSION%%/site-packages/_imaging.so
207	lib/%%PYTHON_VERSION%%/site-packages/_imagingtk.so
208	share/doc/PIL/README	209	share/doc/PIL/README
209	share/examples/PIL/README	210	share/examples/PIL/README
210	share/examples/PIL/bdf2pil.py	211	share/examples/PIL/bdf2pil.py

Return to bug 55399

Lines 1-5 Link Here

(-)py-imaging/files/patch-Makefile.pre.in (-2 / +11 lines)
1	--- ../Makefile.pre.in.orig Wed Apr 23 00:11:24 2003	1	--- ../Makefile.pre.in.orig Tue Apr 22 09:11:24 2003
2	+++ ../Makefile.pre.in Sat Aug 2 13:56:42 2003	2	+++ ../Makefile.pre.in Fri Aug 8 12:08:07 2003
3	@@ -92,7 +92,7 @@	3	@@ -92,7 +92,7 @@
4	TARGET= python	4	TARGET= python
5		5
Lines 18-20 Link Here
18	LIBS= @LIBS@	18	LIBS= @LIBS@
19	LIBM= @LIBM@	19	LIBM= @LIBM@
20	LIBC= @LIBC@	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

Line 0 Link Here

(-)py-imaging/files/patch-setup.py (+51 lines)
	1	--- ../setup.py.orig Fri May 9 05:00:56 2003
	2	+++ ../setup.py Wed Aug 6 10:40:45 2003
	3	@@ -51,6 +51,9 @@
	4	if os.path.exists('/sw/lib'):
	5	LIBRARY_DIRS.append('/sw/lib')
	6
	7	+INCLUDE_DIRS.append(os.path.join(os.getenv("PREFIX"), "include"))
	8	+LIBRARY_DIRS.append(os.path.join(os.getenv("PREFIX"), "lib"))
	9	+
	10	HAVE_LIBJPEG = 0
	11	HAVE_LIBTIFF = 0
	12	HAVE_LIBZ = 0
	13	@@ -126,7 +129,13 @@
	14	pass
	15	else:
	16	INCLUDE_DIRS = ["libImaging"]
	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
	29	if not tk_framework_found:
	30	# assume the libraries are installed in the default location
	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
	36	if HAVE_TCLTK:
	37	@@ -266,6 +276,14 @@
	38	# FIXME: search for libraries
	39	LIBRARIES.append("freetype")
	40	INCLUDE_DIRS.append("/usr/include/freetype2")
	41	+ elif os.path.isdir("/usr/local/include/freetype2"):
	42	+ # assume that the freetype library is installed in a
	43	+ # standard location
	44	+ # FIXME: search for libraries
	45	+ LIBRARIES.append("freetype")
	46	+ INCLUDE_DIRS.append("/usr/local/include")
	47	+ INCLUDE_DIRS.append("/usr/local/include/freetype2")
	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