git: a4c421c50a47 - main - Mk/Uses/xorg-cat.mk: Resurrect CATEGORIES=proto and switch EXTRACT_SUFX to xz
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Sep 2026 19:15:48 UTC
The branch main has been updated by mce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a4c421c50a47c11d8c9849f07f1d86e5f3f0424f
commit a4c421c50a47c11d8c9849f07f1d86e5f3f0424f
Author: Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-01 05:27:29 +0000
Commit: Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-07 19:15:14 +0000
Mk/Uses/xorg-cat.mk: Resurrect CATEGORIES=proto and switch EXTRACT_SUFX to xz
Resurrect CATEGORIES=proto to simplify the port's Makefile.
Remove experimental from the meson's comment, as some ports have fully
transitioned to building with Meson.
Upstream has switched from bz2 to xz, so update EXTRACT_SUFX.
PR: 298092
Approved by: x11 (arrowd)
Approved by: fluffy (mentor)
---
Mk/Uses/xorg-cat.mk | 10 +++++++---
x11-drivers/xf86-input-evdev/Makefile | 4 ++--
x11-drivers/xf86-input-keyboard/Makefile | 4 +---
x11-drivers/xf86-input-mouse/Makefile | 4 +---
x11-drivers/xf86-input-synaptics/Makefile | 4 +---
x11-drivers/xf86-input-vmmouse/Makefile | 4 +---
x11-drivers/xf86-input-wacom/Makefile | 3 +--
x11-fonts/libXfont/Makefile | 2 +-
x11/scripts/Makefile | 5 +----
x11/xcb-proto/Makefile | 5 +----
x11/xcb-proto/distinfo | 6 +++---
x11/xf86dga/Makefile | 13 ++++++++-----
x11/xorgproto/Makefile | 6 +-----
x11/xorgproto/distinfo | 6 +++---
14 files changed, 32 insertions(+), 44 deletions(-)
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
index c075935ad73b..f876ca8dfe45 100644
--- a/Mk/Uses/xorg-cat.mk
+++ b/Mk/Uses/xorg-cat.mk
@@ -14,6 +14,7 @@
# * font don't install .pc file
# * lib various dependencies, install .pc file, needs
# pathfix
+# * proto install .pc file, most only needed at build time
# * test no particular notes
# * util no particular notes
#
@@ -22,7 +23,7 @@
#
# builsystem is one of:
# * autotools (default)
-# * meson (experimental)
+# * meson
#
#
# By defining USE_GITLAB and GL_TAGNAME, it is possible to pull code straight
@@ -33,7 +34,7 @@
.if !defined(_INCLUDE_USES_XORG_CAT_MK)
_INCLUDE_USES_XORG_CAT_MK=yes
-_XORG_CATEGORIES= app data doc driver font lib test util
+_XORG_CATEGORIES= app data doc driver font lib proto test util
_XORG_BUILDSYSTEMS= autotools meson
_XORG_CAT= # empty
@@ -68,7 +69,7 @@ _XORG_BUILDSYS= autotools
# Default variables, common to all new modular xorg ports.
. if empty(USES:Mtar)
-EXTRACT_SUFX?= .tar.bz2
+EXTRACT_SUFX?= .tar.xz
. endif
DIST_SUBDIR= xorg/${_XORG_CAT}
@@ -161,6 +162,9 @@ libtool_ARGS?= # empty
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
+. elif ${_XORG_CAT} == proto
+NO_ARCH= yes
+
. endif # ${_XORG_CAT} == <category>
# We only need to include xorg.mk if we want USE_XORG modules
diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile
index 9e7ec147e052..4528bd346584 100644
--- a/x11-drivers/xf86-input-evdev/Makefile
+++ b/x11-drivers/xf86-input-evdev/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \
libmtdev.so:devel/libmtdev
RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd
-USES= pathfix xorg-cat:driver
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES= pathfix tar:bz2 xorg-cat:driver
+
CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" "
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 5a2989c24184..29e8a5e76057 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -10,8 +10,6 @@ WWW= https://www.x.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= xorg-cat:driver
-
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES= tar:bz2 xorg-cat:driver
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index fc40474a2a7a..8ce523d21fff 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -10,8 +10,6 @@ WWW= https://www.x.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix xorg-cat:driver
-
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES= pathfix tar:bz2 xorg-cat:driver
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index e3dfd8ea42e6..dc758d4cac7b 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -10,11 +10,9 @@ WWW= https://www.x.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix xorg xorg-cat:driver
+USES= pathfix tar:bz2 xorg xorg-cat:driver
USE_XORG= x11 xtst
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
OPTIONS_DEFINE= EVDEV
OPTIONS_DEFAULT_FreeBSD= EVDEV
OPTIONS_DEFAULT=${OPTIONS_DEFAULT_${OPSYS}}
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 7da9f108ed30..68e74966e0d1 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -7,9 +7,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmmouse input driver
WWW= https://www.x.org/
-USES= gmake xorg-cat:driver
-
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES= gmake tar:bz2 xorg-cat:driver
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= vmmouse protocol is only supported on x86-compatible architectures
diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile
index 521732624ac2..7b22fa00bce0 100644
--- a/x11-drivers/xf86-input-wacom/Makefile
+++ b/x11-drivers/xf86-input-wacom/Makefile
@@ -13,12 +13,11 @@ LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd
-USES= gmake pathfix xorg xorg-cat:driver
+USES= gmake pathfix tar:bz2 xorg xorg-cat:driver
USE_XORG= x11 xext xinerama xrandr
LDFLAGS+= -Wl,--as-needed # Xext
USE_RC_SUBR= wacom
SUB_FILES= pkg-message
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" "
CONFIGURE_ARGS= --without-systemd-unit-dir \
--without-udev-rules-dir \
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index eca8f6929661..bd1f4f716b80 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:print/freetype2
-USES= cpe xorg xorg-cat:lib
+USES= cpe tar:bz2 xorg xorg-cat:lib
USE_XORG= xorgproto xtrans fontenc
INSTALL_TARGET= install-strip
CPE_PRODUCT= libxfont
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
index 10ad1dc8e8ce..6f39160f95a0 100644
--- a/x11/scripts/Makefile
+++ b/x11/scripts/Makefile
@@ -9,12 +9,9 @@ WWW= https://cgit.freedesktop.org/xorg/app/scripts
RUN_DEPENDS= ksh:shells/pdksh
-USES= shebangfix xorg xorg-cat:app
+USES= shebangfix tar:bz2 xorg xorg-cat:app
USE_XORG= x11
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-
post-patch:
@${REINPLACE_CMD} -e 's|XCOMM!/bin/ksh|XCOMM!${ksh_CMD}|' ${WRKSRC}/xauth_switch_to_sun-des-1.cpp
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 6e232b2d3703..d28dd53796ab 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,7 +1,6 @@
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
@@ -10,10 +9,8 @@ WWW= https://xcb.freedesktop.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-GNU_CONFIGURE= yes
-USES= gnome python tar:xz
+USES= gnome python xorg-cat:proto
USE_GNOME= libxml2:build
-NO_ARCH= yes
DATADIR= ${PREFIX}/share/xcb
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index e75a3f68397f..1d73d3de6152 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753269668
-SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
-SIZE (xcb-proto-1.17.0.tar.xz) = 151748
+TIMESTAMP = 1788234495
+SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c
+SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index 3b9577807ee2..6eb4a4e6c36c 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -1,17 +1,20 @@
PORTNAME= xf86dga
-PORTVERSION= 1.0.3
-PORTREVISION= 2
+DISTVERSION= 1.0.3
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Test program for the XFree86-DGA extension
+WWW= https://gitlab.freedesktop.org/xorg/app/xf86dga
-LICENSE= MIT
+LICENSE= UNKNOWN
+LICENSE_NAME= unknown
+LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= xorg xorg-cat:app
+USES= tar:bz2 xorg xorg-cat:app
USE_XORG= x11 xxf86dga xt xaw7 xmu
PLIST_FILES= bin/dga share/man/man1/dga.1.gz
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
.include <bsd.port.mk>
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 16a625d6615e..d01130b4e316 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,7 +1,6 @@
PORTNAME= xorgproto
DISTVERSION= 2025.1
CATEGORIES= x11
-MASTER_SITES= XORG/individual/proto
MAINTAINER= x11@FreeBSD.org
COMMENT= X Window System unified protocol definitions
@@ -9,11 +8,8 @@ WWW= https://gitlab.freedesktop.org/xorg/proto/xorgproto
LICENSE= MIT
-USES= pkgconfig tar:xz
+USES= xorg-cat:proto
-NO_ARCH= yes
-
-GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-fop \
--without-xmlto \
--without-xsltproc \
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index 2db302afb2f9..16ed257a85df 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1766302438
-SHA256 (xorgproto-2025.1.tar.xz) = 56898c716c0578df8a2d828c9c3e5c528277705c0484381a81960fe1a67668e8
-SIZE (xorgproto-2025.1.tar.xz) = 766932
+TIMESTAMP = 1788234326
+SHA256 (xorg/proto/xorgproto-2025.1.tar.xz) = 56898c716c0578df8a2d828c9c3e5c528277705c0484381a81960fe1a67668e8
+SIZE (xorg/proto/xorgproto-2025.1.tar.xz) = 766932