From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 20 11:01:23 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 19F43E76;
 Thu, 20 Nov 2014 11:01:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 06A6381C;
 Thu, 20 Nov 2014 11:01:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKB1MJw018792;
 Thu, 20 Nov 2014 11:01:22 GMT (envelope-from mva@FreeBSD.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKB1MaJ018791;
 Thu, 20 Nov 2014 11:01:22 GMT (envelope-from mva@FreeBSD.org)
Message-Id: <201411201101.sAKB1MaJ018791@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org
 using -f
From: Marcus von Appen <mva@FreeBSD.org>
Date: Thu, 20 Nov 2014 11:01:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372904 - head/graphics/py-imaging
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Nov 2014 11:01:23 -0000

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@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