From abd956df6353fb8871d5ccac12afda3e9f3684fa Mon Sep 17 00:00:00 2001
From: bsam <bsam@FreeBSD.org>
Date: Thu, 5 Oct 2006 18:53:43 +0000
Subject: Revert back previous commit of removing deleted ports from CONFLICTS
 variable. Give happy users just another chance to update their systems.

Pointed out by:		infofarmer, kris
---
 x11/linux-XFree86-libs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'x11/linux-XFree86-libs')

diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile
index d2fa333b8bc7..cc477b05b03b 100644
--- a/x11/linux-XFree86-libs/Makefile
+++ b/x11/linux-XFree86-libs/Makefile
@@ -25,7 +25,7 @@ COMMENT=	XFree86 libraries, Linux binary
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
 
-CONFLICTS=	linux-xorg-libs*
+CONFLICTS=	linux_base-7* linux_base-deb* linux-xorg-libs*
 USE_LINUX_PREFIX=yes
 USE_LINUX=	yes
 MD5_FILE=	${MASTERDIR}/distinfo.i386
-- 
cgit