Fri Dec 27 10:02:35 2013 UTC ()
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


(dholland)
diff -r1.1 -r1.2 pkgsrc/graphics/py-Pillow/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/py-Pillow/PLIST
cvs diff -r1.1 -r1.2 pkgsrc/graphics/py-Pillow/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/Makefile 2013/12/07 12:56:52 1.1
+++ pkgsrc/graphics/py-Pillow/Makefile 2013/12/27 10:02:35 1.2
@@ -1,26 +1,31 @@ @@ -1,26 +1,31 @@
1# $NetBSD: Makefile,v 1.1 2013/12/07 12:56:52 obache Exp $ 1# $NetBSD: Makefile,v 1.2 2013/12/27 10:02:35 dholland Exp $
2# 2#
3 3
4DISTNAME= Pillow-2.2.1 4DISTNAME= Pillow-2.2.1
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 6PKGREVISION= 1
6CATEGORIES= graphics python 7CATEGORIES= graphics python
7MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/ 8MASTER_SITES= https://pypi.python.org/packages/source/P/Pillow/
8EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
9 10
10MAINTAINER= obache@NetBSD.org 11MAINTAINER= obache@NetBSD.org
11HOMEPAGE= http://python-imaging.github.io/ 12HOMEPAGE= http://python-imaging.github.io/
12COMMENT= Python Imaging Library (Fork) 13COMMENT= Python Imaging Library (Fork)
13 14
14CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* 15CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]*
15 16
16PYTHON_SELF_CONFLICT= yes 17PYTHON_SELF_CONFLICT= yes
17PYTHON_VERSIONS_INCLUDE_3X= yes 18PYTHON_VERSIONS_INCLUDE_3X= yes
18 19
 20ALL_ENV+= C_INCLUDE_PATH=${BUILDLINK_PREFIX.freetype2}/include
 21ALL_ENV+= LIBRARY_PATH=${BUILDLINK_PREFIX.freetype2}/lib
 22
19.include "../../devel/zlib/buildlink3.mk" 23.include "../../devel/zlib/buildlink3.mk"
20.include "../../graphics/freetype2/buildlink3.mk" 24.include "../../graphics/freetype2/buildlink3.mk"
21.include "../../graphics/lcms/buildlink3.mk" 25.include "../../graphics/lcms/buildlink3.mk"
22.include "../../graphics/libwebp/buildlink3.mk" 26.include "../../graphics/libwebp/buildlink3.mk"
23.include "../../graphics/tiff/buildlink3.mk" 27.include "../../graphics/tiff/buildlink3.mk"
 28.include "../../x11/tk/buildlink3.mk"
24.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
25.include "../../mk/jpeg.buildlink3.mk" 30.include "../../mk/jpeg.buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/graphics/py-Pillow/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/py-Pillow/PLIST 2013/12/07 12:56:52 1.1
+++ pkgsrc/graphics/py-Pillow/PLIST 2013/12/27 10:02:35 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2013/12/07 12:56:52 obache Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/12/27 10:02:35 dholland Exp $
2bin/pilconvert.py 2bin/pilconvert.py
3bin/pildriver.py 3bin/pildriver.py
4bin/pilfile.py 4bin/pilfile.py
5bin/pilfont.py 5bin/pilfont.py
6bin/pilprint.py 6bin/pilprint.py
7${PYSITELIB}/PIL/ArgImagePlugin.py 7${PYSITELIB}/PIL/ArgImagePlugin.py
8${PYSITELIB}/PIL/ArgImagePlugin.pyc 8${PYSITELIB}/PIL/ArgImagePlugin.pyc
9${PYSITELIB}/PIL/ArgImagePlugin.pyo 9${PYSITELIB}/PIL/ArgImagePlugin.pyo
10${PYSITELIB}/PIL/BdfFontFile.py 10${PYSITELIB}/PIL/BdfFontFile.py
11${PYSITELIB}/PIL/BdfFontFile.pyc 11${PYSITELIB}/PIL/BdfFontFile.pyc
12${PYSITELIB}/PIL/BdfFontFile.pyo 12${PYSITELIB}/PIL/BdfFontFile.pyo
13${PYSITELIB}/PIL/BmpImagePlugin.py 13${PYSITELIB}/PIL/BmpImagePlugin.py
14${PYSITELIB}/PIL/BmpImagePlugin.pyc 14${PYSITELIB}/PIL/BmpImagePlugin.pyc
@@ -244,25 +244,26 @@ ${PYSITELIB}/PIL/XbmImagePlugin.pyo @@ -244,25 +244,26 @@ ${PYSITELIB}/PIL/XbmImagePlugin.pyo
244${PYSITELIB}/PIL/XpmImagePlugin.py 244${PYSITELIB}/PIL/XpmImagePlugin.py
245${PYSITELIB}/PIL/XpmImagePlugin.pyc 245${PYSITELIB}/PIL/XpmImagePlugin.pyc
246${PYSITELIB}/PIL/XpmImagePlugin.pyo 246${PYSITELIB}/PIL/XpmImagePlugin.pyo
247${PYSITELIB}/PIL/__init__.py 247${PYSITELIB}/PIL/__init__.py
248${PYSITELIB}/PIL/__init__.pyc 248${PYSITELIB}/PIL/__init__.pyc
249${PYSITELIB}/PIL/__init__.pyo 249${PYSITELIB}/PIL/__init__.pyo
250${PYSITELIB}/PIL/_binary.py 250${PYSITELIB}/PIL/_binary.py
251${PYSITELIB}/PIL/_binary.pyc 251${PYSITELIB}/PIL/_binary.pyc
252${PYSITELIB}/PIL/_binary.pyo 252${PYSITELIB}/PIL/_binary.pyo
253${PYSITELIB}/PIL/_imaging.so 253${PYSITELIB}/PIL/_imaging.so
254${PYSITELIB}/PIL/_imagingcms.so 254${PYSITELIB}/PIL/_imagingcms.so
255${PYSITELIB}/PIL/_imagingft.so 255${PYSITELIB}/PIL/_imagingft.so
256${PYSITELIB}/PIL/_imagingmath.so 256${PYSITELIB}/PIL/_imagingmath.so
 257${PYSITELIB}/PIL/_imagingtk.so
257${PYSITELIB}/PIL/_util.py 258${PYSITELIB}/PIL/_util.py
258${PYSITELIB}/PIL/_util.pyc 259${PYSITELIB}/PIL/_util.pyc
259${PYSITELIB}/PIL/_util.pyo 260${PYSITELIB}/PIL/_util.pyo
260${PYSITELIB}/PIL/_webp.so 261${PYSITELIB}/PIL/_webp.so
261${PYSITELIB}/PIL/tests.py 262${PYSITELIB}/PIL/tests.py
262${PYSITELIB}/PIL/tests.pyc 263${PYSITELIB}/PIL/tests.pyc
263${PYSITELIB}/PIL/tests.pyo 264${PYSITELIB}/PIL/tests.pyo
264${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 265${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
265${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 266${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
266${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 267${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
267${PYSITELIB}/${EGG_INFODIR}/top_level.txt 268${PYSITELIB}/${EGG_INFODIR}/top_level.txt
268${PYSITELIB}/${EGG_INFODIR}/zip-safe 269${PYSITELIB}/${EGG_INFODIR}/zip-safe