10 files changed, 33 insertions, 34 deletions
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 22236c1..e31367e 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -1,14 +1,14 @@
 COMMENT =	shared memory SyncFence synchronization primitive
 
 DISTNAME =	libxshmfence-1.3.2
+SHARED_LIBS =	xshmfence 0.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://gitlab.freedesktop.org/xorg/lib/libxshmfence
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xshmfence 0.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
diff --git a/x11/ssh-askpass/Makefile b/x11/ssh-askpass/Makefile
index 963bb0f..218a775 100644
--- a/x11/ssh-askpass/Makefile
+++ b/x11/ssh-askpass/Makefile
@@ -17,19 +17,20 @@ SITES =			https://xenocara.org/app/ssh-askpass/
 
 MODULES =		xenocara
 
+RUN_DEPENDS =		x11/libXcursor
+
 LIB_DEPENDS =		x11/libXt \
 			x11/libXinerama
 
-RUN_DEPENDS =		x11/libXcursor
+MAKE_ENV += 		BINDIR=${PREFIX}/bin
+
+FAKE_FLAGS =		INSTALL_DATA="${INSTALL_DATA}" \
+			INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 WRKDIST =		${WRKDIR}/ssh-askpass
 
 pre-fake:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/X11/app-defaults
 
-MAKE_ENV += 	BINDIR=${PREFIX}/bin
-
-FAKE_FLAGS =	INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 .include <bsd.port.mk>
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 09bf193..8c494a8 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -1,14 +1,14 @@
 COMMENT =	utilitiy libraries for X cursor management
 
 DISTNAME =	xcb-util-cursor-0.1.5
+SHARED_LIBS =	xcb-cursor 0.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://xcb.freedesktop.org
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-cursor 0.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 15190d4..675969f 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -1,23 +1,23 @@
 COMMENT =	utilitiy libraries for image management
 
 DISTNAME =	xcb-util-image-0.4.0
+SHARED_LIBS =	xcb-image 2.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://xcb.freedesktop.org
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-image 2.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MODULES =		xenocara
-
 WANTLIB =		Xau Xdmcp xcb xcb-shm xcb-util
 
 SITES =			https://xcb.freedesktop.org/dist/
 
+MODULES =		xenocara
+
 BUILD_DEPENDS =		devel/xorgproto
 
 LIB_DEPENDS =		x11/libxcb \
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 8663adf..4ee6995 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -1,14 +1,14 @@
 COMMENT =	utilitiy libraries for keysyms management
 
 DISTNAME =	xcb-util-keysyms-0.4.0
+SHARED_LIBS =	xcb-keysyms 3.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://xcb.freedesktop.org
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-keysyms 3.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index faa7fb5..41e57e9 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -1,23 +1,23 @@
 COMMENT =	utilitiy libraries for the render extension
 
 DISTNAME =	xcb-util-renderutil-0.3.9
+SHARED_LIBS =	xcb-render-util 2.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://xcb.freedesktop.org
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-render-util 2.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MODULES =		xenocara
-
 WANTLIB =		Xau Xdmcp xcb xcb-render
 
 SITES =			https://xcb.freedesktop.org/dist/
 
+MODULES =		xenocara
+
 BUILD_DEPENDS =		devel/xorgproto
 
 LIB_DEPENDS =		x11/libxcb
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index 9445e8a..5d08ed9 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -1,14 +1,14 @@
 COMMENT =	utilitiy libraries for Window Manager and inter-client
 
 DISTNAME =	xcb-util-wm-0.4.1
+SHARED_LIBS =	xcb-icccm 4.0 xcb-ewmh 2.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://xcb.freedesktop.org
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-icccm 4.0 xcb-ewmh 2.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 57674d6..9e530b2 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,24 +1,23 @@
-
 COMMENT =	the X protocol library
 
 DISTNAME =	xcb-util-0.4.1
+SHARED_LIBS =	xcb-util 0.0
+
 CATEGORIES =	x11
 
 HOMEPAGE =	https://gitlab.freedesktop.org/xorg/lib/libxcb-util
 
 MAINTAINER =	xenocara@openbsd.org
 
-SHARED_LIBS=    xcb-util 0.0
-
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MODULES =		xenocara
-
 WANTLIB =		Xau Xdmcp xcb
 
 SITES =			https://xcb.freedesktop.org/dist/
 
+MODULES =		xenocara
+
 LIB_DEPENDS =		x11/libxcb
 
 SEPARATE_BUILD =	Yes
diff --git a/x11/xenodm/Makefile b/x11/xenodm/Makefile
index d20d032..423cb28 100644
--- a/x11/xenodm/Makefile
+++ b/x11/xenodm/Makefile
@@ -1,4 +1,3 @@
-
 COMMENT =	Xenocara display manager
 DISTNAME =	xenodm-20.7
 
@@ -20,10 +19,6 @@ SITES =			https://xenocara.org/app/xenodm/
 
 MODULES =		xenocara
 
-LIB_DEPENDS =		x11/libXaw \
-			x11/libXft \
-			x11/libXinerama
-
 RUN_DEPENDS =		sysutils/sessreg \
 			x11/libXcursor \
 			x11/xconsole \
@@ -31,10 +26,14 @@ RUN_DEPENDS =		sysutils/sessreg \
 			x11/xsetroot \
 			x11/xorg-server
 
-CONFIGURE_STYLE =	gnu
+LIB_DEPENDS =		x11/libXaw \
+			x11/libXft \
+			x11/libXinerama
 
 SEPARATE_BUILD =	yes
 
+CONFIGURE_STYLE =	gnu
+
 XENODMCONFIGDIR =	${SYSCONFDIR}/X11/xenodm
 XENODMLIBDIR =		${PREFIX}/lib/X11/xenodm
 PIXMAPDIR =		${XENODMLIBDIR}/pixmaps
diff --git a/x11/xf86-video-amdgpu/Makefile b/x11/xf86-video-amdgpu/Makefile
index 7f74917..3dec0a3 100644
--- a/x11/xf86-video-amdgpu/Makefile
+++ b/x11/xf86-video-amdgpu/Makefile
@@ -9,12 +9,12 @@ MAINTAINER =	xenocara@openbsd.org
 # MIT
 PERMIT_PACKAGE =	Yes
 
+WANTLIB =		drm drm_amdgpu gbm m
+
 SITES =			${SITE_XORG:=driver/}
 
 MODULES =		xenocara
 
-WANTLIB =		drm drm_amdgpu gbm m
-
 BUILD_DEPENDS =		x11/xorg-server
 
 SEPARATE_BUILD =	Yes