[pkgsrc/trunk]: pkgsrc/graphics/py-Pillow Make this build properly with nativ...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0877c475fc44
branches:  trunk
changeset: 627989:0877c475fc44
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Fri Dec 27 10:02:35 2013 +0000

description:
Make this build properly with native X: it doesn't find freetype in
/usr/X11R7 on its own, and then the PLIST doesn't match, so pass in
${BUILDLINK_PREFIX.freetype2} explicitly.

Also, because if you have tk installed it finds it and then fails
because it isn't buildlinked, pull in tk and add the tk library to the
PLIST.

PKGREVISION -> 1

diffstat:

 graphics/py-Pillow/Makefile |  7 ++++++-
 graphics/py-Pillow/PLIST    |  3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 4e931a099afd -r 0877c475fc44 graphics/py-Pillow/Makefile
--- a/graphics/py-Pillow/Makefile       Fri Dec 27 08:32:32 2013 +0000
+++ b/graphics/py-Pillow/Makefile       Fri Dec 27 10:02:35 2013 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2013/12/07 12:56:52 obache Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/27 10:02:35 dholland Exp $
 #
 
 DISTNAME=      Pillow-2.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    graphics python
 MASTER_SITES=  https://pypi.python.org/packages/source/P/Pillow/
 EXTRACT_SUFX=  .zip
@@ -16,11 +17,15 @@
 PYTHON_SELF_CONFLICT=          yes
 PYTHON_VERSIONS_INCLUDE_3X=    yes
 
+ALL_ENV+=      C_INCLUDE_PATH=${BUILDLINK_PREFIX.freetype2}/include
+ALL_ENV+=      LIBRARY_PATH=${BUILDLINK_PREFIX.freetype2}/lib
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4e931a099afd -r 0877c475fc44 graphics/py-Pillow/PLIST
--- a/graphics/py-Pillow/PLIST  Fri Dec 27 08:32:32 2013 +0000
+++ b/graphics/py-Pillow/PLIST  Fri Dec 27 10:02:35 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/07 12:56:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/12/27 10:02:35 dholland Exp $
 bin/pilconvert.py
 bin/pildriver.py
 bin/pilfile.py
@@ -254,6 +254,7 @@
 ${PYSITELIB}/PIL/_imagingcms.so
 ${PYSITELIB}/PIL/_imagingft.so
 ${PYSITELIB}/PIL/_imagingmath.so
+${PYSITELIB}/PIL/_imagingtk.so
 ${PYSITELIB}/PIL/_util.py
 ${PYSITELIB}/PIL/_util.pyc
 ${PYSITELIB}/PIL/_util.pyo