git: a71eaeb3e54e - main - x11-servers/xwayland-devel: remove until enough upstream changes accumulate

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a71eaeb3e54e1acd3dc42fd601b49ff3bd689453

commit a71eaeb3e54e1acd3dc42fd601b49ff3bd689453
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-07-13 00:58:12 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-07-13 01:00:07 +0000

    x11-servers/xwayland-devel: remove until enough upstream changes accumulate
---
 MOVED                                |  1 +
 x11-servers/Makefile                 |  1 -
 x11-servers/xwayland-devel/Makefile  | 73 ------------------------------------
 x11-servers/xwayland-devel/distinfo  |  3 --
 x11-servers/xwayland-devel/pkg-descr |  8 ----
 5 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/MOVED b/MOVED
index 0200e5d5e23e..dbb781286353 100644
--- a/MOVED
+++ b/MOVED
@@ -3383,3 +3383,4 @@ devel/py-xcaplib|devel/py-python-xcaplib|2024-07-06|Move devel/py-xcaplib to dev
 devel/py-yaml|devel/py-pyyaml|2024-07-07|Move devel/py-yaml to devel/py-pyyaml
 devel/py-pyyaml5|devel/py-pyyaml|2024-07-07|Remove obsoleted port. Use devel/py-pyyaml instead
 x11-toolkits/wlroots-devel|x11-toolkits/wlroots|2024-07-12|Out of date: use x11-toolkits/wlroots for now
+x11-servers/xwayland-devel|x11-servers/xwayland|2024-07-12|Out of date: use x11-servers/xwayland for now
diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index a0ff71ccc5d7..996f9657edd6 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -6,6 +6,5 @@
     SUBDIR += xarcan
     SUBDIR += xorg-server
     SUBDIR += xwayland
-    SUBDIR += xwayland-devel
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
deleted file mode 100644
index a156e9f24f88..000000000000
--- a/x11-servers/xwayland-devel/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-PORTNAME=	xwayland
-DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	21.0.99.1-1134
-DISTVERSIONSUFFIX=	-g720362617
-CATEGORIES=	x11-servers
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	X11 server as Wayland client (development snapshot)
-WWW=		https://wayland.freedesktop.org/xserver.html
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
-		wayland-protocols>=1.30:graphics/wayland-protocols
-LIB_DEPENDS=	libdrm.so:graphics/libdrm \
-		libepoxy.so:graphics/libepoxy \
-		libwayland-client.so:graphics/wayland \
-		libxcvt.so:x11/libxcvt
-RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
-		xkeyboard-config>0:x11/xkeyboard-config
-
-CONFLICTS_INSTALL=	${PORTNAME}
-
-USES=		compiler:c11 gl meson pkgconfig xorg
-USE_GITLAB=	yes
-USE_GL=		gbm gl
-USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
-GL_SITE=	https://gitlab.freedesktop.org
-GL_ACCOUNT=	xorg
-GL_PROJECT=	xserver
-MESON_ARGS=	-D${PORTNAME}=true \
-		-Dxorg=false \
-		-Dxnest=false \
-		-Dxvfb=false \
-		-Dudev=false \
-		-Dudev_kms=false \
-		-Dxcsecurity=true \
-		-Dxkb_output_dir=/var/lib/xkb \
-		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
-PLIST_FILES=	bin/Xwayland \
-		"@comment lib/xorg/protocol.txt" \
-		share/applications/org.freedesktop.Xwayland.desktop \
-		"@comment share/man/man1/Xserver.1.gz" \
-		share/man/man1/Xwayland.1.gz \
-		share/pkgconfig/xwayland.pc
-
-# Keep in sync with xorg-server
-FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
-FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
-DEFAULT_FONTPATH_LIST= \
-	${FONTPATH_ROOT}/misc/	\
-	${FONTPATH_ROOT}/TTF/ \
-	${FONTPATH_ROOT}/OTF/ \
-	${FONTPATH_ROOT}/Type1/ \
-	${FONTPATH_ROOT}/100dpi/ \
-	${FONTPATH_ROOT}/75dpi/ \
-	catalogue:${FONTPATHD}
-
-OPTIONS_DEFINE=	CSD EI
-OPTIONS_DEFAULT=CSD EI
-
-CSD_DESC=		Client-side decorations via libdecor
-CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
-CSD_MESON_TRUE=		libdecor
-
-EI_DESC=		Emulated input via libei
-EI_LIB_DEPENDS=		libei.so:x11/libei
-EI_MESON_OFF=		-Dxwayland_ei=false
-
-.include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
deleted file mode 100644
index e283022d076c..000000000000
--- a/x11-servers/xwayland-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1720516872
-SHA256 (xserver-xorg-server-21.0.99.1-1134-g720362617.tar.bz2) = 039efde084c0e90dc78d22f9f0149ab504987370513fe0bbaafb269bdded2000
-SIZE (xserver-xorg-server-21.0.99.1-1134-g720362617.tar.bz2) = 3709580
diff --git a/x11-servers/xwayland-devel/pkg-descr b/x11-servers/xwayland-devel/pkg-descr
deleted file mode 100644
index 82de643f878d..000000000000
--- a/x11-servers/xwayland-devel/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Wayland is a complete window system in itself, but even so, if we're
-migrating away from X, it makes sense to have a good backwards
-compatibility story. With a few changes, the Xorg server can be
-modified to use wayland input devices for input and forward either the
-root window or individual top-level windows as wayland surfaces. The
-server still runs the same 2D driver with the same acceleration code
-as it does when it runs natively. The main difference is that wayland
-handles presentation of the windows instead of KMS.