From owner-svn-ports-all@freebsd.org  Wed May 25 13:01:04 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 68C88B49366;
 Wed, 25 May 2016 13:01:04 +0000 (UTC)
 (envelope-from amdmi3@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 3A1E71976;
 Wed, 25 May 2016 13:01:04 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4PD13C9025055;
 Wed, 25 May 2016 13:01:03 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PD13i2025053;
 Wed, 25 May 2016 13:01:03 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605251301.u4PD13i2025053@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 25 May 2016 13:01:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415830 - in head/www: py-django-registration
 py-django-registration-redux
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: Wed, 25 May 2016 13:01:04 -0000

Author: amdmi3
Date: Wed May 25 13:01:03 2016
New Revision: 415830
URL: https://svnweb.freebsd.org/changeset/ports/415830

Log:
  - Fix mutual CONFLICTS for www/py-django-registration and www/py-django-registration-redux
  
  Approved by:	portmgr blanket

Modified:
  head/www/py-django-registration-redux/Makefile
  head/www/py-django-registration/Makefile

Modified: head/www/py-django-registration-redux/Makefile
==============================================================================
--- head/www/py-django-registration-redux/Makefile	Wed May 25 13:00:57 2016	(r415829)
+++ head/www/py-django-registration-redux/Makefile	Wed May 25 13:01:03 2016	(r415830)
@@ -19,6 +19,6 @@ NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-CONFLICTS_INSTALL=	pootle-* py-django-registration
+CONFLICTS_INSTALL=	pootle-[0-9]* py??-django-registration-[0-9]*
 
 .include <bsd.port.mk>

Modified: head/www/py-django-registration/Makefile
==============================================================================
--- head/www/py-django-registration/Makefile	Wed May 25 13:00:57 2016	(r415829)
+++ head/www/py-django-registration/Makefile	Wed May 25 13:01:03 2016	(r415830)
@@ -17,6 +17,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}djan
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-CONFLICTS_INSTALL=	pootle-*
+CONFLICTS_INSTALL=	pootle-[0-9]* py??-django-registration-redux-[0-9]*
 
 .include <bsd.port.mk>