From nobody Tue Mar 01 01:13:35 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 0723319FE4D4 for ; Tue, 1 Mar 2022 01:14:13 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4K6zmN6fm9z4Rgm for ; Tue, 1 Mar 2022 01:14:12 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646097253; 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=Xl5P6PdPopDtgcJQPdq/pSU9rVmGpV4DiaqbZsifIOk=; b=kQzCoD+IT8Y/r1XuMa+Adp/pvUrQLLurRaUH5oEl1QE9dO35eymq+14xrqY92Orro6FGNv HIjkaK4Iu5D83dknyz04/taAj8wMVku032bzW3KbH7h3ZCfv/jXPGFFc/pEt4bLs9HYa21 X+fwPV552nl0WheFzVmD1EKGb83X3Ot3UHqvOcMqUuNJV1flJjm7f2NUnk7mfpjXOT5pG/ x55HNmWu/WDg9JIctSDPsVcyKXUYWowdMAspmP/NQTvcxhz3gzVKevY/SEKlZWRqIEZTmD xE/G8ivgin7aAL6RB9jTcNh0mQe5P4KClAH/z+LpfA772thVxy774gJ7CFXWIw== Received: from mail-ua1-f44.google.com (mail-ua1-f44.google.com [209.85.222.44]) (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 BB82CC24 for ; Tue, 1 Mar 2022 01:14:12 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ua1-f44.google.com with SMTP id 10so6786536uar.9 for ; Mon, 28 Feb 2022 17:14:12 -0800 (PST) X-Gm-Message-State: AOAM533m7wMtE4EHZhPicD0blF/TiI7ROTQJkTKMumNa1y9AwqoHMSPC dYuJoXLlwOC4KVksYuFZVo5RENMNezMAJCrVLwFpQA== X-Google-Smtp-Source: ABdhPJxhAVB1uDKOupUWfDPaI3G8LILdBFGxiLLahwN79B+VN/qHB6OblCagGketWxNlDr/C39i50cMUMAAbixTrXlQ= X-Received: by 2002:ab0:2351:0:b0:347:2121:547a with SMTP id h17-20020ab02351000000b003472121547amr2959402uao.15.1646097251935; Mon, 28 Feb 2022 17:14:11 -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> <0E479595-637E-4F10-87E4-B3D5CFD672F4@freebsd.org> In-Reply-To: <0E479595-637E-4F10-87E4-B3D5CFD672F4@freebsd.org> From: Po-Chuan Hsieh Date: Tue, 1 Mar 2022 09:13:35 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 08b5ebce79c5 - main - dns/py-dnspython: Revert 7fc16da To: Muhammad Moinur Rahman Cc: Sunpoet Po-Chuan Hsieh , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Yasuhiro Kimura Content-Type: multipart/alternative; boundary="000000000000f7bb7305d91de104" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646097253; 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=Xl5P6PdPopDtgcJQPdq/pSU9rVmGpV4DiaqbZsifIOk=; b=Tuad+OjT/23AcCtxrc/pprPHmoEvIVq51sH7hCpwOmjrpdcwrwX/Co5VdOFVswhMxiKaVt Aq/1i01aWNnTTs1WDft1s49Db9jxRTZOEJufccbKAj7WqVQTYOWZQ8bkgLSpaunNeQ51Co 8EypRbEmoQQU9ZsZPm3qQVf1z1zR2vB7Nf/VEMB9J/ZdSAqAfwxYB8ZPGyN61teWo4Nlh6 QhEaYvJZ6rRTx3nkdIYR24SRtKyqQIbGv8xltcdNdmVsPBChDvu1tdnnt4DnE1wjCXKUEI vcUdaLFgKLdRebEtdvg4j/XhBc8fPfsVUSnW90N/pSIexvUlPpevhzwC2IiXWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646097253; a=rsa-sha256; cv=none; b=jlfiZP5SZuxT8yV2tCsG7r4PnZTFi9CGqqjJhW8IHqX+tVzLJYnqJWG/fyJkD0i3rYPM7e RentQPwjQLspcw2MOnoo+1bUp5ik+9hruXWRKG1STwNeKCJqQOaoLiTbPadMM3A4wndsp+ aLwi18p293OfjKzrsXwdrWTLQU4vDVEB8oBHkUnxMyhbAjjcOL7K7mJciHqk+++lHQHHfr XBn9z2JV+YKUY1iHnUwQMHdfnkiOcAgY7UgrdEWptAoQfEbny6cuEOAdWZ4PjQzEoebFiH jGb4iaqoaOWPor5rRUw8CpLxV03RIbJ22pmXKo4HLv5gWvel0FqjzR3VQZKy2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --000000000000f7bb7305d91de104 Content-Type: text/plain; charset="UTF-8" I mean revert this commit. It is fine for me to have 2 PORTVERSIONs in a port. If you think it is not acceptable, I also provided the solution as mentioned in previous mail. - 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 On Tue, Mar 1, 2022 at 8:58 AM Muhammad Moinur Rahman wrote: > Revert what? > > USES= python:2.7-3.7 to USES= python:2.7+? > > Or you mean keeping the entire logic of having two different PORTVERSION > in one single port? Which is not at all a good idea as is not supported by > portmgr@ at the moment. > > > Kind Regards, > Moin (bofh) > > > On 1 Mar 2022, at 01:47, Po-Chuan Hsieh wrote: > > > > 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} > \ > > --000000000000f7bb7305d91de104 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I mean revert this commit.

I= t is fine for me to have 2 PORTVERSIONs in a port.
If you think i= t is not acceptable, I also provided the solution as mentioned in previous = mail.
- Add dns/py-dnspython1 (w/ USES=3Dpython:2.7) just for mai= l/mailman.
- Update dns/py-dnspython to 2.2.0 (w/ USES=3Dpyth= on:3.6+)
- Remove dns/py-dnspython2

On Tue,= Mar 1, 2022 at 8:58 AM Muhammad Moinur Rahman <bofh@freebsd.org> wrote:
Revert= what?

USES=3D python:2.7-3.7 to USES=3D python:2.7+?

Or you mean keeping the entire logic of having two different PORTVERSION in= one single port? Which is not at all a good idea as is not supported by po= rtmgr@ at the moment.


Kind Regards,
Moin (bofh)

> On 1 Mar 2022, at 01:47, Po-Chuan Hsieh <sunpoet@freebsd.org> wrote:
>
> 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-dnspy= thon-1.16.0,1
> [00:00:31] [03] [00:00:00] Finished dns/py-dnspython@py38 | py38-dnspy= thon-1.16.0,1: Ignored: Unknown flavor 'py38', possible flavors: py= 27 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 ignore= d
> [00:00:31] [03] [00:00:00] Skipping devel/py-glance-store | py38-glanc= e-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 ignor= ed
> [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.v= mware-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=3Dpython:2.7) just for mail/mailman.<= br> > - 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-dns= python2, 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 <bofh@freebsd.org> wrote: > The branch main has been updated by bofh:
>
> URL: https:= //cgit.FreeBSD.org/ports/commit/?id=3D08b5ebce79c5923c31b249d37df69b99ddcb8= 43e
>
> commit 08b5ebce79c5923c31b249d37df69b99ddcb843e
> Author:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBSD.org= >
> AuthorDate: 2022-02-28 23:31:02 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBSD.org= >
> CommitDate: 2022-02-28 23:40:41 +0000
>
>=C2=A0 =C2=A0 =C2=A0dns/py-dnspython: Revert 7fc16da
>
>=C2=A0 =C2=A0 =C2=A0- Remove duplicate PORTVERSION based on PYTHON_MAJO= R_VER
>=C2=A0 =C2=A0 =C2=A0- Add PORTEPOCH as version number going backwards 2= .1.0=3D>1.16.0
>=C2=A0 =C2=A0 =C2=A0- Restrict python upto 3.7
>=C2=A0 =C2=A0 =C2=A0- Fix finance/electrum which was changed based on t= his.
>=C2=A0 =C2=A0 =C2=A0- Fix dns/py-dns-lexicon which was changed based on= this.
>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= 261325
>=C2=A0 =C2=A0 =C2=A0Approved by:=C2=A0 =C2=A0 portmgr
>=C2=A0 =C2=A0 =C2=A0Fixes: 7fc16da dns/py-dnspython: Update to 2.1.0 fo= r Python 3
> ---
>=C2=A0 dns/py-dns-lexicon/Makefile |=C2=A0 4 ++--
>=C2=A0 dns/py-dnspython/Makefile=C2=A0 =C2=A0| 22 ++++++++-------------= -
>=C2=A0 dns/py-dnspython/distinfo=C2=A0 =C2=A0|=C2=A0 4 +---
>=C2=A0 finance/electrum/Makefile=C2=A0 =C2=A0|=C2=A0 4 ++--
>=C2=A0 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 @@
>
>=C2=A0 PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 dns-lexicon
>=C2=A0 PORTVERSION=3D=C2=A0 =C2=A03.9.2
> -PORTREVISION=3D=C2=A0 1
> +PORTREVISION=3D=C2=A0 2
>=C2=A0 CATEGORIES=3D=C2=A0 =C2=A0 dns python
>=C2=A0 MASTER_SITES=3D=C2=A0 CHEESESHOP
>=C2=A0 PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
> @@ -32,7 +32,7 @@ OCI_DESC=3D=C2=A0 =C2=A0 =C2=A0Oracle Cloud Infrastr= ucture (OCI) support
>=C2=A0 ROUTE53_DESC=3D=C2=A0 Route 53 support
>=C2=A0 SOFTLAYER_DESC=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 SoftLayer (IBM Clou= d) support
>
> -DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}dnspyt= hon>=3D2:dns/py-dnspython@${PY_FLAVOR}
> +DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}dnspyt= hon2>=3D2:dns/py-dnspython2@${PY_FLAVOR}
>=C2=A0 GRANSY_RUN_DEPENDS=3D=C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}zeep&g= t;=3D3:net/py-zeep@${PY_FLAVOR}
>=C2=A0 LOCALZONE_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}localzone>=3D= 0.9.8:dns/py-localzone@${PY_FLAVOR}
>=C2=A0 OCI_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNAMEPRE= FIX}oci>=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=A0 PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 dnspython
>=C2=A0 PORTVERSION=3D=C2=A0 =C2=A01.16.0
> +PORTEPOCH=3D=C2=A0 =C2=A0 =C2=A01
>=C2=A0 CATEGORIES=3D=C2=A0 =C2=A0 dns python
>=C2=A0 MASTER_SITES=3D=C2=A0 CHEESESHOP
>=C2=A0 PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
> @@ -12,27 +13,20 @@ COMMENT=3D=C2=A0 =C2=A0 DNS toolkit for Python
>=C2=A0 LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0ISCL
>=C2=A0 LICENSE_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=A0 USE_PYTHON=3D=C2=A0 =C2=A0 autoplist concurrent cython distutils=
>
>=C2=A0 NO_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 = dnssec needs it)
> -PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFI= X}pycryptodome>=3D0:security/py-pycryptodome@${PY_FLAVOR}
> -
> -PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py revers= e_name.py \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0xfr.py zonedif= f.py
> +PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py revers= e_name.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=A0E= nable pycryptodome (part of dnssec needs it)
> +PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFI= X}pycryptodome>=3D0:security/py-pycryptodome@${PY_FLAVOR}
>
>=C2=A0 post-install-EXAMPLES-on:
> -# examples
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_DATA} ${PORTEXAMPLES:S,^,${= WRKSRC}/examples/,} ${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=A0 SHA256 (dnspython-1.16.0.zip) =3D 36c5e8e38d4369a08b6780b7f27d79= 0a292b2b08eea01607865bf0936c558e01
>=C2=A0 SIZE (dnspython-1.16.0.zip) =3D 266364
> -SHA256 (dnspython-2.1.0.zip) =3D e4a87f0b573201a0f3727fa18a516b055fd1= 107e0e5477cded4a2de497df1dd4
> -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=A0 PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 electrum
>=C2=A0 PORTVERSION=3D=C2=A0 =C2=A04.1.5
> -PORTREVISION=3D=C2=A0 1
> +PORTREVISION=3D=C2=A0 2
>=C2=A0 CATEGORIES=3D=C2=A0 =C2=A0 finance python
>=C2=A0 MASTER_SITES=3D=C2=A0 https://download.e= lectrum.org/${PORTVERSION}/ \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0http://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 =C2=A0${PYTHON_= PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_= PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_= PKGNAMEPREFIX}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_PKGNA= MEPREFIX}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_PKGNA= MEPREFIX}dnspython2>=3D2.0:dns/py-dnspython2@${PY_FLAVOR} \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_= PKGNAMEPREFIX}httplib2>=3D0:www/py-httplib2@${PY_FLAVOR} \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_= PKGNAMEPREFIX}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 =C2=A0${PYTHON_= PKGNAMEPREFIX}pbkdf2>=3D1.3:security/py-pbkdf2@${PY_FLAVOR} \

--000000000000f7bb7305d91de104--