From b4596a0c0e6b8361bddf29a620d45c709e2b5abf Mon Sep 17 00:00:00 2001 From: Florent Thoumie Date: Sun, 20 May 2007 03:03:40 +0000 Subject: Don't conflict with nvidia-driver. Reported by: David Thiel Approved by: portmgr (implicit) --- graphics/libGL/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics/libGL') diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 1a094bbc9680..5ef80b220e53 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -7,7 +7,7 @@ PORTNAME?= libGL PORTVERSION?= 6.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ @@ -20,7 +20,7 @@ COMMENT?= OpenGL library that renders using GLX or DRI BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm -CONFLICTS= XFree86-libraries-* xorg-libraries-6.* nvidia-driver-* +CONFLICTS= XFree86-libraries-* xorg-libraries-6.* USE_XORG= glproto xxf86vm xext xfixes xdamage USE_GMAKE= yes -- cgit v1.3