From 04667356b6c2ab6eb385300b54302d2503ad2076 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Fri, 27 Nov 2015 05:57:39 +0000 Subject: 1: add PKGNAMESUFFIX to py-django-pipeline14. 2: add CONFLICT. --- www/py-django-pipeline/Makefile | 3 +++ www/py-django-pipeline12/Makefile | 3 ++- www/py-django-pipeline14/Makefile | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'www') diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile index 3b28236e6f5b..3fe2615c7486 100644 --- a/www/py-django-pipeline/Makefile +++ b/www/py-django-pipeline/Makefile @@ -18,4 +18,7 @@ NO_ARCH= yes USES= python:2 USE_PYTHON= autoplist distutils +CONFLICTS= py[23][0-9]-django-pipeline12-[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 d2919e8fe843..50156e3b605c 100644 --- a/www/py-django-pipeline12/Makefile +++ b/www/py-django-pipeline12/Makefile @@ -20,7 +20,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>0:${PORTSDIR}/www/py-django14 -CONFLICTS= py[23][0-9]-django-pipeline-[0-9]* +CONFLICTS= py[23][0-9]-django-pipeline-[0-9]* \ + py[23][0-9]-django-pipeline14-[0-9]* USES= python:2 USE_PYTHON= distutils diff --git a/www/py-django-pipeline14/Makefile b/www/py-django-pipeline14/Makefile index 0517d1cf7af9..929f9fc4775c 100644 --- a/www/py-django-pipeline14/Makefile +++ b/www/py-django-pipeline14/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 1.4.7 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 14 MAINTAINER= ports@FreeBSD.org COMMENT= Asset (css/js) packaging library for Django @@ -18,4 +19,7 @@ NO_ARCH= yes USES= python:2 USE_PYTHON= autoplist distutils +CONFLICTS= py[23][0-9]-django-pipeline-[0-9]* \ + py[23][0-9]-django-pipeline12-[0-9]* + .include -- cgit v1.2.3