Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2017 07:55:09 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437915 - in head/www: py-django110 py-django16 py-django18 py-django19
Message-ID:  <201704070755.v377t9UC027369@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Fri Apr  7 07:55:09 2017
New Revision: 437915
URL: https://svnweb.freebsd.org/changeset/ports/437915

Log:
  - Adjust CONFLICTS_INSTALL after add py-django111

Modified:
  head/www/py-django110/Makefile
  head/www/py-django16/Makefile
  head/www/py-django18/Makefile
  head/www/py-django19/Makefile

Modified: head/www/py-django110/Makefile
==============================================================================
--- head/www/py-django110/Makefile	Fri Apr  7 07:44:32 2017	(r437914)
+++ head/www/py-django110/Makefile	Fri Apr  7 07:55:09 2017	(r437915)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[689]-*
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[689]-* py??-django111-*
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django16/Makefile
==============================================================================
--- head/www/py-django16/Makefile	Fri Apr  7 07:44:32 2017	(r437914)
+++ head/www/py-django16/Makefile	Fri Apr  7 07:55:09 2017	(r437915)
@@ -23,7 +23,7 @@ EXPIRATION_DATE=	2015-10-01
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[89]-* py??-django110-*
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[89]-* py??-django11[01]-*
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django18/Makefile
==============================================================================
--- head/www/py-django18/Makefile	Fri Apr  7 07:44:32 2017	(r437914)
+++ head/www/py-django18/Makefile	Fri Apr  7 07:55:09 2017	(r437915)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[69]-* py??-django110-*
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[69]-* py??-django11[01]-*
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django

Modified: head/www/py-django19/Makefile
==============================================================================
--- head/www/py-django19/Makefile	Fri Apr  7 07:44:32 2017	(r437914)
+++ head/www/py-django19/Makefile	Fri Apr  7 07:55:09 2017	(r437915)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 USES=		cpe python
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[68]-* py??-django110-*
+CONFLICTS_INSTALL=	py??-django-devel-* py??-django1[68]-* py??-django11[01]-*
 CPE_VENDOR=		djangoproject
 
 DOCSDIR=	${PREFIX}/share/doc/py-django



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