diff --git a/x11/Makefile b/x11/Makefile
index 6083da1be9a5..60f37aed6a01 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,681 +1,681 @@
COMMENT = Ports to support the X window system
SUBDIR += 3ddesktop
SUBDIR += 9box
SUBDIR += 9menu
SUBDIR += aclip
SUBDIR += admiral
SUBDIR += alacritty
SUBDIR += albert
SUBDIR += alttab
SUBDIR += aminal
SUBDIR += antimicrox
SUBDIR += appmenu-registrar
SUBDIR += appres
SUBDIR += apwal
SUBDIR += arandr
SUBDIR += arcan-trayicon
SUBDIR += aterm
SUBDIR += autorandr
SUBDIR += babl
SUBDIR += bbappconf
SUBDIR += bbdock
SUBDIR += bbrun
SUBDIR += beforelight
SUBDIR += bemenu
SUBDIR += bgrot
SUBDIR += bgs
SUBDIR += bitmap
SUBDIR += bmpanel2
SUBDIR += brisk-menu
SUBDIR += budgie
SUBDIR += budgie-desktop
SUBDIR += budgie-screensaver
SUBDIR += cde
SUBDIR += cde-25
SUBDIR += cde-devel
SUBDIR += chayang
SUBDIR += cinnamon
SUBDIR += cinnamon-desktop
SUBDIR += cinnamon-menus
SUBDIR += cinnamon-screensaver
SUBDIR += cinnamon-session
SUBDIR += cl-clx
SUBDIR += cl-clx-sbcl
SUBDIR += clip
SUBDIR += clipcat
SUBDIR += cliphist
SUBDIR += clipman
SUBDIR += compton-conf
SUBDIR += conlecterm
SUBDIR += controllermap
SUBDIR += cool-retro-term
SUBDIR += coreterminal
SUBDIR += damask
SUBDIR += darktile
SUBDIR += deforaos-integration
SUBDIR += deforaos-keyboard
SUBDIR += deforaos-libdesktop
SUBDIR += deforaos-locker
SUBDIR += deskmenu
SUBDIR += disman
SUBDIR += dmenu
SUBDIR += dmenu2
SUBDIR += docker-tray
SUBDIR += dsbautostart
SUBDIR += dsbxinput
SUBDIR += dwlb
SUBDIR += dwmblocks
SUBDIR += dxpc
SUBDIR += dzen2
SUBDIR += eaglemode
SUBDIR += editres
SUBDIR += elementary-terminal
SUBDIR += emprint
SUBDIR += erun
SUBDIR += eterm
SUBDIR += evilvte
SUBDIR += evtest
SUBDIR += eww
SUBDIR += fbdesk
SUBDIR += fbpanel
SUBDIR += find-cursor
SUBDIR += fireflies
SUBDIR += florence
SUBDIR += flruler
SUBDIR += fnott
SUBDIR += foot
SUBDIR += fstobdf
SUBDIR += fuzzel
SUBDIR += gbsddialog
SUBDIR += gdm
SUBDIR += glcapsviewer
SUBDIR += gmrun
SUBDIR += gnome
SUBDIR += gnome-clipboard-daemon
SUBDIR += gnome-console
SUBDIR += gnome-desktop
SUBDIR += gnome-menus
SUBDIR += gnome-pie
SUBDIR += gnome-session
SUBDIR += gnome-shell
SUBDIR += gnome-shell-extensions
SUBDIR += gnome-terminal
SUBDIR += gnustep-app
SUBDIR += grabc
SUBDIR += grim
SUBDIR += grimshot
SUBDIR += gromit
SUBDIR += gromit-mpx
SUBDIR += gskrab
SUBDIR += gstreamer1-plugins-x
SUBDIR += gstreamer1-plugins-ximagesrc
SUBDIR += gtk-app-menu
SUBDIR += gtk-theme-switch2
SUBDIR += gtkchtheme
SUBDIR += gtklock
SUBDIR += gtkterm2
SUBDIR += guake
SUBDIR += gxkb
SUBDIR += habak
SUBDIR += hamclock
SUBDIR += hhpc
SUBDIR += hs-xmobar
SUBDIR += hsetroot
SUBDIR += hybrid-bar
SUBDIR += hyprcursor
SUBDIR += hypridle
SUBDIR += hyprlock
SUBDIR += hyprpaper
SUBDIR += hyprpicker
SUBDIR += i3bar-river
SUBDIR += i3blocks
SUBDIR += i3lock-color
SUBDIR += iceauth
SUBDIR += ico
SUBDIR += idesk
SUBDIR += imwheel
SUBDIR += innerspace
SUBDIR += inputplug
SUBDIR += j4-dmenu-desktop
SUBDIR += jbxvt
SUBDIR += jgmenu
SUBDIR += kanshi
SUBDIR += kb2mb2
SUBDIR += kde-baseapps
SUBDIR += kde5
SUBDIR += kde6
SUBDIR += kdisplay
SUBDIR += keybinder
SUBDIR += keybinder-gtk3
SUBDIR += keyboardcast
SUBDIR += keynav
SUBDIR += kf5-frameworkintegration
SUBDIR += kf5-frameworks
SUBDIR += kf5-kactivities
SUBDIR += kf5-kactivities-stats
SUBDIR += kf5-kded
SUBDIR += kf5-kdelibs4support
SUBDIR += kf5-kglobalaccel
SUBDIR += kf5-kinit
SUBDIR += kf5-krunner
SUBDIR += kf5-kwayland
SUBDIR += kf5-kwindowsystem
SUBDIR += kf5-plasma-framework
SUBDIR += kf6-frameworkintegration
SUBDIR += kf6-frameworks
SUBDIR += kf6-kded
SUBDIR += kf6-kglobalaccel
SUBDIR += kf6-krunner
SUBDIR += kf6-kwindowsystem
SUBDIR += kickoff
SUBDIR += kitty
SUBDIR += konsole
SUBDIR += konsole-devel
SUBDIR += lavalauncher
SUBDIR += lemonbar
SUBDIR += lemonbar-xft
SUBDIR += libICE
SUBDIR += libSM
SUBDIR += libX11
SUBDIR += libXScrnSaver
SUBDIR += libXau
SUBDIR += libXcm
SUBDIR += libXcomposite
SUBDIR += libXcursor
SUBDIR += libXdamage
SUBDIR += libXdmcp
SUBDIR += libXext
SUBDIR += libXfixes
SUBDIR += libXi
SUBDIR += libXinerama
SUBDIR += libXpm
SUBDIR += libXpresent
SUBDIR += libXrandr
SUBDIR += libXrender
SUBDIR += libXres
SUBDIR += libXtst
SUBDIR += libXv
SUBDIR += libXvMC
SUBDIR += libXxf86dga
SUBDIR += libXxf86vm
SUBDIR += libclipboard
SUBDIR += libei
SUBDIR += libexo
SUBDIR += libfakekey
SUBDIR += libfm
SUBDIR += libfm-extra
SUBDIR += libfm-qt
SUBDIR += libfm-qt6
SUBDIR += libgnomekbd
SUBDIR += libinput
SUBDIR += libmatekbd
SUBDIR += libsx
SUBDIR += libsynaptics
SUBDIR += libwacom
SUBDIR += libxcb
SUBDIR += libxcvt
SUBDIR += libxdg-basedir
SUBDIR += libxfce4menu
SUBDIR += libxfce4util
SUBDIR += libxkbcommon
SUBDIR += libxkbfile
SUBDIR += libxklavier
SUBDIR += libxshmfence
SUBDIR += lightdm
SUBDIR += lightdm-gtk-greeter
SUBDIR += lightdm-gtk-greeter-settings
SUBDIR += lilyterm
SUBDIR += linux-c7-libxkbcommon
SUBDIR += linux-c7-pixman
SUBDIR += linux-c7-xcb-util
SUBDIR += linux-c7-xcb-util-image
SUBDIR += linux-c7-xcb-util-keysyms
SUBDIR += linux-c7-xorg-libs
SUBDIR += linux-nvidia-libs
SUBDIR += linux-nvidia-libs-304
SUBDIR += linux-nvidia-libs-340
SUBDIR += linux-nvidia-libs-390
SUBDIR += linux-nvidia-libs-470
SUBDIR += linux-rl9-libxkbcommon
SUBDIR += linux-rl9-pixman
SUBDIR += linux-rl9-xorg-libs
SUBDIR += listres
SUBDIR += lsw
SUBDIR += luit
SUBDIR += lumina
SUBDIR += lumina-core
SUBDIR += lumina-coreutils
SUBDIR += lupe
SUBDIR += lxde-meta
SUBDIR += lxhotkey
SUBDIR += lxmenu-data
SUBDIR += lxpanel
SUBDIR += lxqt-about
SUBDIR += lxqt-globalkeys
SUBDIR += lxqt-menu-data
SUBDIR += lxqt-runner
SUBDIR += lxrandr
SUBDIR += ly
SUBDIR += mako
SUBDIR += mate
SUBDIR += mate-applet-appmenu
SUBDIR += mate-applets
SUBDIR += mate-base
SUBDIR += mate-desktop
SUBDIR += mate-dock-applet
SUBDIR += mate-menus
SUBDIR += mate-panel
SUBDIR += mate-screensaver
SUBDIR += mate-session-manager
SUBDIR += mate-terminal
SUBDIR += menu-cache
SUBDIR += menulibre
SUBDIR += metalock
SUBDIR += mkcomposecache
SUBDIR += mlterm
SUBDIR += mons
SUBDIR += mrxvt
SUBDIR += mxascii
SUBDIR += mxico
SUBDIR += nezd
SUBDIR += nfy
SUBDIR += numlockx
SUBDIR += nvidia-driver
SUBDIR += nvidia-driver-304
SUBDIR += nvidia-driver-340
SUBDIR += nvidia-driver-390
SUBDIR += nvidia-driver-470
SUBDIR += nvidia-secondary-driver
SUBDIR += nvidia-secondary-driver-390
SUBDIR += nvidia-settings
SUBDIR += nvidia-xconfig
SUBDIR += nwg-bar
SUBDIR += nwg-dock
SUBDIR += nwg-dock-hyprland
SUBDIR += nwg-drawer
SUBDIR += nwg-launchers
SUBDIR += nwg-look
SUBDIR += nwg-menu
SUBDIR += nxcomp
SUBDIR += openrgb
SUBDIR += oscar
SUBDIR += p5-Clipboard
SUBDIR += p5-X11-GUITest
SUBDIR += p5-X11-IdleTime
SUBDIR += p5-X11-Protocol
SUBDIR += p5-X11-Protocol-Other
SUBDIR += p5-X11-Resolution
SUBDIR += p5-X11-XCB
SUBDIR += p5-X11-Xlib
SUBDIR += p5-XTerm-Conf
SUBDIR += pcdm
SUBDIR += perwindowlayoutd
SUBDIR += pipeglade
SUBDIR += pixman
SUBDIR += plank
SUBDIR += plasma-wayland-protocols
SUBDIR += plasma5-kactivitymanagerd
SUBDIR += plasma5-kgamma5
SUBDIR += plasma5-kscreen
SUBDIR += plasma5-kwayland-integration
SUBDIR += plasma5-layer-shell-qt
SUBDIR += plasma5-libkscreen
SUBDIR += plasma5-plasma
SUBDIR += plasma5-plasma-bigscreen
SUBDIR += plasma5-plasma-desktop
SUBDIR += plasma5-plasma-integration
SUBDIR += plasma5-plasma-workspace
SUBDIR += plasma6-kactivitymanagerd
SUBDIR += plasma6-kgamma
SUBDIR += plasma6-kglobalacceld
SUBDIR += plasma6-kscreen
SUBDIR += plasma6-kwayland
SUBDIR += plasma6-layer-shell-qt
SUBDIR += plasma6-libkscreen
SUBDIR += plasma6-libplasma
SUBDIR += plasma6-plasma
SUBDIR += plasma6-plasma-activities
SUBDIR += plasma6-plasma-activities-stats
SUBDIR += plasma6-plasma-desktop
SUBDIR += plasma6-plasma-integration
SUBDIR += plasma6-plasma-workspace
SUBDIR += pmenu
SUBDIR += polybar
SUBDIR += printscreen
SUBDIR += py-autotiling
SUBDIR += py-caffeine-ng
SUBDIR += py-i3-quickterm
SUBDIR += py-i3ipc
SUBDIR += py-mouseinfo
SUBDIR += py-pyautogui
SUBDIR += py-pynput
SUBDIR += py-pyscreenshot
SUBDIR += py-pyscreeze
SUBDIR += py-python-xapp
SUBDIR += py-pyvirtualdisplay
SUBDIR += py-screeninfo
SUBDIR += py-xcffib
SUBDIR += py-xdot
SUBDIR += qimageblitz
SUBDIR += qt5-qev
SUBDIR += qt5-x11extras
SUBDIR += qterminal
SUBDIR += remontoire
SUBDIR += rendercheck
SUBDIR += rgb
SUBDIR += rio
SUBDIR += rlaunch
SUBDIR += rofi
SUBDIR += rofi-calc
SUBDIR += rofi-emoji
SUBDIR += rofi-file-browser-extended
SUBDIR += rofi-pass
SUBDIR += rofi-wayland
SUBDIR += roxterm
SUBDIR += rsibreak
SUBDIR += rubygem-gnome
SUBDIR += runner
SUBDIR += rxvt-unicode
SUBDIR += sakura
SUBDIR += salut
SUBDIR += sandbar
SUBDIR += sbxkb
SUBDIR += screen-message
SUBDIR += screengrab
SUBDIR += screenkey
SUBDIR += scripts
SUBDIR += sddm
SUBDIR += sdwmbar
SUBDIR += sessreg
SUBDIR += setlayout
SUBDIR += setxkbmap
SUBDIR += sfwbar
SUBDIR += shaderbg
SUBDIR += shikane
SUBDIR += shotman
SUBDIR += showkeys
SUBDIR += showmethekey
SUBDIR += simplestroke
SUBDIR += sirula
SUBDIR += slick-greeter
SUBDIR += slim
SUBDIR += slock
SUBDIR += slop
SUBDIR += slurp
SUBDIR += smproxy
SUBDIR += somebar
SUBDIR += sprop
SUBDIR += squeekboard
SUBDIR += srandrd
SUBDIR += sselp
SUBDIR += stalonetray
SUBDIR += startup-notification
SUBDIR += sterm
SUBDIR += stjerm
SUBDIR += swarp
SUBDIR += sway-audio-idle-inhibit
SUBDIR += swaybg
SUBDIR += swayfloatingswitcher
SUBDIR += swayidle
SUBDIR += swayimg
SUBDIR += swaylock
SUBDIR += swaylock-effects
SUBDIR += swaylock-plugin
SUBDIR += swaync
SUBDIR += swayr
SUBDIR += swayrbar
SUBDIR += swaysettings
SUBDIR += sxhkd
SUBDIR += sxmo-wayout
SUBDIR += sxpc
SUBDIR += tabbed
SUBDIR += taiga
SUBDIR += temperature.app
SUBDIR += terminal.app
SUBDIR += terminator
SUBDIR += terminology
SUBDIR += tessen
SUBDIR += thingylaunch
SUBDIR += tilda
SUBDIR += tilix
SUBDIR += tint
SUBDIR += tofi
SUBDIR += trayer
SUBDIR += ulauncher
SUBDIR += urxvt-font-size
SUBDIR += urxvt-perls
SUBDIR += vdesk
SUBDIR += viewres
SUBDIR += virglrenderer
SUBDIR += virtboard
SUBDIR += virtualgl
SUBDIR += wallutils
SUBDIR += wapanel
SUBDIR += watershot
SUBDIR += way-displays
SUBDIR += waybar
SUBDIR += wayidle
SUBDIR += wayland-logout
SUBDIR += waylock
SUBDIR += wayout
SUBDIR += wbar
SUBDIR += wcm
SUBDIR += wdisplays
SUBDIR += wdm
SUBDIR += wev
SUBDIR += wezterm
SUBDIR += wf-shell
SUBDIR += windowtolayer
SUBDIR += wl-clipboard
SUBDIR += wl-kbptr
SUBDIR += wl-mirror
SUBDIR += wlogout
SUBDIR += wlopm
SUBDIR += wlr-randr
SUBDIR += wlr-which-key
SUBDIR += wlrctl
SUBDIR += wmappl
SUBDIR += wmblob
SUBDIR += wmbutton
SUBDIR += wmcliphist
- SUBDIR += wmctrl
+ SUBDIR += wmctrl-fork
SUBDIR += wmdrawer
SUBDIR += wmenu
SUBDIR += wmfocus
SUBDIR += wmsystemtray
SUBDIR += wmutils-core
SUBDIR += wmutils-opt
SUBDIR += wob
SUBDIR += wofi
SUBDIR += workrave
SUBDIR += wscreensaver
SUBDIR += wshowkeys
SUBDIR += wtype
SUBDIR += wvkbd
SUBDIR += x-on-resize
SUBDIR += x11perf
SUBDIR += x3270
SUBDIR += xantfarm
SUBDIR += xapp
SUBDIR += xascii
SUBDIR += xauth
SUBDIR += xautolock
SUBDIR += xautomation
SUBDIR += xbacklight
SUBDIR += xballoon
SUBDIR += xbanish
SUBDIR += xbiff
SUBDIR += xbindkeys
SUBDIR += xbitmaps
SUBDIR += xbrightness
SUBDIR += xcalc
SUBDIR += xcalib
SUBDIR += xcape
SUBDIR += xcb
SUBDIR += xcb-imdkit
SUBDIR += xcb-proto
SUBDIR += xcb-util
SUBDIR += xcb-util-cursor
SUBDIR += xcb-util-errors
SUBDIR += xcb-util-image
SUBDIR += xcb-util-keysyms
SUBDIR += xcb-util-renderutil
SUBDIR += xcb-util-wm
SUBDIR += xcb-util-xrm
SUBDIR += xclickroot
SUBDIR += xclip
SUBDIR += xclipboard
SUBDIR += xcm
SUBDIR += xcmd
SUBDIR += xcmsdb
SUBDIR += xcoloredit
SUBDIR += xcolors
SUBDIR += xconsole
SUBDIR += xcur2png
SUBDIR += xcursorgen
SUBDIR += xcut
SUBDIR += xdg-desktop-portal-gnome
SUBDIR += xdg-desktop-portal-gtk
SUBDIR += xdg-desktop-portal-hyprland
SUBDIR += xdg-desktop-portal-luminous
SUBDIR += xdg-desktop-portal-wlr
SUBDIR += xdialog
SUBDIR += xditview
SUBDIR += xdm
SUBDIR += xdo
SUBDIR += xdotool
SUBDIR += xdpyinfo
SUBDIR += xdriinfo
SUBDIR += xedit
SUBDIR += xev
SUBDIR += xeyes
SUBDIR += xf86dga
SUBDIR += xfce4-appmenu-plugin
SUBDIR += xfce4-clipman-plugin
SUBDIR += xfce4-conf
SUBDIR += xfce4-dashboard
SUBDIR += xfce4-docklike-plugin
SUBDIR += xfce4-goodies
SUBDIR += xfce4-screensaver
SUBDIR += xfce4-screenshooter-plugin
SUBDIR += xfce4-taskmanager
SUBDIR += xfce4-terminal
SUBDIR += xfce4-verve-plugin
SUBDIR += xfce4-whiskermenu-plugin
SUBDIR += xfce4-windowck-plugin
SUBDIR += xfd
SUBDIR += xfishtank
SUBDIR += xforward
SUBDIR += xgamma
SUBDIR += xgc
SUBDIR += xhost
SUBDIR += xidle
SUBDIR += xinit
SUBDIR += xinput
SUBDIR += xkb-switch
SUBDIR += xkbcomp
SUBDIR += xkbctrl
SUBDIR += xkbevd
SUBDIR += xkbind
SUBDIR += xkblayout-state
SUBDIR += xkbprint
SUBDIR += xkbset
SUBDIR += xkbutils
SUBDIR += xkeyboard-config
SUBDIR += xkeycaps
SUBDIR += xkeywrap
SUBDIR += xkill
SUBDIR += xload
SUBDIR += xloadimage
SUBDIR += xlockmore
SUBDIR += xlogo
SUBDIR += xlsatoms
SUBDIR += xlsclients
SUBDIR += xlupe
SUBDIR += xmag
SUBDIR += xman
SUBDIR += xmangekyou
SUBDIR += xmascot
SUBDIR += xmenu
SUBDIR += xmessage
SUBDIR += xmh
SUBDIR += xmodmap
SUBDIR += xmore
SUBDIR += xmotd
SUBDIR += xmsg
SUBDIR += xmx
SUBDIR += xnee
SUBDIR += xnotify
SUBDIR += xob
SUBDIR += xorg
SUBDIR += xorg-apps
SUBDIR += xorg-cf-files
SUBDIR += xorg-docs
SUBDIR += xorg-libraries
SUBDIR += xorg-minimal
SUBDIR += xorgproto
SUBDIR += xpr
SUBDIR += xpra
SUBDIR += xpra-html5
SUBDIR += xprintidle
SUBDIR += xprompt
SUBDIR += xprop
SUBDIR += xrandr
SUBDIR += xrdb
SUBDIR += xrefresh
SUBDIR += xrestop
SUBDIR += xrootconsole
SUBDIR += xrsh
SUBDIR += xrsi
SUBDIR += xscope
SUBDIR += xscreensaver
SUBDIR += xscreensaver.app
SUBDIR += xsel-conrad
SUBDIR += xset
SUBDIR += xsetroot
SUBDIR += xsettingsd
SUBDIR += xskyroot
SUBDIR += xsm
SUBDIR += xsnow
SUBDIR += xss-lock
SUBDIR += xssstate
SUBDIR += xstarroll
SUBDIR += xstdcmap
SUBDIR += xstroke
SUBDIR += xtacy
SUBDIR += xterm
SUBDIR += xtermcontrol
SUBDIR += xtermset
SUBDIR += xtestpicture
SUBDIR += xtitle
SUBDIR += xtoolwait
SUBDIR += xtrans
SUBDIR += xtrlock
SUBDIR += xtset
SUBDIR += xvattr
SUBDIR += xvidtune
SUBDIR += xvinfo
SUBDIR += xvkbd
SUBDIR += xvmcinfo
SUBDIR += xvt
SUBDIR += xwatchwin
SUBDIR += xwayland-run
SUBDIR += xwayland-satellite
SUBDIR += xwaylandvideobridge
SUBDIR += xwd
SUBDIR += xwininfo
SUBDIR += xwinwrap
SUBDIR += xwit
SUBDIR += xwud
SUBDIR += xxkb
SUBDIR += xzoom
SUBDIR += yad
SUBDIR += yakuake
SUBDIR += yalias
SUBDIR += yeahconsole
SUBDIR += yelp
SUBDIR += zenity
SUBDIR += zutty
.include <bsd.port.subdir.mk>