Version 3.4:

Improvements:
* miniterm: suspend function (temporarily release port, Ctrl-T s)
* context manager automatically opens port on __enter__
* list_ports: add interface number to location string
* protocol_socket: Retry if BlockingIOError occurs in reset_input_buffer.

Bugfixes:
* list_ports: option to include symlinked devices
* list_ports: workaround for special characters in port names

Bugfixes (posix):
* allow calling cancel functions w/o error if port is closed
* protocol_socket: sync error handling with posix version
* posix: ignore more blocking errors and EINTR, timeout only applies to blocking I/O
* fix: port_publisher typo

3 files changed, 45 insertions, 21 deletions

diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 7d203932cee..84465d4f6de 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:20 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/07/31 13:11:27 adam Exp $
 
-DISTNAME=		pyserial-2.7
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
-CATEGORIES=		comms python
-MASTER_SITES=		${MASTER_SITE_PYPI:=p/pyserial/}
+DISTNAME=	pyserial-3.4
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
+CATEGORIES=	comms python
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyserial/}
 
-MAINTAINER=		tsarna@NetBSD.org
-HOMEPAGE=		http://pyserial.sourceforge.net/
-COMMENT=		Python Serial Port Extension
-LICENSE=		python-software-foundation
+MAINTAINER=	tsarna@NetBSD.org
+HOMEPAGE=	https://github.com/pyserial/pyserial
+COMMENT=	Python Serial Port Extension
+LICENSE=	modified-bsd
 
 CONFLICTS+=		${PYPKGPREFIX}-pyserial-[0-9]*
 
@@ -36,6 +36,9 @@ REPLACE_PYTHON+=	serial/urlhandler/protocol_rfc2217.py
 REPLACE_PYTHON+=	serial/urlhandler/protocol_socket.py
 REPLACE_PYTHON+=	serial/win32.py
 
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} miniterm.py miniterm${PYVERSSUFFIX} || ${TRUE}
+
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/py-serial/PLIST b/comms/py-serial/PLIST
index 29dbf370ef8..58b59c24b38 100644
--- a/comms/py-serial/PLIST
+++ b/comms/py-serial/PLIST
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/19 09:49:55 wiz Exp $
-bin/miniterm.py
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2017/07/31 13:11:27 adam Exp $
+bin/miniterm${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/serial/__init__.py
 ${PYSITELIB}/serial/__init__.pyc
 ${PYSITELIB}/serial/__init__.pyo
 ${PYSITELIB}/serial/rfc2217.py
 ${PYSITELIB}/serial/rfc2217.pyc
 ${PYSITELIB}/serial/rfc2217.pyo
+${PYSITELIB}/serial/rs485.py
+${PYSITELIB}/serial/rs485.pyc
+${PYSITELIB}/serial/rs485.pyo
 ${PYSITELIB}/serial/serialcli.py
 ${PYSITELIB}/serial/serialcli.pyc
 ${PYSITELIB}/serial/serialcli.pyo
@@ -22,15 +28,21 @@ ${PYSITELIB}/serial/serialutil.pyo
 ${PYSITELIB}/serial/serialwin32.py
 ${PYSITELIB}/serial/serialwin32.pyc
 ${PYSITELIB}/serial/serialwin32.pyo
-${PYSITELIB}/serial/sermsdos.py
-${PYSITELIB}/serial/sermsdos.pyc
-${PYSITELIB}/serial/sermsdos.pyo
+${PYSITELIB}/serial/threaded/__init__.py
+${PYSITELIB}/serial/threaded/__init__.pyc
+${PYSITELIB}/serial/threaded/__init__.pyo
 ${PYSITELIB}/serial/tools/__init__.py
 ${PYSITELIB}/serial/tools/__init__.pyc
 ${PYSITELIB}/serial/tools/__init__.pyo
+${PYSITELIB}/serial/tools/hexlify_codec.py
+${PYSITELIB}/serial/tools/hexlify_codec.pyc
+${PYSITELIB}/serial/tools/hexlify_codec.pyo
 ${PYSITELIB}/serial/tools/list_ports.py
 ${PYSITELIB}/serial/tools/list_ports.pyc
 ${PYSITELIB}/serial/tools/list_ports.pyo
+${PYSITELIB}/serial/tools/list_ports_common.py
+${PYSITELIB}/serial/tools/list_ports_common.pyc
+${PYSITELIB}/serial/tools/list_ports_common.pyo
 ${PYSITELIB}/serial/tools/list_ports_linux.py
 ${PYSITELIB}/serial/tools/list_ports_linux.pyc
 ${PYSITELIB}/serial/tools/list_ports_linux.pyo
@@ -49,6 +61,9 @@ ${PYSITELIB}/serial/tools/miniterm.pyo
 ${PYSITELIB}/serial/urlhandler/__init__.py
 ${PYSITELIB}/serial/urlhandler/__init__.pyc
 ${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_hwgrep.py
 ${PYSITELIB}/serial/urlhandler/protocol_hwgrep.pyc
 ${PYSITELIB}/serial/urlhandler/protocol_hwgrep.pyo
@@ -58,9 +73,15 @@ ${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
+${PYSITELIB}/serial/urlhandler/protocol_spy.py
+${PYSITELIB}/serial/urlhandler/protocol_spy.pyc
+${PYSITELIB}/serial/urlhandler/protocol_spy.pyo
 ${PYSITELIB}/serial/win32.py
 ${PYSITELIB}/serial/win32.pyc
 ${PYSITELIB}/serial/win32.pyo
diff --git a/comms/py-serial/distinfo b/comms/py-serial/distinfo
index e7dc18340fb..76a2f64f7b1 100644
--- a/comms/py-serial/distinfo
+++ b/comms/py-serial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:34:57 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/31 13:11:27 adam Exp $
 
-SHA1 (pyserial-2.7.tar.gz) = f15694b1bea9e4369c1931dc5cf09e37e5c562cf
-RMD160 (pyserial-2.7.tar.gz) = b86758d74e8f3cd61430bf7d76db496ae732f257
-SHA512 (pyserial-2.7.tar.gz) = 3fc8d9425a47ebcd37db1fcc58182854b48c9abd6642f35fba2d21458d864ae448105d704dc0d880832ba7516fa16f108f24363bd5fa9f083ea79a4ac614339b
-Size (pyserial-2.7.tar.gz) = 122081 bytes
+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