CVS commit: pkgsrc/x11

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jul 17 01:39:07 UTC 2022

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libxcvt/Makefile
cvs rdiff -u -r1.132 -r1.133 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/libxcvt/Makefile
diff -u pkgsrc/x11/libxcvt/Makefile:1.2 pkgsrc/x11/libxcvt/Makefile:1.3
--- pkgsrc/x11/libxcvt/Makefile:1.2     Thu Oct 28 09:56:25 2021
+++ pkgsrc/x11/libxcvt/Makefile Sun Jul 17 01:39:07 2022
@@ -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 @@ HOMEPAGE=             https://xorg.freedesktop.org/
 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
 

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.132 pkgsrc/x11/modular-xorg-server/Makefile:1.133
--- pkgsrc/x11/modular-xorg-server/Makefile:1.132       Sun Apr 10 08:53:17 2022
+++ pkgsrc/x11/modular-xorg-server/Makefile     Sun Jul 17 01:39:07 2022
@@ -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 @@ SPECIAL_PERMS+=               bin/Xorg ${SETUID_ROOT_
 
 NOT_FOR_PLATFORM=      Darwin-*-*
 
-CONFLICTS+=            libxcvt-[0-9]*
-
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --enable-xorg