diff --git a/x11/disman/Makefile b/x11/disman/Makefile
index ffd4eb40d097..fd0358e79983 100644
--- a/x11/disman/Makefile
+++ b/x11/disman/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	disman
 DISTVERSIONPREFIX=	${PORTNAME}@
 DISTVERSION=	0.527.0
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Qt/C++ display management library
-WWW=		https://gitlab.com/kwinft/disman
+WWW=		https://github.com/winft/disman
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
 
 USES=		cmake:testing kde:5 pathfix qt:5
-USE_GITLAB=	yes
+USE_GITHUB=	yes
 USE_KDE=	ecm:build coreaddons
 USE_LDCONFIG=	yes
 USE_QT=		qmake:build buildtools:build core dbus gui
-GL_ACCOUNT=	kwinft
+GH_ACCOUNT=	winft
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/@/-/}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	WAYLAND X11
 OPTIONS_DEFAULT=WAYLAND X11
 OPTIONS_SUB=	yes
 
 WAYLAND_LIB_DEPENDS=	libWraplandClient.so:graphics/wrapland
 WAYLAND_USE=		KDE=wayland
 WAYLAND_CMAKE_BOOL_OFF=	${KF5Wayland Wrapland:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/}
 
 X11_USES=		xorg
 X11_USE=		QT=x11extras XORG=xcb
 X11_CMAKE_BOOL_OFF=	${Qt5X11Extras XCB:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/}
 
 post-patch:
 # Respect PREFIX for hwdata
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/backends/edid.cpp
 
 .include <bsd.port.mk>
diff --git a/x11/disman/distinfo b/x11/disman/distinfo
index 5450b3ae75aa..8293a7b6e80b 100644
--- a/x11/disman/distinfo
+++ b/x11/disman/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1676648351
-SHA256 (disman-disman@0.527.0.tar.bz2) = 7c5a259391c8151dcb2c608a69d867f20ff2a0e9306c15fdf103668a571c283a
-SIZE (disman-disman@0.527.0.tar.bz2) = 112490
+SHA256 (winft-disman-disman@0.527.0_GH0.tar.gz) = 4398d0b044d2021441db084138fd28d741a34a79c9e54e86a31705d706f5b8f2
+SIZE (winft-disman-disman@0.527.0_GH0.tar.gz) = 150355
diff --git a/x11/disman/files/patch-optional-deps b/x11/disman/files/patch-optional-deps
index 7d79872b4571..3633afdbd833 100644
--- a/x11/disman/files/patch-optional-deps
+++ b/x11/disman/files/patch-optional-deps
@@ -1,77 +1,77 @@
-Revert https://gitlab.com/kwinft/disman/-/commit/78771e145b7f
-and    https://gitlab.com/kwinft/disman/-/commit/18d0a3aa7940
+Revert https://github.com/winft/disman/commit/78771e145b7f
+and    https://github.com/winft/disman/commit/18d0a3aa7940
 to support disabling build dependencies at configure (CMake) time.
 
 CMake Error at backends/wayland/plugins/kwayland/CMakeLists.txt:21 (target_link_libraries):
   Target "disman-kwayland" links to:
 
     KF5::WaylandClient
 
   but the target was not found.  Possible reasons include:
 
     * There is a typo in the target name.
     * A find_package call is missing for an IMPORTED target.
     * An ALIAS target is missing.
 
 CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
   find_package for module Qt5X11Extras called with REQUIRED, but
   CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras is enabled.  A REQUIRED package
   cannot be disabled.
 Call Stack (most recent call first):
   CMakeLists.txt:32 (find_package)
 
 --- CMakeLists.txt.orig	2022-06-14 20:05:24 UTC
 +++ CMakeLists.txt
 @@ -34,9 +34,14 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
      Core
      DBus
      Gui
 +)
 +
 +# XXX REQUIRED negates TYPE OPTIONAL
 +find_package(Qt5 ${QT_MIN_VERSION} CONFIG
    OPTIONAL_COMPONENTS
      X11Extras
  )
 +
  set_package_properties(Qt5X11Extras PROPERTIES
    PURPOSE "Required for X11/RandR backend"
  )
 --- backends/CMakeLists.txt.orig	2022-06-14 20:05:24 UTC
 +++ backends/CMakeLists.txt
 @@ -35,4 +35,10 @@ add_subdirectory(wayland)
  add_subdirectory(fake)
  add_subdirectory(qscreen)
  add_subdirectory(wayland)
 -add_subdirectory(xrandr)
 +
 +if(${XCB_RANDR_FOUND})
 +  message(STATUS "Will build xrandr backend.")
 +  add_subdirectory(xrandr)
 +else()
 +  message(STATUS "Not building xrandr backend, no XCB_RANDR_FOUND set.")
 +endif()
 --- backends/wayland/plugins/CMakeLists.txt.orig	2022-06-14 20:05:24 UTC
 +++ backends/wayland/plugins/CMakeLists.txt
 @@ -1,3 +1,8 @@
 -add_subdirectory(kwayland)
 -add_subdirectory(kwinft)
 -add_subdirectory(wlroots)
 +if(KF5Wayland_FOUND)
 +  add_subdirectory(kwayland)
 +endif()
 +
 +if(Wrapland_FOUND)
 +  add_subdirectory(kwinft)
 +  add_subdirectory(wlroots)
 +endif()
 --- backends/xrandr/CMakeLists.txt.orig	2022-06-14 20:05:24 UTC
 +++ backends/xrandr/CMakeLists.txt
 @@ -1,3 +1,7 @@
 +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
 +  X11Extras
 +)
 +
  set(xrandr_SRCS
    xrandr.cpp
    xrandrconfig.cpp