py-serial: updated to 3.5

Version 3.5

Bugfixes:
- spy: ensure bytes in write()

Bugfixes (posix):
- serialposix: Fix inconsistent state after exception in open()

Bugfixes (win32):
- win32: Fix exception for composite serial number search on Windows

Bugfixes (MacOS):
- list_ports_osx: kIOMasterPortDefault no longer exported on Big Sur
- list_ports_osx: getting USB info on BigSur/AppleSilicon

4 files changed, 24 insertions, 15 deletions

diff --git a/comms/py-serial/ALTERNATIVES b/comms/py-serial/ALTERNATIVES
index fb075cf1a07..e8e93b6b858 100644
--- a/comms/py-serial/ALTERNATIVES
+++ b/comms/py-serial/ALTERNATIVES
@@ -1 +1,2 @@
-bin/miniterm @PREFIX@/bin/miniterm@PYVERSSUFFIX@
+bin/pyserial-miniterm @PREFIX@/bin/pyserial-miniterm-@PYVERSSUFFIX@
+bin/pyserial-ports @PREFIX@/bin/pyserial-ports-@PYVERSSUFFIX@
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 7c0a0ab1e64..e87aee7f458 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2020/03/22 22:57:33 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/26 11:05:22 adam Exp $
 
-DISTNAME=	pyserial-3.4
+DISTNAME=	pyserial-3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=	1
 CATEGORIES=	comms python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyserial/}
 
@@ -18,7 +17,10 @@ USE_LANGUAGES=	# none
 REPLACE_PYTHON=	serial/*.py serial/*/*.py
 
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && ${MV} miniterm.py miniterm${PYVERSSUFFIX} || ${TRUE}
+.for bin in pyserial-miniterm pyserial-ports
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/comms/py-serial/PLIST b/comms/py-serial/PLIST
index 58b59c24b38..17d9346848d 100644
--- a/comms/py-serial/PLIST
+++ b/comms/py-serial/PLIST
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2017/07/31 13:11:27 adam Exp $
-bin/miniterm${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.4 2020/11/26 11:05:22 adam Exp $
+bin/pyserial-miniterm-${PYVERSSUFFIX}
+bin/pyserial-ports-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/serial/__init__.py
 ${PYSITELIB}/serial/__init__.pyc
 ${PYSITELIB}/serial/__init__.pyo
+${PYSITELIB}/serial/__main__.py
+${PYSITELIB}/serial/__main__.pyc
+${PYSITELIB}/serial/__main__.pyo
 ${PYSITELIB}/serial/rfc2217.py
 ${PYSITELIB}/serial/rfc2217.pyc
 ${PYSITELIB}/serial/rfc2217.pyo
@@ -64,6 +70,9 @@ ${PYSITELIB}/serial/urlhandler/__init__.pyo
 ${PYSITELIB}/serial/urlhandler/protocol_alt.py
 ${PYSITELIB}/serial/urlhandler/protocol_alt.pyc
 ${PYSITELIB}/serial/urlhandler/protocol_alt.pyo
+${PYSITELIB}/serial/urlhandler/protocol_cp2110.py
+${PYSITELIB}/serial/urlhandler/protocol_cp2110.pyc
+${PYSITELIB}/serial/urlhandler/protocol_cp2110.pyo
 ${PYSITELIB}/serial/urlhandler/protocol_hwgrep.py
 ${PYSITELIB}/serial/urlhandler/protocol_hwgrep.pyc
 ${PYSITELIB}/serial/urlhandler/protocol_hwgrep.pyo
@@ -73,9 +82,6 @@ ${PYSITELIB}/serial/urlhandler/protocol_loop.pyo
 ${PYSITELIB}/serial/urlhandler/protocol_rfc2217.py
 ${PYSITELIB}/serial/urlhandler/protocol_rfc2217.pyc
 ${PYSITELIB}/serial/urlhandler/protocol_rfc2217.pyo
-${PYSITELIB}/serial/urlhandler/protocol_serve-rfc2217.py
-${PYSITELIB}/serial/urlhandler/protocol_serve-rfc2217.pyc
-${PYSITELIB}/serial/urlhandler/protocol_serve-rfc2217.pyo
 ${PYSITELIB}/serial/urlhandler/protocol_socket.py
 ${PYSITELIB}/serial/urlhandler/protocol_socket.pyc
 ${PYSITELIB}/serial/urlhandler/protocol_socket.pyo
diff --git a/comms/py-serial/distinfo b/comms/py-serial/distinfo
index 76a2f64f7b1..24ea9066ed9 100644
--- a/comms/py-serial/distinfo
+++ b/comms/py-serial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/07/31 13:11:27 adam Exp $
+$NetBSD: distinfo,v 1.5 2020/11/26 11:05:22 adam Exp $
 
-SHA1 (pyserial-3.4.tar.gz) = aad3668e10cfc02c9fa693e714f9c7a886366e21
-RMD160 (pyserial-3.4.tar.gz) = d599dc557b895af0b6858f918317a143b2f07c13
-SHA512 (pyserial-3.4.tar.gz) = d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-Size (pyserial-3.4.tar.gz) = 151657 bytes
+SHA1 (pyserial-3.5.tar.gz) = 8709dd72730f6d097fc2e039bc0e264dc1c9341a
+RMD160 (pyserial-3.5.tar.gz) = 818415874d9770d6079aa23bc90988e75cc91bf1
+SHA512 (pyserial-3.5.tar.gz) = c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
+Size (pyserial-3.5.tar.gz) = 159125 bytes