diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-07 16:20:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-07 16:20:25 +0000 |
| commit | 4a3e69917da7cdc5b4d34b1171b31bbd05257557 (patch) | |
| tree | ff5394f3af9d79581283aa62b66e41f63e8f66a1 /x11 | |
| parent | 382c2308c2a2a23804d7967bc74c46681d2c3fa4 (diff) | |
| download | pkgsrc-4a3e69917da7cdc5b4d34b1171b31bbd05257557.tar.gz | |
Note mutual conflicts between xf86-video-{i810,intel}.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xf86-video-i810/Makefile | 4 | ||||
| -rw-r--r-- | x11/xf86-video-intel/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/x11/xf86-video-i810/Makefile b/x11/xf86-video-i810/Makefile index e15599674ef..e85d2572020 100644 --- a/x11/xf86-video-i810/Makefile +++ b/x11/xf86-video-i810/Makefile @@ -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 COMMENT= Modular Xorg Intel video driver diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile index a4d13c60e1b..b0bce44543a 100644 --- a/x11/xf86-video-intel/Makefile +++ b/x11/xf86-video-intel/Makefile @@ -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 HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Intel video driver |