CVS commit: pkgsrc/x11/modular-xorg-server

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul 13 12:05:48 UTC 2021

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile

Log Message:
modular-xorg-server: note conflict with libxcvt


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/x11/modular-xorg-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.129 pkgsrc/x11/modular-xorg-server/Makefile:1.130
--- pkgsrc/x11/modular-xorg-server/Makefile:1.129       Wed Aug 26 10:28:39 2020
+++ pkgsrc/x11/modular-xorg-server/Makefile     Tue Jul 13 12:05:48 2021
@@ -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_
 
 NOT_FOR_PLATFORM=      Darwin-*-*
 
+CONFLICTS+=            libxcvt-[0-9]*
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --enable-xorg