- Update to 3.2.1

PR:		213401
Reported by:	Kyle Evans <kevans91 at ksu.edu>

5 files changed, 34 insertions, 27 deletions

diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
index 0fdc01c73962..89881dfc544c 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-serial/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	serial
-PORTVERSION=	2.7
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,15 +11,18 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Serial port encapsulation library for Python
 
-USES=			dos2unix python
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USES=			python
 USE_PYTHON=		concurrent distutils py3kplist pythonprefix
 PYDISTUTILS_PKGNAME=	py${PORTNAME}
-DOS2UNIX_FILES=		serial/tools/list_ports_posix.py
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.rst ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
diff --git a/comms/py-serial/distinfo b/comms/py-serial/distinfo
index 825bf6bc0d55..51d4029e814d 100644
--- a/comms/py-serial/distinfo
+++ b/comms/py-serial/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pyserial-2.7.tar.gz) = 3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477
-SIZE (pyserial-2.7.tar.gz) = 122081
+TIMESTAMP = 1477587567
+SHA256 (pyserial-3.2.1.tar.gz) = 1eecfe4022240f2eab5af8d414f0504e072ee68377ba63d3b6fe6e66c26f66d1
+SIZE (pyserial-3.2.1.tar.gz) = 147338
diff --git a/comms/py-serial/files/patch-serial_tools_list__ports__posix.py b/comms/py-serial/files/patch-serial_tools_list__ports__posix.py
deleted file mode 100644
index 92fb9f247300..000000000000
--- a/comms/py-serial/files/patch-serial_tools_list__ports__posix.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- serial/tools/list_ports_posix.py.orig	2013-10-12 03:43:18 UTC
-+++ serial/tools/list_ports_posix.py
-@@ -43,7 +43,7 @@ elif plat[:3] == 'bsd' or  \
-         plat[:7] == 'freebsd':
- 
-     def comports():
--        devices = glob.glob('/dev/cuad*')
-+        devices = glob.glob('/dev/cua*[!.init][!.lock]')
-         return [(d, d, d) for d in devices]
- 
- elif plat[:6] == 'darwin':   # OS X (confirmed)
diff --git a/comms/py-serial/pkg-descr b/comms/py-serial/pkg-descr
index 1b028f680086..b4388ebf18ec 100644
--- a/comms/py-serial/pkg-descr
+++ b/comms/py-serial/pkg-descr
@@ -3,4 +3,4 @@ backends for Python running on Windows, Linux, BSD (possibly any POSIX
 compliant system), Jython, and IronPython (.NET and Mono).  The module
 named "serial" automatically selects the appropriate backend.
 
-WWW: http://pyserial.sourceforge.net
+WWW: https://github.com/pyserial/pyserial
diff --git a/comms/py-serial/pkg-plist b/comms/py-serial/pkg-plist
index c5de1bc8db21..f61e963f31e2 100644
--- a/comms/py-serial/pkg-plist
+++ b/comms/py-serial/pkg-plist
@@ -5,6 +5,9 @@ bin/miniterm.py
 %%PYTHON_SITELIBDIR%%/serial/rfc2217.py
 %%PYTHON_SITELIBDIR%%/serial/rfc2217.pyc
 %%PYTHON_SITELIBDIR%%/serial/rfc2217.pyo
+%%PYTHON_SITELIBDIR%%/serial/rs485.py
+%%PYTHON_SITELIBDIR%%/serial/rs485.pyc
+%%PYTHON_SITELIBDIR%%/serial/rs485.pyo
 %%PYTHON_SITELIBDIR%%/serial/serialcli.py
 %%PYTHON_SITELIBDIR%%/serial/serialcli.pyc
 %%PYTHON_SITELIBDIR%%/serial/serialcli.pyo
@@ -20,15 +23,21 @@ bin/miniterm.py
 %%PYTHON_SITELIBDIR%%/serial/serialwin32.py
 %%PYTHON_SITELIBDIR%%/serial/serialwin32.pyc
 %%PYTHON_SITELIBDIR%%/serial/serialwin32.pyo
-%%PYTHON_SITELIBDIR%%/serial/sermsdos.py
-%%PYTHON_SITELIBDIR%%/serial/sermsdos.pyc
-%%PYTHON_SITELIBDIR%%/serial/sermsdos.pyo
+%%PYTHON_SITELIBDIR%%/serial/threaded/__init__.py
+%%PYTHON_SITELIBDIR%%/serial/threaded/__init__.pyc
+%%PYTHON_SITELIBDIR%%/serial/threaded/__init__.pyo
 %%PYTHON_SITELIBDIR%%/serial/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/serial/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/serial/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/serial/tools/hexlify_codec.py
+%%PYTHON_SITELIBDIR%%/serial/tools/hexlify_codec.pyc
+%%PYTHON_SITELIBDIR%%/serial/tools/hexlify_codec.pyo
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports.py
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports.pyc
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports.pyo
+%%PYTHON_SITELIBDIR%%/serial/tools/list_ports_common.py
+%%PYTHON_SITELIBDIR%%/serial/tools/list_ports_common.pyc
+%%PYTHON_SITELIBDIR%%/serial/tools/list_ports_common.pyo
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports_linux.py
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports_linux.pyc
 %%PYTHON_SITELIBDIR%%/serial/tools/list_ports_linux.pyo
@@ -47,6 +56,9 @@ bin/miniterm.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/__init__.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/__init__.pyc
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_alt.py
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_alt.pyc
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_alt.pyo
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_hwgrep.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_hwgrep.pyc
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_hwgrep.pyo
@@ -56,22 +68,25 @@ bin/miniterm.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_rfc2217.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_rfc2217.pyc
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_rfc2217.pyo
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_serve-rfc2217.py
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_serve-rfc2217.pyc
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_serve-rfc2217.pyo
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_socket.py
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_socket.pyc
 %%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_socket.pyo
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_spy.py
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_spy.pyc
+%%PYTHON_SITELIBDIR%%/serial/urlhandler/protocol_spy.pyo
 %%PYTHON_SITELIBDIR%%/serial/win32.py
 %%PYTHON_SITELIBDIR%%/serial/win32.pyc
 %%PYTHON_SITELIBDIR%%/serial/win32.pyo
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.rst
+%%PORTDOCS%%%%DOCSDIR%%/README.rst
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/enhancedserial.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/at_protocol.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/port_publisher.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/port_publisher.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rfc2217_server.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scanlinux.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scanwin32.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-miniterm-py2exe.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-rfc2217_server-py2exe.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-wxTerminal-py2exe.py