diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-25 21:01:03 +0800 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-25 21:01:03 +0800 |
| commit | a04f3b17d151d1808c33db1f20885f58e22b8333 (patch) | |
| tree | 1fd5b57ac6717cd0d00a73e4dc1588c07f0607b9 /www | |
| parent | c51a00dd11fd3b1928c250c16ddf9fe9b969f48a (diff) | |
| download | freebsd-ports-gnome-a04f3b17d151d1808c33db1f20885f58e22b8333.tar.gz freebsd-ports-gnome-a04f3b17d151d1808c33db1f20885f58e22b8333.tar.zst freebsd-ports-gnome-a04f3b17d151d1808c33db1f20885f58e22b8333.zip | |
- Fix mutual CONFLICTS for www/py-django-registration and www/py-django-registration-redux
Approved by: portmgr blanket
Diffstat (limited to 'www')
| -rw-r--r-- | www/py-django-registration-redux/Makefile | 2 | ||||
| -rw-r--r-- | www/py-django-registration/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/www/py-django-registration-redux/Makefile b/www/py-django-registration-redux/Makefile index 58c3e6f4e71e..fda48d737ba0 100644 --- a/www/py-django-registration-redux/Makefile +++ b/www/py-django-registration-redux/Makefile @@ -19,6 +19,6 @@ NO_ARCH= yes USES= python USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= pootle-* py-django-registration +CONFLICTS_INSTALL= pootle-[0-9]* py??-django-registration-[0-9]* .include <bsd.port.mk> diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile index 6567fb945010..5f08559867de 100644 --- a/www/py-django-registration/Makefile +++ b/www/py-django-registration/Makefile @@ -17,6 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 USES= python USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= pootle-* +CONFLICTS_INSTALL= pootle-[0-9]* py??-django-registration-redux-[0-9]* .include <bsd.port.mk> |