svn commit: r372904 - head/graphics/py-imaging

[Marcus von Appen]

Author: mva
Date: Thu Nov 20 11:01:22 2014
New Revision: 372904
URL: https://svnweb.freebsd.org/changeset/ports/372904
QAT: https://qat.redports.org/buildarchive/r372904/

Log:
  - Set a proper CONFLICTS with graphics/py-pillow
  
  PR:		194701
  Reported by:	Carlos Jacobo Puga Medina (cpm at fbsd.es)
  With hat:	python@

Modified:
  head/graphics/py-imaging/Makefile

Modified: head/graphics/py-imaging/Makefile
==============================================================================
--- head/graphics/py-imaging/Makefile	Thu Nov 20 10:53:15 2014	(r372903)
+++ head/graphics/py-imaging/Makefile	Thu Nov 20 11:01:22 2014	(r372904)
@@ -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%%/ImPla
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pillow-*
+
 OPTIONS_DEFINE=	DOCS TKINTER
 TKINTER_DESC=	tkinter for X support