diff options
| author | Nikolai Lifanov <lifanov@FreeBSD.org> | 2017-11-30 15:35:31 +0000 |
|---|---|---|
| committer | Nikolai Lifanov <lifanov@FreeBSD.org> | 2017-11-30 15:35:31 +0000 |
| commit | 52b5b35c8e764d71295ee5e2699f2886e83cd73a (patch) | |
| tree | f39f558208a191172dd49731921d2667070c86ca | |
| parent | Add various FLAVOR related helpers. (diff) | |
update conflicts after addition of sysutils/ansible23
Notes
Notes:
svn path=/head/; revision=455207
| -rw-r--r-- | sysutils/ansible/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/ansible1/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 69680e9843ca..e97b01e8825e 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -20,6 +20,8 @@ RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +CONFLICTS?= ansible1-* ansible23-* + EXTRA_PATCHES?= # NO_ARCH= yes diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile index 29e2ffc0d9bc..a8770820ec13 100644 --- a/sysutils/ansible1/Makefile +++ b/sysutils/ansible1/Makefile @@ -5,7 +5,7 @@ PKGNAMESUFFIX= 1 PORTVERSION= 1.9.6 PORTREVISION= 1 -CONFLICTS= ansible-* +CONFLICTS= ansible-* ansible23-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo |