From 02bdd5ed6a334512bb8c3854b086a21d1a47acc7 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Tue, 8 Dec 2015 09:47:38 +0000 Subject: [PATCH] Add py-django-pipeline13 to CONFLICT. --- www/py-django-pipeline/Makefile | 1 + www/py-django-pipeline12/Makefile | 1 + www/py-django-pipeline14/Makefile | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile index 3fe2615c7486..d079e0f7d422 100644 --- a/www/py-django-pipeline/Makefile +++ b/www/py-django-pipeline/Makefile @@ -19,6 +19,7 @@ USES= python:2 USE_PYTHON= autoplist distutils CONFLICTS= py[23][0-9]-django-pipeline12-[0-9]* \ + py[23][0-9]-django-pipeline13-[0-9]* \ py[23][0-9]-django-pipeline14-[0-9]* .include diff --git a/www/py-django-pipeline12/Makefile b/www/py-django-pipeline12/Makefile index 50156e3b605c..550b877a9347 100644 --- a/www/py-django-pipeline12/Makefile +++ b/www/py-django-pipeline12/Makefile @@ -21,6 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>0:${PORTSDIR}/www/py-django14 CONFLICTS= py[23][0-9]-django-pipeline-[0-9]* \ + py[23][0-9]-django-pipeline13-[0-9]* \ py[23][0-9]-django-pipeline14-[0-9]* USES= python:2 diff --git a/www/py-django-pipeline14/Makefile b/www/py-django-pipeline14/Makefile index 929f9fc4775c..233663266b5f 100644 --- a/www/py-django-pipeline14/Makefile +++ b/www/py-django-pipeline14/Makefile @@ -20,6 +20,7 @@ USES= python:2 USE_PYTHON= autoplist distutils CONFLICTS= py[23][0-9]-django-pipeline-[0-9]* \ - py[23][0-9]-django-pipeline12-[0-9]* + py[23][0-9]-django-pipeline12-[0-9]* \ + py[23][0-9]-django-pipeline13-[0-9]* .include