Update dependency to py-dnspython

After adding py-dnspython1 and updating py-dnspython to 2.2.0 update
some dependency of ports.

7 files changed, 21 insertions, 15 deletions

diff --git a/devel/py-aioice/Makefile b/devel/py-aioice/Makefile
index e97bc92bf954..19a62847db3c 100644
--- a/devel/py-aioice/Makefile
+++ b/devel/py-aioice/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	aioice
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dnspython2>=0:dns/py-dnspython2@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/dns/dnsrecon/Makefile b/dns/dnsrecon/Makefile
index b92a83ea3db1..e1c925ae9205 100644
--- a/dns/dnsrecon/Makefile
+++ b/dns/dnsrecon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dnsrecon
 DISTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	dns
 
 MAINTAINER=	rihaz.jerrin@gmail.com
@@ -7,19 +8,20 @@ COMMENT=	DNS enumeration tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython2>=0:dns/py-dnspython2@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
+USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	darkoperator
 
-USES=		python shebangfix
-NO_BUILD=	yes
+SHEBANG_FILES=	${WRKSRC}/dnsrecon.py
+
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-SHEBANG_FILES=	${WRKSRC}/dnsrecon.py
 FILELIST=	namelist.txt subdomains-top1mil-20000.txt \
 		subdomains-top1mil-5000.txt subdomains-top1mil.txt
 
diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
index 12f4451fbb78..4f97129fae05 100644
--- a/dns/py-dns-lexicon/Makefile
+++ b/dns/py-dns-lexicon/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	dns-lexicon
 PORTVERSION=	3.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,7 +32,7 @@ OCI_DESC=	Oracle Cloud Infrastructure (OCI) support
 ROUTE53_DESC=	Route 53 support
 SOFTLAYER_DESC=	SoftLayer (IBM Cloud) support
 
-DDNS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython2>=2:dns/py-dnspython2@${PY_FLAVOR}
+DDNS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=2:dns/py-dnspython@${PY_FLAVOR}
 GRANSY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeep>=3:net/py-zeep@${PY_FLAVOR}
 LOCALZONE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}localzone>=0.9.8:dns/py-localzone@${PY_FLAVOR}
 OCI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oci>=2:devel/py-oci@${PY_FLAVOR}
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 901c2d8e96b9..1ad023b23d87 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrum
 PORTVERSION=	4.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance python
 MASTER_SITES=	https://download.electrum.org/${PORTVERSION}/ \
 		http://download.electrum.org/${PORTVERSION}/
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=0.3:net/py-aiohttp-socks@${PY
 		${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0:dns/py-dnspython2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=2.0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${PY_FLAVOR} \
diff --git a/mail/py-mailsuite/Makefile b/mail/py-mailsuite/Makefile
index 45d2240d0b90..4612b3fbfe82 100644
--- a/mail/py-mailsuite/Makefile
+++ b/mail/py-mailsuite/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mailsuite
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,10 +10,10 @@ COMMENT=	Python package to simplify receiving, parsing, and sending email
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imapclient>=2.1.0:mail/py-imapclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mail-parser>=3.11.0:mail/py-mail-parser@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0.0:dns/py-dnspython2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}html2text>=2020.1.16:textproc/py-html2text@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=2.0.0:dns/py-dnspython@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html2text>=2020.1.16:textproc/py-html2text@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}imapclient>=2.1.0:mail/py-imapclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mail-parser>=3.11.0:mail/py-mail-parser@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/net-mgmt/py-dnsdiag/Makefile b/net-mgmt/py-dnsdiag/Makefile
index 18fe887f466e..a6e178e083f8 100644
--- a/net-mgmt/py-dnsdiag/Makefile
+++ b/net-mgmt/py-dnsdiag/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dnsdiag
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	DNS Diagnostics and measurement tools (ping, traceroute)
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0.0:dns/py-dnspython2@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=2.0.0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR}
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index dd342d4db626..e3620e23f271 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	web2ldap
 PORTVERSION=	1.7.1
+POREREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP https://www.web2ldap.de/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.22.0:devel/py-asn1crypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0.0:dns/py-dnspython2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=2.0.0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap0>=1.2.8:net/py-ldap0@${PY_FLAVOR} \