From e8302856412e43f4f6133a103bc4962142966750 Mon Sep 17 00:00:00 2001 From: Marcus von Appen Date: Thu, 20 Nov 2014 11:01:22 +0000 Subject: [PATCH] - Set a proper CONFLICTS with graphics/py-pillow PR: 194701 Reported by: Carlos Jacobo Puga Medina (cpm@fbsd.es) With hat: python@ --- graphics/py-imaging/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index e782aaee9b65..0945bba3f41a 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -3,7 +3,7 @@ PORTNAME= imaging PORTVERSION= 1.1.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/media/downloads/ \ http://www.pythonware.net/storage/ @@ -27,6 +27,8 @@ PLIST_FILES= %%PYTHON_INCLUDEDIR%%/ImPlatform.h %%PYTHON_INCLUDEDIR%%/Imaging.h PORTDOCS= * PORTEXAMPLES= * +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow-* + OPTIONS_DEFINE= DOCS TKINTER TKINTER_DESC= tkinter for X support