- Fix CONFLICTS: 1.4 which is not matched with 1.[24].*

- Bump PORTREVISION

PR:		ports/167471
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>
This commit is contained in:
Li-Wen Hsu 2012-06-28 15:58:30 +00:00
parent f2ca2e550d
commit ca3c5a22d3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=300162
2 changed files with 4 additions and 2 deletions

View file

@ -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

View file

@ -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