diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
--- a/Mk/Uses/xorg-cat.mk
+++ b/Mk/Uses/xorg-cat.mk
@@ -14,8 +14,6 @@
 # 		* font     don't install .pc file
 # 		* lib      various dependencies, install .pc file, needs
 # 		           pathfix
-# 		* proto    install .pc file, needs pathfix, most only needed at
-# 		           build time.
 # 		* util     no particular notes
 #
 # 		These categories has to match upstream categories.  Don't invent
@@ -34,7 +32,7 @@
 .if !defined(_INCLUDE_USES_XORG_CAT_MK)
 _INCLUDE_USES_XORG_CAT_MK=yes
 
-_XORG_CATEGORIES=	app data doc driver font lib proto util
+_XORG_CATEGORIES=	app data doc driver font lib util
 _XORG_BUILDSYSTEMS=	autotools meson
 
 _XORG_CAT=		# empty
@@ -158,9 +156,6 @@
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 .    endif
 
-.  elif ${_XORG_CAT} == proto
-.include "${USESDIR}/pathfix.mk"
-
 .  endif # ${_XORG_CAT} == <category>
 
 # We only need to include xorg.mk if we want USE_XORG modules
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	xcb-proto
 PORTVERSION=	1.17.0
 CATEGORIES=	x11 python
+MASTER_SITES=	XORG/individual/proto
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
@@ -9,10 +10,10 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gnome python tar:xz xorg-cat:proto
+GNU_CONFIGURE=	yes
+USES=		gnome python tar:xz
 USE_GNOME=	libxml2:build
 NO_ARCH=	yes
-MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 DATADIR=	${PREFIX}/share/xcb
 
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713255468
-SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
-SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748
+TIMESTAMP = 1753269668
+SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
+SIZE (xcb-proto-1.17.0.tar.xz) = 151748
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -1,4 +1,4 @@
-libdata/pkgconfig/xcb-proto.pc
+share/pkgconfig/xcb-proto.pc
 %%DATADIR%%/bigreq.xml
 %%DATADIR%%/composite.xml
 %%DATADIR%%/damage.xml
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	xorgproto
 DISTVERSION=	2024.1
 CATEGORIES=	x11
+MASTER_SITES=	XORG/individual/proto
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Window System unified protocol definitions
@@ -8,10 +9,11 @@
 
 LICENSE=	MIT
 
-USES=		tar:xz xorg-cat:proto
+USES=		tar:xz
 
 NO_ARCH=	yes
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-fop \
 		--without-xmlto \
 		--without-xsltproc \
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711437392
-SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
-SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500
+TIMESTAMP = 1753269244
+SHA256 (xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
+SIZE (xorgproto-2024.1.tar.xz) = 760500
diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist
--- a/x11/xorgproto/pkg-plist
+++ b/x11/xorgproto/pkg-plist
@@ -127,35 +127,35 @@
 include/X11/fonts/fsmasks.h
 include/X11/keysym.h
 include/X11/keysymdef.h
-libdata/pkgconfig/applewmproto.pc
-libdata/pkgconfig/bigreqsproto.pc
-libdata/pkgconfig/compositeproto.pc
-libdata/pkgconfig/damageproto.pc
-libdata/pkgconfig/dmxproto.pc
-libdata/pkgconfig/dpmsproto.pc
-libdata/pkgconfig/dri2proto.pc
-libdata/pkgconfig/dri3proto.pc
-libdata/pkgconfig/fixesproto.pc
-libdata/pkgconfig/fontsproto.pc
-libdata/pkgconfig/glproto.pc
-libdata/pkgconfig/inputproto.pc
-libdata/pkgconfig/kbproto.pc
-libdata/pkgconfig/presentproto.pc
-libdata/pkgconfig/randrproto.pc
-libdata/pkgconfig/recordproto.pc
-libdata/pkgconfig/renderproto.pc
-libdata/pkgconfig/resourceproto.pc
-libdata/pkgconfig/scrnsaverproto.pc
-libdata/pkgconfig/videoproto.pc
-libdata/pkgconfig/xcmiscproto.pc
-libdata/pkgconfig/xextproto.pc
-libdata/pkgconfig/xf86bigfontproto.pc
-libdata/pkgconfig/xf86dgaproto.pc
-libdata/pkgconfig/xf86driproto.pc
-libdata/pkgconfig/xf86vidmodeproto.pc
-libdata/pkgconfig/xineramaproto.pc
-libdata/pkgconfig/xproto.pc
-libdata/pkgconfig/xwaylandproto.pc
+share/pkgconfig/applewmproto.pc
+share/pkgconfig/bigreqsproto.pc
+share/pkgconfig/compositeproto.pc
+share/pkgconfig/damageproto.pc
+share/pkgconfig/dmxproto.pc
+share/pkgconfig/dpmsproto.pc
+share/pkgconfig/dri2proto.pc
+share/pkgconfig/dri3proto.pc
+share/pkgconfig/fixesproto.pc
+share/pkgconfig/fontsproto.pc
+share/pkgconfig/glproto.pc
+share/pkgconfig/inputproto.pc
+share/pkgconfig/kbproto.pc
+share/pkgconfig/presentproto.pc
+share/pkgconfig/randrproto.pc
+share/pkgconfig/recordproto.pc
+share/pkgconfig/renderproto.pc
+share/pkgconfig/resourceproto.pc
+share/pkgconfig/scrnsaverproto.pc
+share/pkgconfig/videoproto.pc
+share/pkgconfig/xcmiscproto.pc
+share/pkgconfig/xextproto.pc
+share/pkgconfig/xf86bigfontproto.pc
+share/pkgconfig/xf86dgaproto.pc
+share/pkgconfig/xf86driproto.pc
+share/pkgconfig/xf86vidmodeproto.pc
+share/pkgconfig/xineramaproto.pc
+share/pkgconfig/xproto.pc
+share/pkgconfig/xwaylandproto.pc
 %%PORTDOCS%%%%DOCSDIR%%/compositeproto.txt
 %%PORTDOCS%%%%DOCSDIR%%/damageproto.txt
 %%PORTDOCS%%%%DOCSDIR%%/dri2proto.txt