Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 May 2016 13:01:03 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
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
Message-ID:  <201605251301.u4PD13i2025053@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605251301.u4PD13i2025053>