svn commit: r567433 - head/x11-servers/xwayland-devel

[Jan Beich]

Author: jbeich
Date: Fri Mar  5 23:29:56 2021
New Revision: 567433
URL: https://svnweb.freebsd.org/changeset/ports/567433

Log:
  x11-servers/xwayland-devel: simplify install

Modified:
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)
  head/x11-servers/xwayland-devel/distinfo   (contents, props changed)

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Fri Mar  5 23:19:56 2021	(r567432)
+++ head/x11-servers/xwayland-devel/Makefile	Fri Mar  5 23:29:56 2021	(r567433)
@@ -8,6 +8,7 @@ CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	96f6fb99f271.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/630
 PATCHFILES+=	231720f8b212.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	48a7bfeb4687.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	2b3c4983f937.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
@@ -63,14 +64,5 @@ OPTIONS_DEFINE=	NVIDIA
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
-
-do-install:
-# XXX Prevent Meson from installing unrelated files
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${INSTALL_MAN} ${BUILD_WRKSRC}/hw/xwayland/Xwayland.1 \
-		${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/x11-servers/xwayland-devel/distinfo
==============================================================================
--- head/x11-servers/xwayland-devel/distinfo	Fri Mar  5 23:19:56 2021	(r567432)
+++ head/x11-servers/xwayland-devel/distinfo	Fri Mar  5 23:29:56 2021	(r567433)
@@ -1,6 +1,8 @@
 TIMESTAMP = 1614939114
 SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-870-g69e087caa_GH0.tar.gz) = 8f2c363f17a7aab329b17ba5720b00ea96bc7995aa49218c1df726cd37d07201
 SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-870-g69e087caa_GH0.tar.gz) = 5847088
+SHA256 (96f6fb99f271.patch) = a418c25143e6445fb3afb20f8149d23860b4f94a7db1c67dd6db2210402857ef
+SIZE (96f6fb99f271.patch) = 8707
 SHA256 (231720f8b212.patch) = ed3db053b86e5c7492cefb9dbb3dd373609f9318a5b848382aac59da322188f0
 SIZE (231720f8b212.patch) = 10714
 SHA256 (48a7bfeb4687.patch) = ae284622227b317085360f61553bae7fc21a57f4d2b6d4133a6ead0c93b47cee