Thursday, November 26, 2020

py-dnspython py2/py3 version split

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-dnspython/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 3 Jul 2020 21:13:01 -0000 1.30
+++ Makefile 26 Nov 2020 21:40:11 -0000
@@ -2,8 +2,7 @@

COMMENT= DNS toolkit for Python

-MODPY_EGG_VERSION= 1.16.0
-REVISION= 3
+MODPY_EGG_VERSION= 2.0.0
DISTNAME= dnspython-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= net
@@ -13,10 +12,13 @@ HOMEPAGE= http://www.dnspython.org/
# BSD
PERMIT_PACKAGE= Yes

-MASTER_SITES= ${HOMEPAGE}kits/${MODPY_EGG_VERSION}/
+GH_ACCOUNT= rthalley
+GH_PROJECT= dnspython
+GH_TAGNAME= v${MODPY_EGG_VERSION}

+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+FLAVOR= python3
FLAVORS= python3
-FLAVOR?=

MODULES= lang/python
MODPY_SETUPTOOLS= Yes
@@ -25,9 +27,10 @@ MODPY_PYTEST= Yes

TEST_DEPENDS= security/py-ecdsa${MODPY_FLAVOR}

-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS+= devel/py-typing
-.endif
+RUN_DEPENDS= net/py-idna${MODPY_FLAVOR} \
+ security/py-cryptography${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR} \
+ www/py-requests-toolbelt${MODPY_FLAVOR}

TEST_ENV+= PYTHONPATH="${WRKSRC}"

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-dnspython/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 19 Dec 2018 09:59:45 -0000 1.12
+++ distinfo 26 Nov 2020 21:40:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (dnspython-1.16.0.tar.gz) = S/XFwSpEeO54YKsXZlnPZMSJnudnUtgmsIL4r3I8XPk=
-SIZE (dnspython-1.16.0.tar.gz) = 150524
+SHA256 (dnspython-2.0.0.tar.gz) = Z84tUKUfuQcYQ5mTDCipu3mlC+LFzvgIQYj8R7AIr0w=
+SIZE (dnspython-2.0.0.tar.gz) = 221903
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-dnspython/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 5 Feb 2019 20:57:44 -0000 1.11
+++ pkg/PLIST 26 Nov 2020 21:40:11 -0000
@@ -4,15 +4,21 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncbackend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_asyncio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_curio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}_trio_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncbackend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncquery.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}asyncresolver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}dnssec.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}e164.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}edns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}flags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}grange.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}inet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv4.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ipv6.${MODPY_PYC_MAGIC_TAG}pyc
@@ -31,6 +37,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}reversename.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}rrset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}serial.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}tsig.${MODPY_PYC_MAGIC_TAG}pyc
@@ -38,17 +45,23 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}ttl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wiredata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}wire.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}zone.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/dns/_compat.py
+lib/python${MODPY_VERSION}/site-packages/dns/_asyncbackend.py
+lib/python${MODPY_VERSION}/site-packages/dns/_asyncio_backend.py
+lib/python${MODPY_VERSION}/site-packages/dns/_curio_backend.py
+lib/python${MODPY_VERSION}/site-packages/dns/_trio_backend.py
+lib/python${MODPY_VERSION}/site-packages/dns/asyncbackend.py
+lib/python${MODPY_VERSION}/site-packages/dns/asyncquery.py
+lib/python${MODPY_VERSION}/site-packages/dns/asyncresolver.py
lib/python${MODPY_VERSION}/site-packages/dns/dnssec.py
lib/python${MODPY_VERSION}/site-packages/dns/e164.py
lib/python${MODPY_VERSION}/site-packages/dns/edns.py
lib/python${MODPY_VERSION}/site-packages/dns/entropy.py
+lib/python${MODPY_VERSION}/site-packages/dns/enum.py
lib/python${MODPY_VERSION}/site-packages/dns/exception.py
lib/python${MODPY_VERSION}/site-packages/dns/flags.py
lib/python${MODPY_VERSION}/site-packages/dns/grange.py
-lib/python${MODPY_VERSION}/site-packages/dns/hash.py
lib/python${MODPY_VERSION}/site-packages/dns/inet.py
lib/python${MODPY_VERSION}/site-packages/dns/ipv4.py
lib/python${MODPY_VERSION}/site-packages/dns/ipv6.py
@@ -67,6 +80,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/AFSDB.py
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/AMTRELAY.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/AVC.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/CAA.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/CDNSKEY.py
@@ -86,11 +100,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/ISDN.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/LOC.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/MX.py
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NINFO.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NS.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC3.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC3PARAM.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/OPENPGPKEY.py
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/OPT.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/PTR.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/RP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/RRSIG.py
@@ -99,12 +115,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/SPF.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/SSHFP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TLSA.py
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TSIG.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TXT.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/URI.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/X25.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AFSDB.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AMTRELAY.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}AVC.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CAA.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}CDNSKEY.${MODPY_PYC_MAGIC_TAG}pyc
@@ -124,11 +142,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}ISDN.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}LOC.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}MX.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NINFO.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NS.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}NSEC3PARAM.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPENPGPKEY.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}OPT.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}PTR.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RP.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}RRSIG.${MODPY_PYC_MAGIC_TAG}pyc
@@ -137,6 +157,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SPF.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}SSHFP.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TLSA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TSIG.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}TXT.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}URI.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/${MODPY_PYCACHE}X25.${MODPY_PYC_MAGIC_TAG}pyc
@@ -184,16 +205,19 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}mxbase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}nsbase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}txtbase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/dnskeybase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/dsbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/euibase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/mxbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/nsbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/txtbase.py
+lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/util.py
lib/python${MODPY_VERSION}/site-packages/dns/renderer.py
lib/python${MODPY_VERSION}/site-packages/dns/resolver.py
lib/python${MODPY_VERSION}/site-packages/dns/reversename.py
lib/python${MODPY_VERSION}/site-packages/dns/rrset.py
+lib/python${MODPY_VERSION}/site-packages/dns/serial.py
lib/python${MODPY_VERSION}/site-packages/dns/set.py
lib/python${MODPY_VERSION}/site-packages/dns/tokenizer.py
lib/python${MODPY_VERSION}/site-packages/dns/tsig.py
@@ -201,7 +225,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dns/ttl.py
lib/python${MODPY_VERSION}/site-packages/dns/update.py
lib/python${MODPY_VERSION}/site-packages/dns/version.py
-lib/python${MODPY_VERSION}/site-packages/dns/wiredata.py
+lib/python${MODPY_VERSION}/site-packages/dns/wire.py
lib/python${MODPY_VERSION}/site-packages/dns/zone.py
lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -211,12 +235,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
share/examples/${MODPY_PY_PREFIX}dnspython/
share/examples/${MODPY_PY_PREFIX}dnspython/ddns.py
+share/examples/${MODPY_PY_PREFIX}dnspython/doh-json.py
+share/examples/${MODPY_PY_PREFIX}dnspython/doh.py
share/examples/${MODPY_PY_PREFIX}dnspython/e164.py
+share/examples/${MODPY_PY_PREFIX}dnspython/ecs.py
share/examples/${MODPY_PY_PREFIX}dnspython/mx.py
share/examples/${MODPY_PY_PREFIX}dnspython/name.py
share/examples/${MODPY_PY_PREFIX}dnspython/query_specific.py
share/examples/${MODPY_PY_PREFIX}dnspython/receive_notify.py
share/examples/${MODPY_PY_PREFIX}dnspython/reverse.py
share/examples/${MODPY_PY_PREFIX}dnspython/reverse_name.py
+share/examples/${MODPY_PY_PREFIX}dnspython/trio.py
share/examples/${MODPY_PY_PREFIX}dnspython/xfr.py
share/examples/${MODPY_PY_PREFIX}dnspython/zonediff.py
Index: mail/mailman/Makefile
===================================================================
RCS file: /cvs/ports/mail/mailman/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- mail/mailman/Makefile 7 May 2020 19:06:49 -0000 1.94
+++ mail/mailman/Makefile 26 Nov 2020 21:57:37 -0000
@@ -5,6 +5,8 @@ COMMENT= mailing list manager with web i
DISTNAME= mailman-2.1.32
CATEGORIES= mail www

+REVISION= 0
+
HOMEPAGE= https://www.gnu.org/software/mailman/

# GPLv2
@@ -17,8 +19,8 @@ EXTRACT_SUFX= .tgz

MODULES= lang/python

-BUILD_DEPENDS= net/py-dnspython
-RUN_DEPENDS= net/py-dnspython
+BUILD_DEPENDS= net/py2-dnspython
+RUN_DEPENDS= net/py2-dnspython

NO_TEST= Yes

Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.287
diff -u -p -r1.287 Makefile
--- net/samba/Makefile 20 Mar 2020 16:44:26 -0000 1.287
+++ net/samba/Makefile 26 Nov 2020 21:57:51 -0000
@@ -21,8 +21,11 @@ PKG_ARCH-docs = *
LDB_V = 1.4.8
TEVENT_V = 0.9.37

-REVISION-ldb = 1
-REVISION-tevent = 0
+REVISION-ldb = 2
+REVISION-tevent = 1
+REVISION-main = 0
+REVISION-util = 0
+REVISION-docs = 0

SHARED_LIBS = asn1-samba4 0.0 \
com_err-samba4 0.0 \
@@ -107,11 +110,11 @@ MODULES = lang/python perl

BUILD_DEPENDS = devel/cmocka \
devel/p5-Parse-Yapp>=1.0.5 \
- net/py-dnspython \
+ net/py2-dnspython \
textproc/docbook-xsl \
x11/dbus

-RUN_DEPENDS-main = net/py-dnspython
+RUN_DEPENDS-main = net/py2-dnspython

RUN_DEPENDS-docs =

Index: security/knockpy/Makefile
===================================================================
RCS file: /cvs/ports/security/knockpy/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/knockpy/Makefile 12 Jul 2019 20:49:04 -0000 1.4
+++ security/knockpy/Makefile 26 Nov 2020 21:57:56 -0000
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION = 4.1
VERSION = 4.1.0

DISTNAME = knockpy-${VERSION}
+REVISION = 0

GH_ACCOUNT = guelfoweb
GH_PROJECT = knock
@@ -22,7 +23,7 @@ MODULES = lang/python

MODPY_SETUPTOOLS = Yes

-RUN_DEPENDS = net/py-dnspython
+RUN_DEPENDS = net/py2-dnspython

fix-plist: plist
sed -i \
Index: textproc/calibre/Makefile
===================================================================
RCS file: /cvs/ports/textproc/calibre/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- textproc/calibre/Makefile 24 Nov 2020 16:44:17 -0000 1.78
+++ textproc/calibre/Makefile 26 Nov 2020 21:58:06 -0000
@@ -7,7 +7,7 @@ V = 2.85.1
DISTNAME = calibre-$V
CATEGORIES = textproc
EXTRACT_SUFX = .tar.xz
-REVISION = 13
+REVISION = 14

HOMEPAGE = https://calibre-ebook.com/

@@ -34,7 +34,7 @@ COMMON_DEPENDS = databases/py-apsw \
devel/xdg-utils \
graphics/libwmf \
graphics/py2-Pillow \
- net/py-dnspython \
+ net/py2-dnspython \
graphics/png \
print/poppler \
print/poppler,-qt5 \
Index: www/linkchecker/Makefile
===================================================================
RCS file: /cvs/ports/www/linkchecker/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- www/linkchecker/Makefile 26 Aug 2020 06:57:33 -0000 1.51
+++ www/linkchecker/Makefile 26 Nov 2020 21:58:13 -0000
@@ -5,6 +5,7 @@ COMMENT= checks HTML documents for broke
GH_ACCOUNT= linkchecker
GH_PROJECT= linkchecker
GH_TAGNAME= v9.4.0
+REVISION= 0

MODPY_EGG_VERSION=${GH_TAGNAME:S/v//}

@@ -19,7 +20,7 @@ MODULES= lang/python
MODPY_SETUPTOOLS = Yes

RUN_DEPENDS= devel/py-xdg \
- net/py-dnspython \
+ net/py2-dnspython \
www/py-requests

SEPARATE_BUILD= Yes
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/py-formencode/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 3 Jul 2020 21:13:18 -0000 1.25
+++ Makefile 26 Nov 2020 22:12:19 -0000
@@ -5,7 +5,7 @@ COMMENT = HTML form validation, generat
MODPY_EGG_VERSION = 1.3.1
DISTNAME = FormEncode-${MODPY_EGG_VERSION}
PKGNAME = py-formencode-${MODPY_EGG_VERSION}
-REVISION = 1
+REVISION = 2

CATEGORIES = www

@@ -22,8 +22,13 @@ FLAVORS = python3
FLAVOR ?=

TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
- devel/py-country${MODPY_FLAVOR} \
- net/py-dnspython${MODPY_FLAVOR}
+ devel/py-country${MODPY_FLAVOR}
+
+.if ${FLAVOR:L:Mpython3}
+TEST_DEPENDS += net/py-dnspython${MODPY_FLAVOR}
+.else
+TEST_DEPENDS += net/py2-dnspython
+.endif

MODPY_SETUPTOOLS = Yes

Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 26 Nov 2020 22:12:19 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -15,7 +15,7 @@ if not '2.6' <= sys.version < '3.0' and not '3.2' <= s
+ raise ImportError('Python version not supported')
+
+ tests_require = ['nose', 'pycountry',
+- 'dnspython' if sys.version < '3.0' else 'dnspython3']
++ 'dnspython==1.16.0' if sys.version < '3.0' else 'dnspython>=2.0.0']
+
+ doctests = ['docs/htmlfill.txt', 'docs/Validator.txt',
+ 'formencode/tests/non_empty.txt']

Hello,

The latest version of dnspython drops support for py2, but there
are a number of packages that are currently py2 only. I'd like to
propose splitting py-dnspython into py2 and py3 specific versions
to allow the latest py3-only version to be used.

Following the model of the py2-Pillow/py-Pillow split, I have:

* py2-dnspython.tgz: a "new" port which is locked to py2
* py-dnspython.diff: the updated version of the port which is now py3
only
* dnspython_reverse_deps.diff: updating all ports that rely on the
current version of dnspython
* mail/mailman
* net/samba
* security/knockpy
* textproc/calibre
* www/linkchecker
* www/py-formencode (I added a small patch to maintain the flavors)

I've tried not to botch this. :) Those six have been make test-ed where
supported and at least make build-ed. Nothing untoward came up in those

Feedback, comments, questions?

Maintainers of security/knockpy and net/samba cc'd

Lucas

Other notes:
* mail/mailman could use latest dnspython if the port was updated for
mailman3. However, the web interface would still require py2. This
would probably need to be a split package.
* https://www.gnu.org/software/mailman/requirements.html
* https://www.gnu.org/software/mailman/download.html

* net/samba apparently also has support for py3, but I don't know what
it would take for the port to get to that point. Beyond my current
experience level :)
* https://wiki.samba.org/index.php/Python3
* https://bugzilla.samba.org/show_bug.cgi?id=10028

* textproc/calibre: py3 support debuted with Calibre 5, released just
a few months ago. Similar to net/samba, not sure what it takes to get
there
* https://calibre-ebook.com/new-in/fourteen

* www/linkchecker could use the latest dnspython if we used HEAD in
upstream, but that's something for later.
* https://github.com/linkchecker/linkchecker/blob/master/setup.py#L381

* databases/web2ldap would be a consumer of the latest dnspython which
is what prompted this whole thing

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)