9 files changed, 49 insertions, 63 deletions
diff --git a/comms/libmodbus/Makefile b/comms/libmodbus/Makefile
index 9c4c06cb5863..a1675a718bf9 100644
--- a/comms/libmodbus/Makefile
+++ b/comms/libmodbus/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libmodbus
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.10
+DISTVERSION=	3.1.11
 CATEGORIES=	comms
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/comms/libmodbus/distinfo b/comms/libmodbus/distinfo
index 25eccd4a1a25..c2b0667637d2 100644
--- a/comms/libmodbus/distinfo
+++ b/comms/libmodbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751494982
-SHA256 (stephane-libmodbus-v3.1.10_GH0.tar.gz) = e93503749cd89fda4c8cf1ee6371a3a9cc1f0a921c165afbbc4fd96d4813fa1a
-SIZE (stephane-libmodbus-v3.1.10_GH0.tar.gz) = 204988
+TIMESTAMP = 1751555493
+SHA256 (stephane-libmodbus-v3.1.11_GH0.tar.gz) = 8a750452ef86a53de6cec6fbca67bd5be08d0a1e87278a422fbce3003fd42d99
+SIZE (stephane-libmodbus-v3.1.11_GH0.tar.gz) = 207911
diff --git a/comms/libmodbus/files/patch-src_modbus-tcp.c b/comms/libmodbus/files/patch-src_modbus-tcp.c
new file mode 100644
index 000000000000..1d317dedc173
--- /dev/null
+++ b/comms/libmodbus/files/patch-src_modbus-tcp.c
@@ -0,0 +1,11 @@
+--- src/modbus-tcp.c.orig	2025-07-03 21:07:28 UTC
++++ src/modbus-tcp.c
+@@ -257,7 +257,7 @@ static int _modbus_tcp_set_ipv4_options(int s)
+ #endif
+ #endif
+ 
+-#ifndef OS_WIN32
++#if !defined(OS_WIN32) && !defined(__FreeBSD__)
+     /**
+      * Cygwin defines IPTOS_LOWDELAY but can't handle that flag so it's
+      * necessary to workaround that problem.
diff --git a/comms/libmodbus/pkg-plist b/comms/libmodbus/pkg-plist
index ed0d32b2ba09..31d6a3334b83 100644
--- a/comms/libmodbus/pkg-plist
+++ b/comms/libmodbus/pkg-plist
@@ -48,6 +48,7 @@ libdata/pkgconfig/libmodbus.pc
 %%MANPAGES%%share/man/man3/modbus_rtu_set_rts_delay.3.gz
 %%MANPAGES%%share/man/man3/modbus_rtu_set_serial_mode.3.gz
 %%MANPAGES%%share/man/man3/modbus_send_raw_request.3.gz
+%%MANPAGES%%share/man/man3/modbus_send_raw_request_tid.3.gz
 %%MANPAGES%%share/man/man3/modbus_set_bits_from_byte.3.gz
 %%MANPAGES%%share/man/man3/modbus_set_bits_from_bytes.3.gz
 %%MANPAGES%%share/man/man3/modbus_set_byte_timeout.3.gz
diff --git a/comms/py-hid/Makefile b/comms/py-hid/Makefile
index 6372b26f871d..7b93c92b3dba 100644
--- a/comms/py-hid/Makefile
+++ b/comms/py-hid/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	hid
-DISTVERSION=	1.0.7
-PORTREVISION=	1
+DISTVERSION=	1.0.8
 CATEGORIES=	comms python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Ctypes bindings to comms/hidapi
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	ctypes bindings for hidapi
 WWW=		https://github.com/apmorton/pyhidapi
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	hidapi>0:comms/hidapi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	hidapi>=0:comms/hidapi
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/comms/py-hid/distinfo b/comms/py-hid/distinfo
index ddfe3e917e16..80afeaf2e8d9 100644
--- a/comms/py-hid/distinfo
+++ b/comms/py-hid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739656219
-SHA256 (hid-1.0.7.tar.gz) = 3f809e292ab52c4435ad1442c8ef205be4c9ca4eeb80fb47c7d98e0c75527b2a
-SIZE (hid-1.0.7.tar.gz) = 4897
+TIMESTAMP = 1751375043
+SHA256 (hid-1.0.8.tar.gz) = 5ca129a7b9434ace5e3e429c1092a16792feffaf067a46b666e9c586872cdcfe
+SIZE (hid-1.0.8.tar.gz) = 4967
diff --git a/comms/py-hidapi/Makefile b/comms/py-hidapi/Makefile
index e9319adf65e4..5ec5ea17ab2f 100644
--- a/comms/py-hidapi/Makefile
+++ b/comms/py-hidapi/Makefile
@@ -1,64 +1,37 @@
 PORTNAME=	hidapi
-DISTVERSION=	0.14.0
+PORTVERSION=	0.14.0
+DISTVERSIONSUFFIX=	.post4
+PORTREVISION=	1
 CATEGORIES=	comms python
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${GH_ACCOUNT}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Cython interface to comms/hidapi
-WWW=		https://pypi.org/project/hidapi/
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Cython interface to the hidapi
+WWW=		https://github.com/trezor/cython-hidapi
 
 LICENSE=	BSD3CLAUSE GPLv3 PD
-LICENSE_COMB=	multi
-LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE-bsd.txt
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-bsd.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-gpl3.txt
 LICENSE_FILE_PD=	${WRKSRC}/LICENSE-orig.txt
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}recommonmark>0:textproc/py-recommonmark@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libhidapi.so:comms/hidapi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
-
-USES=		python
-USE_GITHUB=	yes
-GH_ACCOUNT=	trezor
-GH_PROJECT=	cython-hidapi
-USE_PYTHON=	autoplist cython pep517 pytest
-
-MAKE_ENV+=	DISTUTILS_DEBUG=1
 
-DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+USES=		pkgconfig python
+USE_PYTHON=	autoplist concurrent cython pep517 unittest
 
-PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
+MAKE_ENV=	HIDAPI_SYSTEM_HIDAPI=1 \
+		HIDAPI_WITH_LIBUSB=1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|usb-1.0|usb|g' ${WRKSRC}/setup.py
-
-post-build:
-	(cd ${WRKSRC}/docs && \
-		${SETENV} sphinx-build-${PYTHON_VER} -b man . _build/man)
-
-post-build-DOCS-on:
-	(cd ${WRKSRC}/docs && \
-		${SETENV} sphinx-build-${PYTHON_VER} -b html . _build/html)
+# Clean up bundled libraries
+	@${RM} -r ${WRKSRC}/hidapi/
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${PORTNAME}.1 \
-		${STAGEDIR}${PREFIX}/share/man/man1/
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/hid*.so
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs/_build/html && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ "-not -name .buildinfo -not -regex ^./.doctrees.* -not -regex ^./_sources.*")
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/comms/py-hidapi/distinfo b/comms/py-hidapi/distinfo
index 5d36d0d636cb..9bbc0c771333 100644
--- a/comms/py-hidapi/distinfo
+++ b/comms/py-hidapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705544232
-SHA256 (trezor-cython-hidapi-0.14.0_GH0.tar.gz) = 211b0cb99b1f9724f3d1b09d198d764b7eca77514ae86584e3f3ce872aefff51
-SIZE (trezor-cython-hidapi-0.14.0_GH0.tar.gz) = 22504
+TIMESTAMP = 1751622359
+SHA256 (hidapi-0.14.0.post4.tar.gz) = 48fce253e526d17b663fbf9989c71c7ef7653ced5f4be65f1437c313fb3dbdf6
+SIZE (hidapi-0.14.0.post4.tar.gz) = 174388
diff --git a/comms/py-hidapi/pkg-descr b/comms/py-hidapi/pkg-descr
index c282f7186602..02eb3c483226 100644
--- a/comms/py-hidapi/pkg-descr
+++ b/comms/py-hidapi/pkg-descr
@@ -1 +1 @@
-Cython interface to comms/hidapi.
+cython-hidapi is a cython interface to HIDAPI library.