diff --git a/x11-servers/xlibre-ephyr/Makefile b/x11-servers/xlibre-ephyr/Makefile
index 7f24a2d0f614..03922f6c5a94 100644
--- a/x11-servers/xlibre-ephyr/Makefile
+++ b/x11-servers/xlibre-ephyr/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	xlibre-ephyr
 PORTVERSION=	${XLIBRE_VER}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-servers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	Xlibre Xephyr server
 WWW=		https://github.com/X11Libre/xserver/
 
 LICENSE=	MIT
 
 CONFLICTS_INSTALL=	xephyr
 
 USES+=		xlibre-cat:server
 USE_XORG+=xcb
 
 MESON_ARGS+=	-Dglamor=true
 LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
 
 LIB_DEPENDS+=	libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-util.so:x11/xcb-util
 
 .include 	"${.CURDIR}/../xlibre-server/Makefile.common"
diff --git a/x11-servers/xlibre-nest/Makefile b/x11-servers/xlibre-nest/Makefile
index 8ec7e8b7131c..1413e15e286d 100644
--- a/x11-servers/xlibre-nest/Makefile
+++ b/x11-servers/xlibre-nest/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	xlibre-nest
 PORTVERSION=	${XLIBRE_VER}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-servers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	Xlibre Xnest server
 WWW=		https://github.com/X11Libre/xserver/
 
 LICENSE=	MIT
 
 CONFLICTS_INSTALL=	xorg-nestserver
 
 USES=		xlibre-cat:server
 USE_XORG+=xcb
 
 LIB_DEPENDS+=	libxcb-util.so:x11/xcb-util \
 		libxcb-icccm.so:x11/xcb-util-wm
 
 .include 	"${.CURDIR}/../xlibre-server/Makefile.common"
diff --git a/x11-servers/xlibre-server/Makefile b/x11-servers/xlibre-server/Makefile
index 02e7d96e4799..af4e19d7bc39 100644
--- a/x11-servers/xlibre-server/Makefile
+++ b/x11-servers/xlibre-server/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	xlibre-server
 PORTVERSION=	${XLIBRE_VER}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-servers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	Xlibre X server
 WWW=		https://github.com/X11Libre/xserver/
 
 LICENSE=	MIT
 
 CONFLICTS=	xorg-server
 
 USES+=		xlibre-cat:server
 
 OPTIONS_SUB=	YES
 OPTIONS_DEFINE=	UDEV SUID NVIDIA_ABI INPUTTEST SEATD
 OPTIONS_DEFAULT=UDEV SUID INPUTTEST SEATD
 
 UDEV_DESC=		Enable udev. (For libinput & autoconfiguration/hotplug)
 UDEV_MESON_TRUE=	udev udev_kms
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
 SUID_DESC=		Enable the setuid binary. (For starting X as a normal user)
 SUID_MESON_TRUE=	suid_wrapper
 
 OPTIONS_DEFAULT_amd64=	NVIDIA_ABI
 OPTIONS_DEFAULT_i386=	NVIDIA_ABI
 
 NVIDIA_ABI_DESC=	Rebuild XLibre drivers if switched! Fixes for NVIDIA drivers.
 NVIDIA_ABI_MESON_TRUE=	legacy_nvidia_padding legacy_nvidia_340x
 
 INPUTTEST_DESC=		Build inputtest driver. (For testing and automation)
 INPUTTEST_MESON_TRUE=	xf86-input-inputtest
 
 SEATD_DESC=		Build with seatd support. (For running X unprivileged)
 SEATD_MESON_TRUE=	seatd_libseat
 SEATD_LIB_DEPENDS=	libseat.so:sysutils/seatd
 
 LIB_DEPENDS+=	libxcvt.so:x11/libxcvt \
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libepoxy.so:graphics/libepoxy
 
 MESON_ARGS+=	-Dlog_dir=/var/log \
 		-Ddrm=true
 
 PLIST_SUB+=	FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
 
 USE_XORG+=	pciaccess
 
 USE_GL+=	gbm
 
 .include 	"${.CURDIR}/../xlibre-server/Makefile.common"
 
 OLDMODULEDIR=	/lib/xorg/modules
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/extensions
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/drivers
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/input
 	@${MKDIR} ${STAGEDIR}${FONTPATHD}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 	@${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \
 		${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xlibre-server/Makefile.version b/x11-servers/xlibre-server/Makefile.version
index 6ad2e99fe1a4..ffc092a185e5 100644
--- a/x11-servers/xlibre-server/Makefile.version
+++ b/x11-servers/xlibre-server/Makefile.version
@@ -1,4 +1,4 @@
 XLIBRE_MJR_VER=25
-XLIBRE_MIN_VER=1.2
+XLIBRE_MIN_VER=1.3
 
 XLIBRE_VER=${XLIBRE_MJR_VER}.${XLIBRE_MIN_VER}
diff --git a/x11-servers/xlibre-server/distinfo b/x11-servers/xlibre-server/distinfo
index fc6678864ecd..6a939df7db5c 100644
--- a/x11-servers/xlibre-server/distinfo
+++ b/x11-servers/xlibre-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1771549003
-SHA256 (xlibre/server/X11Libre-xserver-25.1.2-xlibre-xserver-25.1.2_GH0.tar.gz) = a5ec231ae78d00aab7edaaf06d6c22fbaf2072eaf6d669a87f491c445efcf57d
-SIZE (xlibre/server/X11Libre-xserver-25.1.2-xlibre-xserver-25.1.2_GH0.tar.gz) = 5490209
+TIMESTAMP = 1776402476
+SHA256 (xlibre/server/X11Libre-xserver-25.1.3-xlibre-xserver-25.1.3_GH0.tar.gz) = 6a8ad57e7c2b398a8e84c620c0221b1f7a6a9a2625e1016a874a20a716033b7f
+SIZE (xlibre/server/X11Libre-xserver-25.1.3-xlibre-xserver-25.1.3_GH0.tar.gz) = 5490338
diff --git a/x11-servers/xlibre-vfb/Makefile b/x11-servers/xlibre-vfb/Makefile
index 31ac75d58e94..4f8608aea172 100644
--- a/x11-servers/xlibre-vfb/Makefile
+++ b/x11-servers/xlibre-vfb/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	xlibre-vfb
 PORTVERSION=	${XLIBRE_VER}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11-servers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	Xlibre Xvfb server
 WWW=		https://github.com/X11Libre/xserver/
 
 LICENSE=	MIT
 
 CONFLICTS_INSTALL=	xorg-vfbserver
 
 USES=		xlibre-cat:server
 
 .include 	"${.CURDIR}/../xlibre-server/Makefile.common"
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index fb838e8765c5..70a0043c9dea 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -1,301 +1,301 @@
 # For those wondering why this port is not under `x11-drivers' category,
 # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930.
 #
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
 # slave ports instead (`x11/nvidia-driver-470', `x11/nvidia-driver-390',
 # `x11/nvidia-driver-340', or `x11/nvidia-driver-304').
 #
 # To simplify testing of new feature branches and beta driver versions,
 # the port aims to support building against arbitrary DISTVERSION, i.e.
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	x11@FreeBSD.org
 COMMENT?=	NVIDIA graphics driver userland
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 .include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 FLAVORS=	xorg xlibre
 FLAVOR?=	${FLAVORS:[1]}
 
 # the package provides lib32 versions of the libraries, which then depends
 # themselves in non existing lib32 libraries, so we don't want the package
 # to end up depending on non existing libraries
 NO_SHLIB_REQUIRES_GLOB=*:32
 
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 # Kept for switching to centralized distinfo with suffixes.
 .ifdef PKGNAMESUFFIX
 DISTINFO_FILE=	${.CURDIR}/distinfo
 .endif
 
 # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
 # obj/libEGL_nvidia.so.0 (see below)
 .if ${NVVERSION} >= 410.057
 PATCH_DEPENDS=	gsed:textproc/gsed
 BUILD_DEPENDS=	pkg-config:devel/pkgconf
 LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
 .endif
 
 RUN_DEPENDS=	${KMODDIR}/nvidia.ko:x11/nvidia-kmod${PKGNAMESUFFIX}
 
 .if ${NVVERSION} >= 415.013
 LIB_DEPENDS+=	libnvidia-egl-wayland.so:graphics/egl-wayland
 .endif
 
 .if ${NVVERSION} >= 580.00000
 LIB_DEPENDS+=	libnvidia-egl-xcb.so:graphics/egl-x11
 LIB_DEPENDS+=	libnvidia-egl-wayland2.so:graphics/egl-wayland2
 .endif
 
 USES=		uidfix xorg
 .if ${NVVERSION} >= 470.04201
 USES+=		tar:xz
 .endif
 
 USE_XORG=	x11 xext
 .if ${FLAVOR} == xlibre
 PKGNAMEPREFIX=	xlibre-
 USES+=xlibre
 USE_XLIBRE+=	xlibre-server
 CONFLICTS_BUILD+=	xorg-server
 .else
 USE_XORG+=	xorg-server
 CONFLICTS_BUILD+=	xlibre-server
 .endif
 
 USE_LDCONFIG=	yes
 
 PIE_UNSAFE=	yes
 
 EGL_JSON_PATH=		${PREFIX}/share/egl/egl_external_platform.d
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
 VKICD_PATH=		${PREFIX}/share/vulkan/icd.d
 VKLAYERS_PATH=		${PREFIX}/share/vulkan/implicit_layer.d
 MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
 		VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
 		VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
 .if ${NVVERSION} < 495.02905
 MAKE_ENV+=	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .else
 MAKE_ENV+=	EGL_EXTERNAL_PLATFORM_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .endif
 SUB_FILES=	pkg-message
 .if !defined(LIBGLDIR)
 SUB_FILES+=	nvidia.conf
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR=	${MODULESDIR}/extensions/.nvidia
 PORTDOCS=	*
 
 .if ${NVVERSION} >= 331.013
 SUB_LIST+=	NVGL=""
 .else
 SUB_LIST+=	NVGL="\# "
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
 
 # Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
 .if ${NVVERSION} >= 515.04304
 PLIST_FILES+=	lib/libnvidia-wayland-client.so.${DISTVERSION}
 .endif
 
 CONFLICTS_INSTALL+=	nvidia-driver*
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 .for p in ${SUB_PATCHES}
 	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}
 .endfor
 .for p in ${SUB_PATCHES}
 EXTRA_PATCHES+=	${WRKDIR}/${p}
 .endfor
 
 post-patch: .SILENT
 # Patch only needed for non-kmod
 	${REINPLACE_CMD} -e '/SUBDIR=\tsrc \\/d' -e 's/\tlib/SUBDIR=\tlib/' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/\.if exists(firmware)/,/\.endif/d' \
 		${WRKSRC}/Makefile
 
 .if ${NVVERSION} >= 390
 	${REINPLACE_CMD} -e 's|/man/man1|/share/man/man1|' ${WRKSRC}/nvml/man/Makefile
 .endif
 # Disable installation of Linux libraries (provided by the corresponding
 # `x11/linux-nvidia-libs' port or its slaves)
 	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
 		${WRKSRC}/lib/Makefile
 # Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
 # port for a while now
 	${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \
 		s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile
 # Do not build any binaries (native nvidia-settings and nvidia-xconfig are
 # provided by their corresponding ports) and manual pages
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 # Also do not install libnvidia-gtk* libraries which are for nvidia-settings
 .if ${NVVERSION} >= 346.016
 	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
 .endif
 # Adjust installation path of a conflicting file (shared between
 # nvidia-driver and xorg-server) to ease package manager work
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
 .endif
 # Do not execute afterinstall target (prevent automatic module registration
 # and "smart" installation of conflicting files heuristics)
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
 # /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
 # won't adhere to this stupidity and install nvidia-application-profiles-*
 # files as part of documentation
 .if ${NVVERSION} >= 410.057
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e '/AUXLINK_LINK/s,\$${DESTDIR},,' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/glvnd/egl_vendor\.d.{$$padding},${GLVND_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libglvnd/libEGL.so.1
 .elif ${NVVERSION} >= 334.016
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
 .endif
 .if ${NVVERSION} >= 415.013
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${EGL_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libEGL_nvidia.so.0
 .endif
 # Move symlinks under PREFIX
 .if ${NVVERSION} >= 525.08902
 	${REINPLACE_CMD} -e '/ln/s/$${LOCALBASE}\/lib/../' \
 		-e '/LIBDIR/!s/$${LOCALBASE}/$${DESTDIR}$${PREFIX}/' \
 		${WRKSRC}/lib/libnvidia-allocator/Makefile
 .endif
 # Conditionally install documentation (but you generally want it)
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
 		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
 
 post-install: .SILENT
 	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
 		${STAGEDIR}${PREFIX}/bin
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION:R} < 460
 	${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \
 		/nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
 .else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump|smi|ml)/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -E '/lib(EGL|GLESv[12].*)_nvidia/d ; \
 		/lib(GLX|GLdispatch|OpenGL)/d ; \
 		/extensions\/libglxserver_nvidia\.so/d ; \
 		/10_nvidia\.json/d' ${TMPPLIST}
 .else
 	${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 415.013
 	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
 		/10_nvidia_wayland\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 440.036
 	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 470.074 || ${NVVERSION} >= 545.000
 	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 495.02905
 	${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \
 		/15_nvidia_gbm\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 525.08902
 	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
 		/nvidia-drm_gbm\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 545.000
 	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST}
 .endif
 
 .if ${NVVERSION} < 410.057
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGL.so
 .  if ${NVVERSION} >= 331.013
 	${LN} -sf libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1
 	${LN} -sf libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
 .  endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
 .else
 	${REINPLACE_CMD} -E '/-NVIDIA/d ; \
 		/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
 		${TMPPLIST}
 # Override mesa.conf if GLX_EXT_libglvnd is missing
 	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_nvidia.so.0" \
 		>${STAGEDIR}${PREFIX}/etc/libmap.d/nvidia.conf
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index bb3e10d7ad06..7273bbf77e9d 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	slim
 PORTVERSION=	1.3.6
-PORTREVISION=	27
+PORTREVISION=	28
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
 		SF/slim.berlios
 
 MAINTAINER=	jsm@FreeBSD.org
 COMMENT=	Graphical login manager for X11, derived from Login.app
 WWW=		https://sourceforge.net/projects/slim.berlios/
 
 LICENSE=	GPLv2
 
 FLAVORS=	xorg xlibre
 FLAVOR?=	${FLAVORS:[1]}
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 USES=		cmake compiler:c++11-lang cpe jpeg pkgconfig xorg
 CPE_VENDOR=	berlios
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xrandr xrender xt
 
 .if ${FLAVOR} == xlibre
 PKGNAMEPREFIX=	xlibre-
 USES+=		xlibre
 USE_XLIBRE+=	xlibre-server
 CONFLICTS_BUILD+=	xorg-server
 .else
 USE_XORG+=	xorg-server
 CONFLICTS_BUILD+=	xlibre-server
 .endif
 
 USE_RC_SUBR=	slim
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
 
 CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes \
 		-DBUILD_SLIMLOCK=no \
 		-DBUILD_SHARED_LIBS=yes
 
 OPTIONS_DEFINE=		XDEFAULT PAM UTF8 CONSOLEKIT
 OPTIONS_DEFAULT=	XDEFAULT PAM UTF8 CONSOLEKIT
 OPTIONS_SUB=	yes
 
 XDEFAULT_DESC=Allow to set a default xsession in .xinitrc
 UTF8_DESC=	Support UTF-8 characters
 CONSOLEKIT_DESC=Enable support for consolekit
 
 PLIST_SUB+=	VERSION="${PORTVERSION}"
 
 PAM_CMAKE_ON=	-DUSE_PAM=yes
 PAM_CMAKE_OFF=	-DUSE_PAM=no
 
 # patch taken from https://github.com/iwamatsu/slim/pull/1
 XDEFAULT_EXTRA_PATCHES+=  ${PATCHDIR}/extra-patch-xdefault
 
 # patch taken from slim-unicode in Arch User Repository
 UTF8_EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-utf8
 
 CONSOLEKIT_CMAKE_ON=	-DUSE_CONSOLEKIT=yes
 CONSOLEKIT_LIB_DEPENDS=	libck-connector.so:sysutils/consolekit2 \
 			libdbus-1.so:devel/dbus
 CONSOLEKIT_CMAKE_OFF=	-DUSE_CONSOLEKIT=no
 
 post-patch:
 	@${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/slim.conf.sample
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/slim.1
 
 post-install-PAM-on:
 	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/slim.sample
 
 .include <bsd.port.mk>