From 594f94c1b64f71da8f0ea5181ad0718f7471ae68 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 13 Jul 2021 12:05:48 +0000
Subject: modular-xorg-server: note conflict with libxcvt

---
 x11/modular-xorg-server/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11')

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 77f1a7d0057..67f17941d23 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2020/08/26 10:28:39 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2021/07/13 12:05:48 wiz Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
@@ -10,6 +10,8 @@ SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
 
 NOT_FOR_PLATFORM=	Darwin-*-*
 
+CONFLICTS+=		libxcvt-[0-9]*
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-xorg
-- 
cgit v1.2.3