diff options
| author | wen <wen@FreeBSD.org> | 2017-04-07 15:55:09 +0800 |
|---|---|---|
| committer | wen <wen@FreeBSD.org> | 2017-04-07 15:55:09 +0800 |
| commit | b91bf0549f1edbe5fdc08f4b1a6146c81106ff81 (patch) | |
| tree | 08127dce6f0c50f44ed589b34bd1fbaa1736f614 | |
| parent | c1220f9ade30b9dfa81b6c70762737c6261db1d6 (diff) | |
| download | freebsd-ports-gnome-b91bf0549f1edbe5fdc08f4b1a6146c81106ff81.tar.gz freebsd-ports-gnome-b91bf0549f1edbe5fdc08f4b1a6146c81106ff81.tar.zst freebsd-ports-gnome-b91bf0549f1edbe5fdc08f4b1a6146c81106ff81.zip | |
- Adjust CONFLICTS_INSTALL after add py-django111
| -rw-r--r-- | www/py-django110/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django16/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django18/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django19/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/www/py-django110/Makefile b/www/py-django110/Makefile index bed7a9d73280..5b887803adaa 100644 --- a/www/py-django110/Makefile +++ b/www/py-django110/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[689]-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[689]-* py??-django111-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django16/Makefile b/www/py-django16/Makefile index 7525a0ada6ad..f4d1563354de 100644 --- a/www/py-django16/Makefile +++ b/www/py-django16/Makefile @@ -23,7 +23,7 @@ EXPIRATION_DATE= 2015-10-01 USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[89]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[89]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django18/Makefile b/www/py-django18/Makefile index be5c3d0512bb..1218d5cdf0a8 100644 --- a/www/py-django18/Makefile +++ b/www/py-django18/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[69]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[69]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django19/Makefile b/www/py-django19/Makefile index ab6b670e2f36..7ad2aa836cc3 100644 --- a/www/py-django19/Makefile +++ b/www/py-django19/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[68]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[68]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django |