Index: head/x11-drivers/xf86-video-i810/Makefile
===================================================================
--- head/x11-drivers/xf86-video-i810/Makefile	(revision 192480)
+++ head/x11-drivers/xf86-video-i810/Makefile	(revision 192481)
@@ -1,22 +1,24 @@
 # New ports collection makefile for:	xf86-video-i810
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xf86-video-i810
 PORTVERSION=	1.6.5
 PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org i810 display driver
 
+CONFLICTS=	xf86-video-intel-[0-9]*
+
 USE_GL=		gl
 
 XORG_CAT=	driver
 USE_XORG=	xvmc xf86driproto xextproto x11 xextproto glproto xineramaproto
 MAN4=		i810.4x
 
 .include <bsd.port.mk>

Property changes on: head/x11-drivers/xf86-video-i810/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property