From ca3c5a22d385e501f70c804e35089cf68f78d166 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Thu, 28 Jun 2012 15:58:30 +0000 Subject: - Fix CONFLICTS: 1.4 which is not matched with 1.[24].* - Bump PORTREVISION PR: ports/167471 Submitted by: Po-Chien Lin --- www/py-django12/Makefile | 3 ++- www/py-django13/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/py-django12/Makefile b/www/py-django12/Makefile index ff411372ce4f..80fa352116cd 100644 --- a/www/py-django12/Makefile +++ b/www/py-django12/Makefile @@ -7,6 +7,7 @@ PORTNAME= django PORTVERSION= 1.2.7 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://media.djangoproject.com/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -26,7 +27,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= Django -CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[34].* +CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[34]* DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile index fb39ed447df7..926209f4d4c0 100644 --- a/www/py-django13/Makefile +++ b/www/py-django13/Makefile @@ -7,6 +7,7 @@ PORTNAME= django PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://media.djangoproject.com/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -26,7 +27,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= Django -CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[24].* +CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[24]* DOCSDIR= ${PREFIX}/share/doc/py-django -- cgit v1.2.3