Attachment #237875 for bug #251614

Lines 139-144 Link Here

(-)b/comms/Makefile (+1 lines)
139	SUBDIR += py-hidapi	139	SUBDIR += py-hidapi
140	SUBDIR += py-libimobiledevice	140	SUBDIR += py-libimobiledevice
141	SUBDIR += py-libscrc	141	SUBDIR += py-libscrc
		142	SUBDIR += py-pymodbus
142	SUBDIR += py-pyserial	143	SUBDIR += py-pyserial
143	SUBDIR += py-pyserial-asyncio	144	SUBDIR += py-pyserial-asyncio
144	SUBDIR += py-xmodem	145	SUBDIR += py-xmodem




PORTNAME=	pymodbus
DISTVERSIONPREFIX=	v
DISTVERSION=	3.0.1
CATEGORIES=	comms python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	chris@chrullrich.net
COMMENT=	Implementation of the Modbus protocol
WWW=		https://github.com/riptideio/pymodbus/

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		python:3.8+
USE_PYTHON=	autoplist distutils
USE_GITHUB=	yes
GH_ACCOUNT=	riptideio

OPTIONS_DEFINE=	REPL SERIAL DATASTORE_REDIS DATASTORE_SQL
OPTIONS_DEFAULT=REPL
REPL_DESC=	Interactive REPL console
SERIAL_DESC=	Support serial port
DATASTORE_REDIS_DESC=	Use Redis for server data
DATASTORE_SQL_DESC=	Use database for server data (via SQLAlchemy)

REPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.1:www/py-aiohttp@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.8:devel/py-prompt-toolkit@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}typer>=0.6.1:devel/py-typer@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
REPL_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-NO_REPL

SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.5:comms/py-pyserial@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}pyserial-asyncio>=0.6:comms/py-pyserial-asyncio@${PY_FLAVOR}

DATASTORE_REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
DATASTORE_SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>0:databases/py-sqlalchemy14@${PY_FLAVOR}

NO_ARCH=	yes

.include <bsd.port.mk>

Added Link Here

(-)b/comms/py-pymodbus/distinfo (+3 lines)
1	TIMESTAMP = 1667648450
2	SHA256 (riptideio-pymodbus-v3.0.1_GH0.tar.gz) = b545df2daa147b22b42554f09f3a3f7821437d20d5d8a04c3b85d27be6db4105
3	SIZE (riptideio-pymodbus-v3.0.1_GH0.tar.gz) = 262271




--- setup.cfg.orig      2022-11-05 12:26:36.944988000 +0000
+++ setup.cfg   2022-11-05 12:26:45.089728000 +0000
@@ -52,11 +52,6 @@
     doc


-[options.entry_points]
-console_scripts =
-    pymodbus.console = pymodbus.repl.client.main:main
-    pymodbus.server  = pymodbus.repl.server.main:app
-

 [options.packages.find]
 include = pymodbus*


Added Link Here

(-)b/comms/py-pymodbus/pkg-descr (+4 lines)
1	Pymodbus is a full Modbus protocol implementation offering
2	asynchronous communications. It can also be used without any
3	third party dependencies (aside from pyserial) if a more
4	lightweight project is needed.

Return to bug 251614

Added Link Here

(-)b/comms/py-pymodbus/Makefile (+40 lines)
1	PORTNAME= pymodbus
2	DISTVERSIONPREFIX= v
3	DISTVERSION= 3.0.1
4	CATEGORIES= comms python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6
7	MAINTAINER= chris@chrullrich.net
8	COMMENT= Implementation of the Modbus protocol
9	WWW= https://github.com/riptideio/pymodbus/
10
11	LICENSE= BSD3CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE
13
14	USES= python:3.8+
15	USE_PYTHON= autoplist distutils
16	USE_GITHUB= yes
17	GH_ACCOUNT= riptideio
18
19	OPTIONS_DEFINE= REPL SERIAL DATASTORE_REDIS DATASTORE_SQL
20	OPTIONS_DEFAULT=REPL
21	REPL_DESC= Interactive REPL console
22	SERIAL_DESC= Support serial port
23	DATASTORE_REDIS_DESC= Use Redis for server data
24	DATASTORE_SQL_DESC= Use database for server data (via SQLAlchemy)
25
26	REPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.1:www/py-aiohttp@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.8:devel/py-prompt-toolkit@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}typer>=0.6.1:devel/py-typer@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
30	REPL_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-NO_REPL
31
32	SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.5:comms/py-pyserial@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}pyserial-asyncio>=0.6:comms/py-pyserial-asyncio@${PY_FLAVOR}
34
35	DATASTORE_REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
36	DATASTORE_SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>0:databases/py-sqlalchemy14@${PY_FLAVOR}
37
38	NO_ARCH= yes
39
40	.include <bsd.port.mk>

Added Link Here

(-)b/comms/py-pymodbus/files/extra-patch-NO_REPL (+15 lines)
1	--- setup.cfg.orig 2022-11-05 12:26:36.944988000 +0000
2	+++ setup.cfg 2022-11-05 12:26:45.089728000 +0000
3	@@ -52,11 +52,6 @@
4	doc
5
6
7	-[options.entry_points]
8	-console_scripts =
9	- pymodbus.console = pymodbus.repl.client.main:main
10	- pymodbus.server = pymodbus.repl.server.main:app
11	-
12
13	[options.packages.find]
14	include = pymodbus*
15