[pkgsrc/trunk]: pkgsrc/x11 Note mutual conflicts between xf86-video-{i810,int...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5ff92f77c97
branches:  trunk
changeset: 531845:d5ff92f77c97
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 07 16:20:25 2007 +0000

description:
Note mutual conflicts between xf86-video-{i810,intel}.

diffstat:

 x11/xf86-video-i810/Makefile  |  4 +++-
 x11/xf86-video-intel/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 796d0bd5a59c -r d5ff92f77c97 x11/xf86-video-i810/Makefile
--- a/x11/xf86-video-i810/Makefile      Tue Aug 07 12:40:37 2007 +0000
+++ b/x11/xf86-video-i810/Makefile      Tue Aug 07 16:20:25 2007 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2007/02/26 18:14:06 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/07 16:20:25 jlam Exp $
 
 DISTNAME=      xf86-video-i810-1.7.4
 CATEGORIES=    x11
 MASTER_SITES=  http://xorg.freedesktop.org/releases/individual/driver/
 EXTRACT_SUFX=  .tar.bz2
 
+CONFLICTS+=    xf86-video-intel-[0-9]*
+
 MAINTAINER=    joerg%NetBSD.org@localhost
 COMMENT=       Modular Xorg Intel video driver
 
diff -r 796d0bd5a59c -r d5ff92f77c97 x11/xf86-video-intel/Makefile
--- a/x11/xf86-video-intel/Makefile     Tue Aug 07 12:40:37 2007 +0000
+++ b/x11/xf86-video-intel/Makefile     Tue Aug 07 16:20:25 2007 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/13 17:50:11 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/07 16:20:26 jlam Exp $
 
 DISTNAME=      xf86-video-intel-2.1.0
 CATEGORIES=    x11
 MASTER_SITES=  http://xorg.freedesktop.org/releases/individual/driver/
 EXTRACT_SUFX=  .tar.bz2
 
+CONFLICTS+=    xf86-video-i810-[0-9]*
+
 MAINTAINER=    joerg%NetBSD.org@localhost
 HOMEPAGE=      http://xorg.freedesktop.org/
 COMMENT=       Modular Xorg Intel video driver