From owner-svn-ports-all@freebsd.org  Tue Jul  5 15:10:21 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE0C7B2184B;
 Tue,  5 Jul 2016 15:10:21 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 AD96A179F;
 Tue,  5 Jul 2016 15:10:21 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u65FAKLg015694;
 Tue, 5 Jul 2016 15:10:20 GMT (envelope-from cpm@FreeBSD.org)
Received: (from cpm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u65FAKeE015693;
 Tue, 5 Jul 2016 15:10:20 GMT (envelope-from cpm@FreeBSD.org)
Message-Id: <201607051510.u65FAKeE015693@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org
 using -f
From: "Carlos J. Puga Medina" <cpm@FreeBSD.org>
Date: Tue, 5 Jul 2016 15:10:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418087 - head/net/py-uritemplate
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2016 15:10:22 -0000

Author: cpm
Date: Tue Jul  5 15:10:20 2016
New Revision: 418087
URL: https://svnweb.freebsd.org/changeset/ports/418087

Log:
  - Register CONFLICTS between py-uritemplate and py-uritemplate.py
  
  Submitted by:	me
  Reviewed by:	amdmi3, junovitch, feld (mentors)
  Approved by:	maintainer timeout (3 weeks)
  Differential Revision:	D6730

Modified:
  head/net/py-uritemplate/Makefile

Modified: head/net/py-uritemplate/Makefile
==============================================================================
--- head/net/py-uritemplate/Makefile	Tue Jul  5 15:02:56 2016	(r418086)
+++ head/net/py-uritemplate/Makefile	Tue Jul  5 15:10:20 2016	(r418087)
@@ -13,6 +13,8 @@ COMMENT=	Python implementation of URI Te
 
 LICENSE=	APACHE20
 
+CONFLICTS_INSTALL=	py*-uritemplate.py-[0-9]*
+
 USE_PYTHON=	autoplist distutils
 USES=	python