Index: x11-wm/hikari/Makefile
===================================================================
--- x11-wm/hikari/Makefile
+++ x11-wm/hikari/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=      hikari
 DISTVERSION=   2.2.2
+PORTREVISION=  1
 CATEGORIES=    x11-wm
 MASTER_SITES=  https://hikari.acmelabs.space/releases/

@@ -28,22 +29,32 @@
 MAKE_ARGS+=    ${WITH_DEBUG:DDEBUG=YES} \
                WITHOUT_SUID=YES

-OPTIONS_DEFINE=                GAMMA LAYERSHELL SCREENCOPY SUID VIRTUALINPUT X11
-OPTIONS_DEFAULT=       GAMMA LAYERSHELL SCREENCOPY SUID VIRTUALINPUT X11
+OPTIONS_DEFINE=                        UNLOCKER_SUID
+OPTIONS_DEFAULT=               GAMMA HIKARI_SUID LAYERSHELL SCREENCOPY SEATD \
+                               UNLOCKER_SUID VIRTUALINPUT X11
+OPTIONS_GROUP=                 PROTOCOL_SUPPORT
+OPTIONS_GROUP_PROTOCOL_SUPPORT=        GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
+OPTIONS_SINGLE=                        DRM_ACCESS
+OPTIONS_SINGLE_DRM_ACCESS=     HIKARI_SUID SEATD

 GAMMA_DESC=            Include gammacontrol protocol (required by, e.g., Redshift)
+HIKARI_SUID_DESC=      Setuid bit on unlocker binaries (required for DRM)
 LAYERSHELL_DESC=       Include layer_shell protocol (required by, e.g., waybar)
 SCREENCOPY_DESC=       Include screenshot protocol (required by, e.g., grim)
-SUID_DESC=             Setuid bit on binaries (required for DRM and PAM)
+SEATD_DESC=            DRM session with libseat via seatd
+UNLOCKER_SUID_DESC=    Setuid bit on unlocker binaries (required for PAM)
 VIRTUALINPUT_DESC=     needed for VNC support (requiered by e.g. wayvnc)

-GAMMA_MAKE_ARGS=       WITH_GAMMACONTROL=YES
-LAYERSHELL_MAKE_ARGS=  WITH_LAYERSHELL=YES
-SCREENCOPY_MAKE_ARGS=  WITH_SCREENCOPY=YES
-SUID_PLIST_SUB=                MAYBE_SUID="@(,,4755) "
-SUID_PLIST_SUB_OFF=    MAYBE_SUID=""
-VIRTUALINPUT_MAKE_ARGS=        WITH_VIRTUAL_INPUT=YES
-X11_MAKE_ARGS=         WITH_XWAYLAND=YES
+GAMMA_MAKE_ARGS=               WITH_GAMMACONTROL=YES
+HIKARI_SUID_PLIST_SUB=         HIKARI_MAYBE_SUID="@(,,4755) "
+HIKARI_SUID_PLIST_SUB_OFF=     HIKARI_MAYBE_SUID=""
+LAYERSHELL_MAKE_ARGS=          WITH_LAYERSHELL=YES
+SCREENCOPY_MAKE_ARGS=          WITH_SCREENCOPY=YES
+SEATD_RUN_DEPENDS=             seatd:sysutils/seatd
+UNLOCKER_SUID_PLIST_SUB=       UNLOCKER_MAYBE_SUID="@(,,4755) "
+UNLOCKER_SUID_PLIST_SUB_OFF=   UNLOCKER_MAYBE_SUID=""
+VIRTUALINPUT_MAKE_ARGS=                WITH_VIRTUAL_INPUT=YES
+X11_MAKE_ARGS=                 WITH_XWAYLAND=YES

 post-install:
 .ifndef WITH_DEBUG
Index: x11-wm/hikari/pkg-plist
===================================================================
--- x11-wm/hikari/pkg-plist
+++ x11-wm/hikari/pkg-plist
@@ -1,5 +1,5 @@
-%%MAYBE_SUID%%bin/hikari
-%%MAYBE_SUID%%bin/hikari-unlocker
+%%HIKARI_MAYBE_SUID%%bin/hikari
+%%UNLOCKER_MAYBE_SUID%%bin/hikari-unlocker
 etc/pam.d/hikari-unlocker
 @sample %%ETCDIR%%/hikari.conf.sample
 share/backgrounds/hikari/hikari_wallpaper.png