diff options
author | dholland <dholland@pkgsrc.org> | 2013-12-27 10:02:35 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2013-12-27 10:02:35 +0000 |
commit | c437062baafce2a8cc8ae1a3fab7ff5af01869ad (patch) | |
tree | bf2d7994fcb9dbdcb2a559386ddfdcdb07fe3cef /graphics/py-Pillow | |
parent | f36c1a1eefbdda3e8aad5d8f071ff85d9a33a76d (diff) | |
download | pkgsrc-c437062baafce2a8cc8ae1a3fab7ff5af01869ad.tar.gz |
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 (limited to 'graphics/py-Pillow')
-rw-r--r-- | graphics/py-Pillow/Makefile | 7 | ||||
-rw-r--r-- | graphics/py-Pillow/PLIST | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile index 7c28212a264..1f1dd1faee1 100644 --- a/graphics/py-Pillow/Makefile +++ b/graphics/py-Pillow/Makefile @@ -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 @@ CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* 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 --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST index efbc8238ddf..ae4b74d413c 100644 --- a/graphics/py-Pillow/PLIST +++ b/graphics/py-Pillow/PLIST @@ -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/_imaging.so ${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 |