From 2b208bb18018153dd567ca002da0e6bb7fe2f8e2 Mon Sep 17 00:00:00 2001
From: Nikolai Lifanov <lifanov@FreeBSD.org>
Date: Mon, 11 Mar 2019 01:05:24 +0000
Subject: [PATCH] ansible: switch to security/py-cryptography

For ansible >= 2.4, py-cryptography is preferred upstream.

PR:		236436
Reported by:	John W. O'Brien <john@saltant.com>
---
 sysutils/ansible/Makefile   | 4 ++--
 sysutils/ansible23/Makefile | 7 +++++++
 sysutils/ansible24/Makefile | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index f7b11c38599c..5f10da1ec918 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ansible
 PORTVERSION?=	2.7.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://releases.ansible.com/ansible/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,10 +14,10 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile
index 16c9b0f1236b..5da8a8144e75 100644
--- a/sysutils/ansible23/Makefile
+++ b/sysutils/ansible23/Makefile
@@ -13,6 +13,13 @@ CONFLICTS=	ansible-* \
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+
 PLIST_FILES=	man/man1/ansible-console.1.gz \
 		man/man1/ansible-doc.1.gz \
 		man/man1/ansible-galaxy.1.gz \
diff --git a/sysutils/ansible24/Makefile b/sysutils/ansible24/Makefile
index afab07c33375..811182cdb193 100644
--- a/sysutils/ansible24/Makefile
+++ b/sysutils/ansible24/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTVERSION=	2.4.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	24
 
 CONFLICTS=	ansible-* \