Update x11 ports

devel/Makefile

@@ -5047,6 +5047,7 @@
     SUBDIR += py-lazy_loader
     SUBDIR += py-libcst
     SUBDIR += py-libcst03
+    SUBDIR += py-libevdev
     SUBDIR += py-libioc
     SUBDIR += py-libpeas
     SUBDIR += py-libplist

devel/py-libevdev/Makefile

@@ -0,0 +1,19 @@
+PORTNAME=	libevdev
+PORTVERSION=	0.11
+CATEGORIES=	devel python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	awoonyaa@gmail.com
+COMMENT=	Python wrapper around the libevdev C library
+WWW=		https://pypi.org/project/libevdev/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>

devel/py-libevdev/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1716916929
+SHA256 (libevdev-0.11.tar.gz) = e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f
+SIZE (libevdev-0.11.tar.gz) = 27320

devel/py-libevdev/pkg-descr

@@ -0,0 +1,3 @@
+python-libevdev is a Python wrapper around the libevdev C library.
+It provides a Pythonic API to read events from the Linux kernel’s input device
+nodes and to read and/or modify the device’s state and capabilities.

sysutils/cinnamon-control-center/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	5.4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 

sysutils/cinnamon-settings-daemon/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	5.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome
 

x11-wm/muffin/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	muffin
 PORTVERSION=	5.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm gnome
 DIST_SUBDIR=	gnome
 

x11/libinput/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	libinput
 DISTVERSION=	1.26.1
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org

x11/libwacom/Makefile

@@ -1,23 +1,38 @@
 PORTNAME=	libwacom
-DISTVERSION=	1.5
-PORTREVISION=	1
+DISTVERSION=	2.12.2
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/linuxwacom/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
 WWW=		https://github.com/linuxwacom/libwacom/wiki
 
-LICENSE=	MIT
+LICENSE=	HPND
+LICENSE_NAME=	Historical Permission Notice and Disclaimer
 LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
-LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
+		${PYTHON_PKGNAMEPREFIX}libevdev>0:devel/py-libevdev \
+		${PYTHON_PKGNAMEPREFIX}pyudev>0:devel/py-pyudev \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+LIB_DEPENDS=	libevdev.so:devel/libevdev \
+		libgudev-1.0.so:devel/libgudev
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libevdev>0:devel/py-libevdev
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++11-lang gnome meson pkgconfig tar:bz2
+USES=		compiler:c++11-lang gnome meson pkgconfig python shebangfix \
+		tar:xz
+
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-MESON_ARGS=	-Ddocumentation=disabled
+
+SHEBANG_FILES=	tools/show-stylus.py tools/libwacom-update-db.py
+
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
+		${WRKSRC}/tools/libwacom-update-db.py
 
 .include <bsd.port.mk>

x11/libwacom/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1601323778
-SHA256 (libwacom-1.5.tar.bz2) = 6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b
-SIZE (libwacom-1.5.tar.bz2) = 515548
+TIMESTAMP = 1720103814
+SHA256 (libwacom-2.12.2.tar.xz) = c8319c40c70edd05d1839c0d3f449c23bdc90cd1f0d819bd0c1ec7c00b117700
+SIZE (libwacom-2.12.2.tar.xz) = 153600

x11/libwacom/files/patch-tools_libwacom-update-db.py

@@ -0,0 +1,20 @@
+--- tools/libwacom-update-db.py.orig	2024-06-19 10:34:43 UTC
++++ tools/libwacom-update-db.py
+@@ -189,7 +189,7 @@ if __name__ == "__main__":
+         "path",
+         nargs="?",
+         type=Path,
+-        default="/etc/libwacom",
++        default="%%PREFIX%%/etc/libwacom",
+         help="Directory to load .tablet files from",
+     )
+     # buildsystem-mode is what we use from meson, it changes the
+@@ -203,7 +203,7 @@ if __name__ == "__main__":
+     parser.add_argument(
+         "--skip-systemd-hwdb-update",
+         action="store_true",
+-        default=False,
++        default=True,
+         help="Do not run systemd-hwdb --update (Note: updates to tablet files will not be reflected in udev)",
+     )
+     parser.add_argument(