Move comms/py-serial to comms/py-pyserial

- While I'm here, add NO_ARCH
- Bump PORTREVISION of dependent ports for dependency change
  (devel/py-pyvisa-py and finance/odoo will be bumped in next commit, py-pyusb renaming)

PR:		246546
Submitted by:	sunpoet (myself)
Approved by:	maintainer (timeout, 40 days)

9 files changed, 14 insertions, 12 deletions

diff --git a/comms/Makefile b/comms/Makefile
index 6ba5a2252712..481372f88221 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -143,8 +143,8 @@
     SUBDIR += py-hidapi
     SUBDIR += py-libconcord
     SUBDIR += py-lirc
+    SUBDIR += py-pyserial
     SUBDIR += py-qt5-serialport
-    SUBDIR += py-serial
     SUBDIR += py-xmodem
     SUBDIR += pyla
     SUBDIR += qico
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 43ed7b322bac..b556bc694bcc 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	chirp
 DISTVERSIONPREFIX=	daily-
 DISTVERSION=	20200107
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://trac.chirp.danplanet.com/chirp_daily/daily-${DISTVERSION}/
 
@@ -16,7 +17,7 @@ DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-09-15
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile
index 54b536ce6c86..3fad24e7cf11 100644
--- a/comms/nanovna-saver/Makefile
+++ b/comms/nanovna-saver/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	nanovna-saver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
diff --git a/comms/py-adafruit-ampy/Makefile b/comms/py-adafruit-ampy/Makefile
index 1ced30700c4a..da4621cf76c3 100644
--- a/comms/py-adafruit-ampy/Makefile
+++ b/comms/py-adafruit-ampy/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	adafruit-ampy
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ COMMENT=	Adafruit MicroPython tool
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dotenv>0:www/py-python-dotenv@${PY_FLAVOR}
 
diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile
index 7d57d29d31da..3cdd9e17c46e 100644
--- a/comms/py-esptool/Makefile
+++ b/comms/py-esptool/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	esptool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,7 +13,7 @@ COMMENT=	Utility to communicate with Espressif ESP8266 & ESP32 chips
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>=3.0:comms/py-serial@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
diff --git a/comms/py-serial/Makefile b/comms/py-pyserial/Makefile
index 00bf6d40dfcb..146a10fdf3fa 100644
--- a/comms/py-serial/Makefile
+++ b/comms/py-pyserial/Makefile
@@ -1,13 +1,12 @@
 # Created by: Hye-Shik Chang <perky@fallin.lv>
 # $FreeBSD$
 
-PORTNAME=	serial
+PORTNAME=	pyserial
 PORTVERSION=	3.4
 PORTREVISION=	1
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Serial port encapsulation library for Python
@@ -15,9 +14,10 @@ COMMENT=	Serial port encapsulation library for Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=			python
-USE_PYTHON=		concurrent distutils py3kplist pythonprefix
-PYDISTUTILS_PKGNAME=	py${PORTNAME}
+USES=		python
+USE_PYTHON=	concurrent distutils py3kplist pythonprefix
+
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/comms/py-serial/distinfo b/comms/py-pyserial/distinfo
index b69681828a8c..b69681828a8c 100644
--- a/comms/py-serial/distinfo
+++ b/comms/py-pyserial/distinfo
diff --git a/comms/py-serial/pkg-descr b/comms/py-pyserial/pkg-descr
index b4388ebf18ec..b4388ebf18ec 100644
--- a/comms/py-serial/pkg-descr
+++ b/comms/py-pyserial/pkg-descr
diff --git a/comms/py-serial/pkg-plist b/comms/py-pyserial/pkg-plist
index f61e963f31e2..f61e963f31e2 100644
--- a/comms/py-serial/pkg-plist
+++ b/comms/py-pyserial/pkg-plist