From nobody Tue Mar 01 00:47:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9D12D19F9D5D for ; Tue, 1 Mar 2022 00:47:40 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6z9m3SYNz3v2q for ; Tue, 1 Mar 2022 00:47:40 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646095660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n+aM06okkmgkfHwpDwF8wflNawkLPjmsGcLO1+uB2jo=; b=sOpUcAT6O5iI8YCzj0vBn57M00twP7hQkVxK/QKdy3hUaTUXhuh9HfAJ4HMd0hX6TdCbyl L61DKQ9FUxhBbX4VlvQxvj00CypfJYE42+tTKrg2b3yZmi0RrV2dj+minT8X2SoFOWHm03 HyufcUyAnCLOBEV202fA/MFWATP940qRQymyXwRcwd2xkRtna32FA9201C8vmj+kWbdiu6 jFfgcmQ+iOG02u+lBbGzptL0izZ2HPsqbbkImh5eiT4y+ct+i1eVMVpa1ADjFR75Awsz1f VdSOwP7hzfA5WJRDsylJh8LREoN/OhNrjDtaUQWFJp1MuX2T2xkDx7ikOkHUXQ== Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 5357B68B for ; Tue, 1 Mar 2022 00:47:40 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-vk1-f181.google.com with SMTP id l10so6094109vki.9 for ; Mon, 28 Feb 2022 16:47:40 -0800 (PST) X-Gm-Message-State: AOAM532fepfuZxR5aM/iPOpiX91n5n9j0jRA6QPe0QZND8iq07ScWhLn Y9ka90o7o/NR1lfynrbv/YTkwQqBpoqUmNhD1qwDQw== X-Google-Smtp-Source: ABdhPJxPLBpdsbOR6QfkgIDwz0y23bXJHyRMkKXT+EU+MFdrm9u7/b9fjqZm2ZJIENpOpI+fobraCY8+4jd12rAtaOg= X-Received: by 2002:a05:6122:902:b0:331:f5b:8aad with SMTP id j2-20020a056122090200b003310f5b8aadmr9407720vka.38.1646095659876; Mon, 28 Feb 2022 16:47:39 -0800 (PST) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202202282341.21SNf1fw039508@gitrepo.freebsd.org> In-Reply-To: <202202282341.21SNf1fw039508@gitrepo.freebsd.org> From: Po-Chuan Hsieh Date: Tue, 1 Mar 2022 08:47:03 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 08b5ebce79c5 - main - dns/py-dnspython: Revert 7fc16da To: Muhammad Moinur Rahman Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Yasuhiro Kimura Content-Type: multipart/alternative; boundary="00000000000012db2205d91d83e9" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646095660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n+aM06okkmgkfHwpDwF8wflNawkLPjmsGcLO1+uB2jo=; b=jpvZ6fL/U+xc7viXoq1iVhBut7OVvNgkzSQnXdFqdLKyIQoFsJNX8jnAn+XqHoddEaW441 CKE2TJ9QTCNd7+NBVSV0jCuNOKJdcbMPEzpWrpbXKTJ9Z8/0rF7bozmwngCvQPINL9ggz/ 1bfl+I/Osn1hN3SZBxs9npq0RHspXrePFck92Cc5uWWztCOp7b2EJqdDOLGKNRq4z5StL4 dUf+HbDfq/gXTMl/Nhjdp3sNl+Nm5vMllYFvabUJZy0X8jbEIK+60pT1Aam/i5rOXDoiJS mTddcsfkFxrNOmOY9yWP7PF1aCRtm6oFcjJ5IuDGCeQU1y6ii2zoVchIVGPdLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646095660; a=rsa-sha256; cv=none; b=eVs3qZj0YiyO1wvrdkoZMoqwB9RYuKeVgqhfHdukvOetnBnm+WxyOr/k72RtX7EaQDqeFs KnjJAOxngI5B0dCSkiUROGHwxgn79ksBFL2fwZih+KxEVkXwK3WrTleV8Y/KijvgkgCdQQ QjspeVf6V9udZrCpnpSfJZblqAyawb4vCvsiKlrdXoMfT048o4kzRy4J0IlSaAUJoCiCDj syPD3CDEhNIPgwMnIxgk3zn1p/PX4wuLeQTR4ik6vUgHVN/HP8id4hPSEezKoX/JPDesQ8 tJiSRUr01en8HuJbZpy0NSy0MBEIXdjYK1j8pnSC5NIYhzePyi9GXY01i+vTgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --00000000000012db2205d91d83e9 Content-Type: text/plain; charset="UTF-8" Please revert it. At least it breaks dependent ports now. from poudriere: [00:00:31] [03] [00:00:00] Building dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 [00:00:31] [03] [00:00:00] Finished dns/py-dnspython@py38 | py38-dnspython-1.16.0,1: Ignored: Unknown flavor 'py38', possible flavors: py27 py37 [00:00:31] [03] [00:00:00] Skipping net/py-eventlet | py38-eventlet-0.33.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-glance-store | py38-glance-store-3.0.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-os-brick | py38-os-brick-5.2.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-os-win | py38-os-win-5.6.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.privsep | py38-oslo.privsep-2.7.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.service | py38-oslo.service-2.8.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored [00:00:31] [03] [00:00:00] Skipping devel/py-oslo.vmware | py38-oslo.vmware-3.10.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 ignored AFAIK, mail/mailman is the only consumer of dns/py-dnspython@py27. It will be better to: - Add dns/py-dnspython1 (w/ USES=python:2.7) just for mail/mailman. - Update dns/py-dnspython to 2.2.0 (w/ USES=python:3.6+) - Remove dns/py-dnspython2 The reason why I suggest keeping dns/py-dnspython, not your dns/py-dnspython2, is to match upstream naming on PyPI. It helps everyone to find the correct port we want. Thanks, sunpoet On Tue, Mar 1, 2022 at 7:41 AM Muhammad Moinur Rahman wrote: > The branch main has been updated by bofh: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=08b5ebce79c5923c31b249d37df69b99ddcb843e > > commit 08b5ebce79c5923c31b249d37df69b99ddcb843e > Author: Muhammad Moinur Rahman > AuthorDate: 2022-02-28 23:31:02 +0000 > Commit: Muhammad Moinur Rahman > CommitDate: 2022-02-28 23:40:41 +0000 > > dns/py-dnspython: Revert 7fc16da > > - Remove duplicate PORTVERSION based on PYTHON_MAJOR_VER > - Add PORTEPOCH as version number going backwards 2.1.0=>1.16.0 > - Restrict python upto 3.7 > - Fix finance/electrum which was changed based on this. > - Fix dns/py-dns-lexicon which was changed based on this. > PR: 261325 > Approved by: portmgr > Fixes: 7fc16da dns/py-dnspython: Update to 2.1.0 for Python 3 > --- > dns/py-dns-lexicon/Makefile | 4 ++-- > dns/py-dnspython/Makefile | 22 ++++++++-------------- > dns/py-dnspython/distinfo | 4 +--- > finance/electrum/Makefile | 4 ++-- > 4 files changed, 13 insertions(+), 21 deletions(-) > > diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile > index f5b1b39ca35d..12f4451fbb78 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= 1 > +PORTREVISION= 2 > 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}dnspython>=2:dns/py-dnspython@${PY_FLAVOR} > +DDNS_RUN_DEPENDS= > ${PYTHON_PKGNAMEPREFIX}dnspython2>=2:dns/py-dnspython2@${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/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile > index ba52900816d1..083f98e153a6 100644 > --- a/dns/py-dnspython/Makefile > +++ b/dns/py-dnspython/Makefile > @@ -2,6 +2,7 @@ > > PORTNAME= dnspython > PORTVERSION= 1.16.0 > +PORTEPOCH= 1 > CATEGORIES= dns python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > @@ -12,27 +13,20 @@ COMMENT= DNS toolkit for Python > LICENSE= ISCL > LICENSE_FILE= ${WRKSRC}/LICENSE > > -USES= python:2.7+ zip > +USES= python:2.7-3.7 zip > USE_PYTHON= autoplist concurrent cython distutils > > NO_ARCH= yes > > -OPTIONS_DEFINE= EXAMPLES PYCRYPTODOME > -PYCRYPTODOME_DESC= Enable pycryptodome (part of dnssec needs it) > -PYCRYPTODOME_RUN_DEPENDS= > ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@ > ${PY_FLAVOR} > - > -PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py \ > - xfr.py zonediff.py > +PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py > xfr.py \ > + zonediff.py > > -.include > - > -.if ${PYTHON_MAJOR_VER} == 3 > -PORTVERSION= 2.1.0 > -.endif > +OPTIONS_DEFINE= EXAMPLES PYCRYPTODOME > +PYCRYPTODOME_DESC= Enable pycryptodome (part of dnssec needs > it) > +PYCRYPTODOME_RUN_DEPENDS= > ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@ > ${PY_FLAVOR} > > post-install-EXAMPLES-on: > -# examples > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} > ${STAGEDIR}${EXAMPLESDIR} > > -.include > +.include > diff --git a/dns/py-dnspython/distinfo b/dns/py-dnspython/distinfo > index a4ae58940da3..88b7df39d17d 100644 > --- a/dns/py-dnspython/distinfo > +++ b/dns/py-dnspython/distinfo > @@ -1,5 +1,3 @@ > -TIMESTAMP = 1613064959 > +TIMESTAMP = 1646069762 > SHA256 (dnspython-1.16.0.zip) = > 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 > SIZE (dnspython-1.16.0.zip) = 266364 > -SHA256 (dnspython-2.1.0.zip) = > e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 > -SIZE (dnspython-2.1.0.zip) = 389021 > diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile > index 93d821c7bc2e..901c2d8e96b9 100644 > --- a/finance/electrum/Makefile > +++ b/finance/electrum/Makefile > @@ -2,7 +2,7 @@ > > PORTNAME= electrum > PORTVERSION= 4.1.5 > -PORTREVISION= 1 > +PORTREVISION= 2 > 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}dnspython>=2.0:dns/py-dnspython@${PY_FLAVOR} > \ > + ${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0:dns/py-dnspython2@${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} > \ > --00000000000012db2205d91d83e9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Please revert it.
At least it breaks de= pendent ports now.

from poudriere:
[= 00:00:31] [03] [00:00:00] Building dns/py-dnspython@py38 | py38-dnspython-1= .16.0,1
[00:00:31] [03] [00:00:00] Finished dns/py-dnspython@py38 | py38= -dnspython-1.16.0,1: Ignored: Unknown flavor 'py38', possible flavo= rs: py27 py37
[00:00:31] [03] [00:00:00] Skipping net/py-eventlet | py38= -eventlet-0.33.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.1= 6.0,1 ignored
[00:00:31] [03] [00:00:00] Skipping devel/py-glance-store = | py38-glance-store-3.0.0: Dependent port dns/py-dnspython@py38 | py38-dnsp= ython-1.16.0,1 ignored
[00:00:31] [03] [00:00:00] Skipping devel/py-os-b= rick | py38-os-brick-5.2.0: Dependent port dns/py-dnspython@py38 | py38-dns= python-1.16.0,1 ignored
[00:00:31] [03] [00:00:00] Skipping devel/py-os-= win | py38-os-win-5.6.0: Dependent port dns/py-dnspython@py38 | py38-dnspyt= hon-1.16.0,1 ignored
[00:00:31] [03] [00:00:00] Skipping devel/py-oslo.p= rivsep | py38-oslo.privsep-2.7.0: Dependent port dns/py-dnspython@py38 | py= 38-dnspython-1.16.0,1 ignored
[00:00:31] [03] [00:00:00] Skipping devel/= py-oslo.service | py38-oslo.service-2.8.0: Dependent port dns/py-dnspython@= py38 | py38-dnspython-1.16.0,1 ignored
[00:00:31] [03] [00:00:00] Skippi= ng devel/py-oslo.vmware | py38-oslo.vmware-3.10.0: Dependent port dns/py-dn= spython@py38 | py38-dnspython-1.16.0,1 ignored

AFAIK, mail/mailman is the only consumer of dns/py-dnspython@py27.
It will be better to:
- Add dns/py-dnspython1 (w/ USES=3Dpytho= n:2.7) just for mail/mailman.
- Update dns/py-dnspython to 2.2.0 = (w/ USES=3Dpython:3.6+)
- Remove dns/py-dnspython2

=
The reason why I suggest keeping dns/py-dnspython, not your dns/= py-dnspython2, is to match upstream naming on PyPI.
It helps ever= yone to find the correct port we want.

Thanks,
sunpoet

On Tue, Mar 1, 2022 at 7:41 AM Muhammad= Moinur Rahman <bo= fh@freebsd.org> wrote:
The branch main has been updated by bofh:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D08b5ebce79c5923c31b249d37df69b99ddcb843e

commit 08b5ebce79c5923c31b249d37df69b99ddcb843e
Author:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBSD.org><= br> AuthorDate: 2022-02-28 23:31:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBSD.org><= br> CommitDate: 2022-02-28 23:40:41 +0000

=C2=A0 =C2=A0 dns/py-dnspython: Revert 7fc16da

=C2=A0 =C2=A0 - Remove duplicate PORTVERSION based on PYTHON_MAJOR_VER
=C2=A0 =C2=A0 - Add PORTEPOCH as version number going backwards 2.1.0=3D>= ;1.16.0
=C2=A0 =C2=A0 - Restrict python upto 3.7
=C2=A0 =C2=A0 - Fix finance/electrum which was changed based on this.
=C2=A0 =C2=A0 - Fix dns/py-dns-lexicon which was changed based on this.
=C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0261325
=C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 portmgr
=C2=A0 =C2=A0 Fixes: 7fc16da dns/py-dnspython: Update to 2.1.0 for Python 3=
---
=C2=A0dns/py-dns-lexicon/Makefile |=C2=A0 4 ++--
=C2=A0dns/py-dnspython/Makefile=C2=A0 =C2=A0| 22 ++++++++--------------
=C2=A0dns/py-dnspython/distinfo=C2=A0 =C2=A0|=C2=A0 4 +---
=C2=A0finance/electrum/Makefile=C2=A0 =C2=A0|=C2=A0 4 ++--
=C2=A04 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
index f5b1b39ca35d..12f4451fbb78 100644
--- a/dns/py-dns-lexicon/Makefile
+++ b/dns/py-dns-lexicon/Makefile
@@ -2,7 +2,7 @@

=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 dns-lexicon
=C2=A0PORTVERSION=3D=C2=A0 =C2=A03.9.2
-PORTREVISION=3D=C2=A0 1
+PORTREVISION=3D=C2=A0 2
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 dns python
=C2=A0MASTER_SITES=3D=C2=A0 CHEESESHOP
=C2=A0PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -32,7 +32,7 @@ OCI_DESC=3D=C2=A0 =C2=A0 =C2=A0Oracle Cloud Infrastructur= e (OCI) support
=C2=A0ROUTE53_DESC=3D=C2=A0 Route 53 support
=C2=A0SOFTLAYER_DESC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 SoftLayer (IBM Cloud) su= pport

-DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}dnspython&g= t;=3D2:dns/py-dnspython@${PY_FLAVOR}
+DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}dnspython2&= gt;=3D2:dns/py-dnspython2@${PY_FLAVOR}
=C2=A0GRANSY_RUN_DEPENDS=3D=C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}zeep>=3D= 3:net/py-zeep@${PY_FLAVOR}
=C2=A0LOCALZONE_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}localzone>=3D0.9.8= :dns/py-localzone@${PY_FLAVOR}
=C2=A0OCI_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNAMEPREFIX}o= ci>=3D2:devel/py-oci@${PY_FLAVOR}
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index ba52900816d1..083f98e153a6 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -2,6 +2,7 @@

=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 dnspython
=C2=A0PORTVERSION=3D=C2=A0 =C2=A01.16.0
+PORTEPOCH=3D=C2=A0 =C2=A0 =C2=A01
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 dns python
=C2=A0MASTER_SITES=3D=C2=A0 CHEESESHOP
=C2=A0PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
@@ -12,27 +13,20 @@ COMMENT=3D=C2=A0 =C2=A0 DNS toolkit for Python
=C2=A0LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0ISCL
=C2=A0LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSE

-USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 python:2.7+ zip
+USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 python:2.7-3.7 zip
=C2=A0USE_PYTHON=3D=C2=A0 =C2=A0 autoplist concurrent cython distutils

=C2=A0NO_ARCH=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0yes

-OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 EXAMPLES PYCRYPTODOME
-PYCRYPTODOME_DESC=3D=C2=A0 =C2=A0 =C2=A0Enable pycryptodome (part of dnsse= c needs it)
-PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}pyc= ryptodome>=3D0:security/py-pycryptodome@${PY_FLAVOR}
-
-PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py reverse_nam= e.py \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0xfr.py zonediff.py<= br> +PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py reverse_nam= e.py xfr.py \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0zonediff.py

-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_MAJOR_VER} =3D=3D 3
-PORTVERSION=3D=C2=A0 =C2=A02.1.0
-.endif
+OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 EXAMPLES PYCRYPTODOME
+PYCRYPTODOME_DESC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Enable= pycryptodome (part of dnssec needs it)
+PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}pyc= ryptodome>=3D0:security/py-pycryptodome@${PY_FLAVOR}

=C2=A0post-install-EXAMPLES-on:
-# examples
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/ex= amples/,} ${STAGEDIR}${EXAMPLESDIR}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/py-dnspython/distinfo b/dns/py-dnspython/distinfo
index a4ae58940da3..88b7df39d17d 100644
--- a/dns/py-dnspython/distinfo
+++ b/dns/py-dnspython/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP =3D 1613064959
+TIMESTAMP =3D 1646069762
=C2=A0SHA256 (dnspython-1.16.0.zip) =3D 36c5e8e38d4369a08b6780b7f27d790a292= b2b08eea01607865bf0936c558e01
=C2=A0SIZE (dnspython-1.16.0.zip) =3D 266364
-SHA256 (dnspython-2.1.0.zip) =3D e4a87f0b573201a0f3727fa18a516b055fd1107e0= e5477cded4a2de497df1dd4
-SIZE (dnspython-2.1.0.zip) =3D 389021
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 93d821c7bc2e..901c2d8e96b9 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -2,7 +2,7 @@

=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 electrum
=C2=A0PORTVERSION=3D=C2=A0 =C2=A04.1.5
-PORTREVISION=3D=C2=A0 1
+PORTREVISION=3D=C2=A0 2
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 finance python
=C2=A0MASTER_SITES=3D=C2=A0 https://download.electr= um.org/${PORTVERSION}/ \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 http://download.electrum.org/${PORTVERSION}/
@@ -23,7 +23,7 @@ RUN_DEPENDS=3D=C2=A0 ${PYTHON_PKGNAMEPREFIX}aiohttp-socks= >=3D0.3:net/py-aiohttp-socks@${PY
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}cryptography>=3D2.6:security/py-cryptography@${PY_FLAVOR} \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNAMEPRE= FIX}dnspython>=3D2.0:dns/py-dnspython@${PY_FLAVOR} \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNAMEPRE= FIX}dnspython2>=3D2.0:dns/py-dnspython2@${PY_FLAVOR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}httplib2>=3D0:www/py-httplib2@${PY_FLAVOR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPRE= FIX}pbkdf2>=3D1.3:security/py-pbkdf2@${PY_FLAVOR} \
--00000000000012db2205d91d83e9--