From nobody Tue Mar 1 19:58:47 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 8864019F75D1 for ; Tue, 1 Mar 2022 19:59:25 +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 4K7Skh6sxPz4sY6 for ; Tue, 1 Mar 2022 19:59:24 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646164765; 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=TA9MeL7au+5TPnC8CVTaGQr1zZMYtWEBM61HB4iVUH0=; b=rfkKg21RB8WlgTuIKa5KfkTkUJcLVyCuzVRB8KL+bbhT8USobd75hYM5SAWprTCnWnhjGB lacb8gx41h/HA5Xan0Cz3WZfrd/RDSsxOnJEz0DT51b2riPJw9zlMJKPtt3aNjCSWOstWu WJld4UjiBXQdvoJDoKavJ9pX1/8NOs+iG4XIYD3+P+8WCCsvH0AkrpvM7H3shIS+RcQFQM xIY/B4p3tQoXl+0mM0wU7JLsHJvS0eIukbqTeh96DVfeyYw4zC8zbxFjsT/jOIdi9sZ8cJ cJbrBoQ8No1z47FBa8TElARpSTstps4xxoVpA7aEQsZFwhYU5GxwaGxoNSp6pA== Received: from mail-vk1-f182.google.com (mail-vk1-f182.google.com [209.85.221.182]) (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 852C6AC19 for ; Tue, 1 Mar 2022 19:59:24 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-vk1-f182.google.com with SMTP id l10so7454989vki.9 for ; Tue, 01 Mar 2022 11:59:24 -0800 (PST) X-Gm-Message-State: AOAM532Z01f48zP3ArLymIL60ac9X/sNlmQJeIF6MBXez3SLBLsJG9UA lV1Bv79iW1mTJdYs17WRLpLyMH/TjgBnIjSTNGjHBQ== X-Google-Smtp-Source: ABdhPJyf9Z7yuD9UjQVasJGfYGT1EkgBiJeEs4ri0BVvVj1btXPhJW7BZpGK8da1OO6JY10SEypB0NeQTmh5NkFD1+c= X-Received: by 2002:a05:6122:919:b0:336:84ba:f388 with SMTP id j25-20020a056122091900b0033684baf388mr186654vka.38.1646164763884; Tue, 01 Mar 2022 11:59:23 -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: From: Po-Chuan Hsieh Date: Wed, 2 Mar 2022 03:58:47 +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 , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Yasuhiro Kimura Content-Type: multipart/alternative; boundary="000000000000fe688105d92d99d7" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646164765; 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=TA9MeL7au+5TPnC8CVTaGQr1zZMYtWEBM61HB4iVUH0=; b=FEHKxKH+iY7eEQvvfhW6wng0lPdADzJlHVhGf/bABGD5/cg/vkcmrtUiuikOJgBXpojZVB q2BPgz0DRGl2grbNAL1bWXJzXOxAAcj9RanbQkJzwZqmMTkR3Tav8CeEc0boFvbJ+yXTlB Xr4aygSyEswyuWK0GAGTk63A9q/4OycKpAKd+YMzj68AqJJDM42fSbYYK1Nzs0FQ2YdxXT ogY4OcHtApcyCrSRb752NT/3q/34oK4q9pR2onDjpFBa3O9IoN/OQiD8c4Iuyx/HGfKX80 y9uUrYhr6Oa4nXtSITY/JCJT+Ll1M5ghEyZufLLMkyyXEWfzea0DNyx1yX1k+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646164765; a=rsa-sha256; cv=none; b=aRszs8kPbDq6wooT8ifFf5dj4UewkluYM408L9p8XC6wy6PSGoszYlkch8fPb2G49ytDzQ pCiUmMwmn/Oq3UiVcm95ub2a19BEogc0CKw7VZnNJsWmeFopSZyiZ2IHioG0TiMBhRMXWS PMBZddaVgf4I72iHnisPr2VlBy/8ZBUnCqyB11ZxDAhC5y8cgACSWXNP0lPCIsBftsLrSW bp10KH7U3cYVIJ5QfgL+np9AfqGgMN5EEaeX/DamRAvex4ZGugKyJrOqnzWigoAkhhKp+E N1x3wk1NE4U2ixWpdbiGoLq194Z+J7FrFQd111sI+gsOpLHQxjUDtkwdM3hHHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --000000000000fe688105d92d99d7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks for your quick fix. Regards, sunpoet On Tue, Mar 1, 2022, 09:22 Muhammad Moinur Rahman wrote: > No it=E2=80=99s not alright having two portversion at least not while you= are > using tree. > > Give me an hour to fix this as per your advise. > > Kind Regards, > Moin (bofh) > > > On 1 Mar 2022, at 02:13, Po-Chuan Hsieh wrote: > > > > 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=3Dpython:2.7) just for mail/mailman. > > - Update dns/py-dnspython to 2.2.0 (w/ USES=3Dpython:3.6+) > > - Remove dns/py-dnspython2 > > > > On Tue, Mar 1, 2022 at 8:58 AM Muhammad Moinur Rahman > 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 PORTVERSIO= N > in one single port? Which is not at all a good idea as is not supported b= y > 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=3Dpython: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 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=3D08b5ebce79c5923c31b249d37df69= b99ddcb843e > > > > > > 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=3D>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/Makefil= e > > > index f5b1b39ca35d..12f4451fbb78 100644 > > > --- a/dns/py-dns-lexicon/Makefile > > > +++ b/dns/py-dns-lexicon/Makefile > > > @@ -2,7 +2,7 @@ > > > > > > PORTNAME=3D dns-lexicon > > > PORTVERSION=3D 3.9.2 > > > -PORTREVISION=3D 1 > > > +PORTREVISION=3D 2 > > > CATEGORIES=3D dns python > > > MASTER_SITES=3D CHEESESHOP > > > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > > > @@ -32,7 +32,7 @@ OCI_DESC=3D Oracle Cloud Infrastructure (OCI) > support > > > ROUTE53_DESC=3D Route 53 support > > > SOFTLAYER_DESC=3D SoftLayer (IBM Cloud) support > > > > > > -DDNS_RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}dnspython>=3D2:dns/py-dnspython@${PY_FLAVOR} > > > +DDNS_RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}dnspython2>=3D2:dns/py-dnspython2@${PY_FLAVOR} > > > GRANSY_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}zeep>=3D3:net/py-zee= p@ > ${PY_FLAVOR} > > > LOCALZONE_RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}localzone>=3D0.9.8:dns/py-localzone@${PY_FLAVOR} > > > OCI_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}oci>=3D2:devel/py-oc= i@ > ${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=3D dnspython > > > PORTVERSION=3D 1.16.0 > > > +PORTEPOCH=3D 1 > > > CATEGORIES=3D dns python > > > MASTER_SITES=3D CHEESESHOP > > > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > > > @@ -12,27 +13,20 @@ COMMENT=3D DNS toolkit for Python > > > LICENSE=3D ISCL > > > LICENSE_FILE=3D ${WRKSRC}/LICENSE > > > > > > -USES=3D python:2.7+ zip > > > +USES=3D python:2.7-3.7 zip > > > USE_PYTHON=3D autoplist concurrent cython distutils > > > > > > NO_ARCH=3D yes > > > > > > -OPTIONS_DEFINE=3D EXAMPLES PYCRYPTODOME > > > -PYCRYPTODOME_DESC=3D Enable pycryptodome (part of dnssec needs i= t) > > > -PYCRYPTODOME_RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3D0:security/py-pycryptodome@ > ${PY_FLAVOR} > > > - > > > -PORTEXAMPLES=3D ddns.py e164.py mx.py name.py reverse.py > reverse_name.py \ > > > - xfr.py zonediff.py > > > +PORTEXAMPLES=3D ddns.py e164.py mx.py name.py reverse.py > reverse_name.py xfr.py \ > > > + zonediff.py > > > > > > -.include > > > - > > > -.if ${PYTHON_MAJOR_VER} =3D=3D 3 > > > -PORTVERSION=3D 2.1.0 > > > -.endif > > > +OPTIONS_DEFINE=3D EXAMPLES PYCRYPTODOME > > > +PYCRYPTODOME_DESC=3D Enable pycryptodome (part of dnssec > needs it) > > > +PYCRYPTODOME_RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3D0: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 =3D 1613064959 > > > +TIMESTAMP =3D 1646069762 > > > SHA256 (dnspython-1.16.0.zip) =3D > 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 > > > SIZE (dnspython-1.16.0.zip) =3D 266364 > > > -SHA256 (dnspython-2.1.0.zip) =3D > e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 > > > -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 @@ > > > > > > PORTNAME=3D electrum > > > PORTVERSION=3D 4.1.5 > > > -PORTREVISION=3D 1 > > > +PORTREVISION=3D 2 > > > CATEGORIES=3D finance python > > > MASTER_SITES=3D https://download.electrum.org/${PORTVERSION}/ \ > > > http://download.electrum.org/${PORTVERSION}/ > > > @@ -23,7 +23,7 @@ RUN_DEPENDS=3D > ${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=3D0.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>=3D2.6:security/py-cryptography@${PY= _FLAVOR} > \ > > > - ${PYTHON_PKGNAMEPREFIX}dnspython>=3D2.0:dns/py-dnspyt= hon@${PY_FLAVOR} > \ > > > + > ${PYTHON_PKGNAMEPREFIX}dnspython2>=3D2.0:dns/py-dnspython2@${PY_FLAVOR} = \ > > > ${PYTHON_PKGNAMEPREFIX}httplib2>=3D0:www/py-httplib2@= ${PY_FLAVOR} > \ > > > > ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY= _FLAVOR} > \ > > > ${PYTHON_PKGNAMEPREFIX}pbkdf2>=3D1.3:security/py-pbkd= f2@${PY_FLAVOR} > \ > > > > --000000000000fe688105d92d99d7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks for your quick fix.

Regards,
sunpoet

On Tue, Mar 1, 2022, 09:22 Muhamma= d Moinur Rahman <b= ofh@freebsd.org> wrote:
No it=E2=80=99s not alright having two portversion at least = not while you are using tree.

Give me an hour to fix this as per your advise.

Kind Regards,
Moin (bofh)

> On 1 Mar 2022, at 02:13, Po-Chuan Hsieh <sunpoet@freebsd.org&g= t; wrote:
>
> 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 men= tioned in previous mail.
> - 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
>
> On Tue, Mar 1, 2022 at 8:58 AM Muhammad Moinur Rahman <bofh@freebsd.o= rg> 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 PORTVERSI= ON 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 <sunpoet@freebsd.org<= /a>> 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 flavor= s: py27 py37
> > [00:00:31] [03] [00:00:00] Skipping net/py-eventlet | py38-eventl= et-0.33.0: Dependent port dns/py-dnspython@py38 | py38-dnspython-1.16.0,1 i= gnored
> > [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-b= rick-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 igno= red
> > [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-o= slo.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=3Dpython:2.7) just for mail/mail= man.
> > - 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/p= y-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 <bofh@free= bsd.org> wrote:
> > The branch main has been updated by bofh:
> >
> > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D08b5ebce79c5923c31b= 249d37df69b99ddcb843e
> >
> > commit 08b5ebce79c5923c31b249d37df69b99ddcb843e
> > Author:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBS= D.org>
> > AuthorDate: 2022-02-28 23:31:02 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Muhammad Moinur Rahman <bofh@FreeBS= D.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= _MAJOR_VER
> >=C2=A0 =C2=A0 =C2=A0- Add PORTEPOCH as version number going backwa= rds 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 this.
> >=C2=A0 =C2=A0 =C2=A0- Fix dns/py-dns-lexicon which was changed bas= ed on this.
> >=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0261325
> >=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 for 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/Mak= efile
> > 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 Inf= rastructure (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= Cloud) support
> >
> > -DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}d= nspython>=3D2:dns/py-dnspython@${PY_FLAVOR}
> > +DDNS_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}d= nspython2>=3D2:dns/py-dnspython2@${PY_FLAVOR}
> >=C2=A0 GRANSY_RUN_DEPENDS=3D=C2=A0 =C2=A0 ${PYTHON_PKGNAMEPREFIX}z= eep>=3D3:net/py-zeep@${PY_FLAVOR}
> >=C2=A0 LOCALZONE_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}localzone&g= t;=3D0.9.8:dns/py-localzone@${PY_FLAVOR}
> >=C2=A0 OCI_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_PKGNA= MEPREFIX}oci>=3D2:devel/py-oci@${PY_FLAVOR}
> > diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefil= e
> > 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 Pytho= n
> >=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 dist= utils
> >
> >=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 PYCRYPTODO= ME
> > -PYCRYPTODOME_DESC=3D=C2=A0 =C2=A0 =C2=A0Enable pycryptodome (par= t of dnssec needs it)
> > -PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAME= PREFIX}pycryptodome>=3D0:security/py-pycryptodome@${PY_FLAVOR}
> > -
> > -PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py r= everse_name.py \
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0xfr.py zo= nediff.py
> > +PORTEXAMPLES=3D=C2=A0 ddns.py e164.py mx.py name.py reverse.py r= everse_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=A0Enable pycryptodome (part of dnssec needs it)
> > +PYCRYPTODOME_RUN_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 ${PYTHON_PKGNAME= PREFIX}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}${EXAMPLESD= IR}
> >=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/distinf= o
> > 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 36c5e8e38d4369a08b6780b7f= 27d790a292b2b08eea01607865bf0936c558e01
> >=C2=A0 SIZE (dnspython-1.16.0.zip) =3D 266364
> > -SHA256 (dnspython-2.1.0.zip) =3D e4a87f0b573201a0f3727fa18a516b0= 55fd1107e0e5477cded4a2de497df1dd4
> > -SIZE (dnspython-2.1.0.zip) =3D 389021
> > diff --git a/finance/electrum/Makefile b/finance/electrum/Makefil= e
> > 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 ht= tps://download.electrum.org/${PORTVERSION}/ \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0http://download.electrum.org/${PORTVERSION}/<= /a>
> > @@ -23,7 +23,7 @@ RUN_DEPENDS=3D=C2=A0 ${PYTHON_PKGNAMEPREFIX}aio= http-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${PY= THON_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${PY= THON_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${PY= THON_PKGNAMEPREFIX}cryptography>=3D2.6:security/py-cryptography@${PY_FLA= VOR} \
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PYTHON_= PKGNAMEPREFIX}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_= PKGNAMEPREFIX}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${PY= THON_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${PY= THON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLA= VOR} \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PY= THON_PKGNAMEPREFIX}pbkdf2>=3D1.3:security/py-pbkdf2@${PY_FLAVOR} \
>

--000000000000fe688105d92d99d7--