[pkgsrc/trunk]: pkgsrc/x11 g/c invalid CONFLICTS lines between modular-xorg-s...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc584418e528
branches:  trunk
changeset: 381965:dc584418e528
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jul 17 01:39:07 2022 +0000

description:
g/c invalid CONFLICTS lines between modular-xorg-server and libxcvt

diffstat:

 x11/libxcvt/Makefile             |  5 ++---
 x11/modular-xorg-server/Makefile |  4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 0b0da9c9e200 -r dc584418e528 x11/libxcvt/Makefile
--- a/x11/libxcvt/Makefile      Sun Jul 17 01:25:50 2022 +0000
+++ b/x11/libxcvt/Makefile      Sun Jul 17 01:39:07 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2021/10/28 09:56:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/17 01:39:07 tnn Exp $
 
 DISTNAME=              libxcvt-0.1.1
+PKGREVISION=           1
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.xz
@@ -10,8 +11,6 @@
 COMMENT=               VESA CVT standard timing modelines generator
 LICENSE=               mit
 
-CONFLICTS+=            modular-xorg-server-[0-9]*
-
 PKGCONFIG_OVERRIDE+=           output/meson-private/libxcvt.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
diff -r 0b0da9c9e200 -r dc584418e528 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Sun Jul 17 01:25:50 2022 +0000
+++ b/x11/modular-xorg-server/Makefile  Sun Jul 17 01:39:07 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2022/04/10 08:53:17 nia Exp $
+# $NetBSD: Makefile,v 1.133 2022/07/17 01:39:07 tnn Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
@@ -10,8 +10,6 @@
 
 NOT_FOR_PLATFORM=      Darwin-*-*
 
-CONFLICTS+=            libxcvt-[0-9]*
-
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --enable-xorg