aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlwhsu <lwhsu@FreeBSD.org>2012-06-28 23:58:30 +0800
committerlwhsu <lwhsu@FreeBSD.org>2012-06-28 23:58:30 +0800
commitee875ae74ec47053ef25485870a507d035968953 (patch)
treed42549a94a9c54c8c93ab42d727c4f4b6d1759a2
parentc8bcd950ac6a0c8cdf1d98a7bc223fca4ce43725 (diff)
downloadfreebsd-ports-gnome-ee875ae74ec47053ef25485870a507d035968953.tar.gz
freebsd-ports-gnome-ee875ae74ec47053ef25485870a507d035968953.tar.zst
freebsd-ports-gnome-ee875ae74ec47053ef25485870a507d035968953.zip
- 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>
-rw-r--r--www/py-django12/Makefile3
-rw-r--r--www/py-django13/Makefile3
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