diff --git a/x11/gtklock/Makefile b/x11/gtklock/Makefile
index 9bbc487eae92..fab96265063a 100644
--- a/x11/gtklock/Makefile
+++ b/x11/gtklock/Makefile
@@ -1,32 +1,31 @@
 PORTNAME=	gtklock
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
-PORTREVISION=	1
+DISTVERSION=	3.0.0
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GTK-based lockscreen for Wayland
 WWW=		https://github.com/jovanlanik/gtklock
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	scdoc:textproc/scdoc
-LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
-		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+LIB_DEPENDS=	libgtk-session-lock.so:x11-toolkits/gtk-session-lock
 RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
-USES=		compiler:c11 gmake gnome pkgconfig
+USES=		compiler:c11 gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gtk30
 GH_ACCOUNT=	jovanlanik
-MAKEFILE=	makefile
-LDFLAGS+=	-Wl,--as-needed # gtk30 deps
+LDFLAGS_i386=	-Wl,-z,notext
 PLIST_FILES=	bin/${PORTNAME} \
-		etc/pam.d/${PORTNAME} \
-		share/man/man1/${PORTNAME}.1.gz
+		etc/pam.d/${PORTNAME}
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+
+MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
+MANPAGES_MESON_ENABLED=	man-pages
+MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/gtklock/distinfo b/x11/gtklock/distinfo
index 352e5ec1be93..69e3ee5b6f47 100644
--- a/x11/gtklock/distinfo
+++ b/x11/gtklock/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1683380662
-SHA256 (jovanlanik-gtklock-v2.1.0_GH0.tar.gz) = 47cc09ab773e90e3a28240faaabb8d9ac4e36f5234a2b5c3a956039783365f43
-SIZE (jovanlanik-gtklock-v2.1.0_GH0.tar.gz) = 56550
+TIMESTAMP = 1713465082
+SHA256 (jovanlanik-gtklock-v3.0.0_GH0.tar.gz) = a65e8636680c1fb11c449ecb0c88771345a9535150b7a372bc615def6bea2c7c
+SIZE (jovanlanik-gtklock-v3.0.0_GH0.tar.gz) = 54555
+SHA256 (Cu3PO42-gtk-session-lock-v0.2.0_GH0.tar.gz) = a4245c6930580c15ed263b9a7bb7e39f47693baec78be1026b4e0e28b233cb4e
+SIZE (Cu3PO42-gtk-session-lock-v0.2.0_GH0.tar.gz) = 96770
diff --git a/x11/gtklock/files/patch-meson.build b/x11/gtklock/files/patch-meson.build
new file mode 100644
index 000000000000..9e3a66b7aa3b
--- /dev/null
+++ b/x11/gtklock/files/patch-meson.build
@@ -0,0 +1,13 @@
+meson.build:19:6: ERROR: Dependency "pam" not found, tried pkgconfig
+
+--- meson.build.orig	2024-04-18 18:31:22 UTC
++++ meson.build
+@@ -16,7 +16,7 @@ gmodule_export = dependency('gmodule-export-2.0')
+ gtk = dependency('gtk+-3.0')
+ gtk_session_lock = dependency('gtk-session-lock-0')
+ gmodule_export = dependency('gmodule-export-2.0')
+-pam = dependency('pam')
++pam = meson.get_compiler('c').find_library('pam')
+ 
+ dependencies = [
+   gtk,