Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/py-imaging/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile	12 Jan 2008 04:38:45 -0000	1.32
+++ Makefile	20 May 2009 15:38:13 -0000
@@ -26,7 +26,7 @@
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PIL
-PYDISTUTILS_EGGINFODIR=	${PYTHON_SITELIBDIR}/PIL
+PYDISTUTILS_EGGINFODIR=	${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}/PIL
 
 PORTDOCS=	*
 
@@ -41,18 +41,25 @@
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 PLIST_SUB+=	TKINTER=""
+USE_TK=		82+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 .else
 PLIST_SUB+=	TKINTER="@comment "
 .endif
 
-.if defined(WITHOUT_TKINTER)
 post-patch:
+.if defined(WITHOUT_TKINTER)
 	@${REINPLACE_CMD} -e 's|if _tkinter|if None|g' ${WRKSRC}/setup.py
+.else
+	${REINPLACE_CMD} -e 's|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|;s|%%TK_LIBDIR%%|${TK_LIBDIR}|; \
+	    s|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|;s|%%TCL_LIBDIR%%|${TCL_LIBDIR}|' \
+	    ${WRKSRC}/setup.py
 .endif
 
 post-install:
 .for file in ImPlatform.h Imaging.h
-	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${PYTHON_INCLUDEDIR}
+	${MKDIR} ${PYTHON_INCLUDEDIR:S/${LOCALBASE}/${PREFIX}/}
+	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${PYTHON_INCLUDEDIR:S/${LOCALBASE}/${PREFIX}/}
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Scripts/* ${EXAMPLESDIR}
Index: files/patch-setup.py
===================================================================
RCS file: /home/pcvs/ports/graphics/py-imaging/files/patch-setup.py,v
retrieving revision 1.4
diff -u -r1.4 patch-setup.py
--- files/patch-setup.py	19 Apr 2008 17:50:36 -0000	1.4
+++ files/patch-setup.py	20 May 2009 13:47:26 -0000
@@ -1,6 +1,6 @@
---- setup.py.orig	Sun Dec  3 11:37:29 2006
-+++ setup.py	Sat Jan 13 07:24:13 2007
-@@ -145,14 +145,25 @@
+--- setup.py.orig	2009-05-20 15:46:20.000000000 +0200
++++ setup.py	2009-05-20 15:46:20.000000000 +0200
+@@ -145,14 +145,22 @@
  
          prefix = sysconfig.get_config_var("prefix")
          if prefix:
@@ -18,13 +18,10 @@
  
          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))
++	    add_directory(include_dirs, "%%TCL_INCLUDEDIR%%")
++	    add_directory(include_dirs, "%%TK_INCLUDEDIR%%")
++	    add_directory(library_dirs, "%%TCL_LIBDIR%%")
++	    add_directory(library_dirs, "%%TK_LIBDIR%%")
  
          if _tkinter and not TCL_ROOT:
              # we have Tkinter but the TCL_ROOT variable was not set;