aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-03-05 23:52:04 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-03-05 23:52:04 +0000
commit523316d8cb37e2b8a686a0035d6ed3bde1bbcb98 (patch)
tree362ebd7437a8243613dfa3a3d2373f7914689fae
parent441322667a0458cdb81f37f3c55d8641488d40d0 (diff)
downloadports-523316d8cb37e2b8a686a0035d6ed3bde1bbcb98.tar.gz
ports-523316d8cb37e2b8a686a0035d6ed3bde1bbcb98.zip
MFH: r567435
x11-servers/xwayland-devel: make r567433 mimic autotools better Changes: https://github.com/freedesktop/xorg-xserver/compare/96f6fb99f271..69cc4cd21708
Notes
Notes: svn path=/branches/2021Q1/; revision=567436
-rw-r--r--x11-servers/xwayland-devel/Makefile4
-rw-r--r--x11-servers/xwayland-devel/distinfo4
2 files changed, 5 insertions, 3 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 4f803f0e46e2..7791648d00cb 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -8,7 +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+= 69cc4cd21708.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
@@ -44,7 +44,9 @@ MESON_ARGS= -D${PORTNAME}=true \
-Dudev_kms=false \
-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
PLIST_FILES= bin/Xwayland \
+ "@comment lib/xorg/protocol.txt" \
libdata/pkgconfig/xwayland.pc \
+ "@comment man/man1/Xserver.1.gz" \
man/man1/Xwayland.1.gz
# Keep in sync with xorg-server
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 86c6fded2140..c2ace22ad35b 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,8 +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 (69cc4cd21708.patch) = c57dfa7f698a32e01365f680e955108538f0530dac991b61dc23d8214f415811
+SIZE (69cc4cd21708.patch) = 7735
SHA256 (231720f8b212.patch) = ed3db053b86e5c7492cefb9dbb3dd373609f9318a5b848382aac59da322188f0
SIZE (231720f8b212.patch) = 10714
SHA256 (48a7bfeb4687.patch) = ae284622227b317085360f61553bae7fc21a57f4d2b6d4133a6ead0c93b47cee