From d5f131c7fdd331ce16a0aca14a551695f1bd3330 Mon Sep 17 00:00:00 2001
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Wed, 24 Mar 2004 18:28:26 +0000
Subject: Declare CONFLICTS between freedesktop.org X extension/library ports
 and XFree86-libraries.

---
 x11/libXres/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'x11/libXres')

diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index d1de784a1db1..1ee80faf1680 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -22,6 +22,8 @@ BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/resourceext.pc:${PORTSDIR}/x11/resou
 		${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
+CONFLICTS=	XFree86-libraries-*
+
 USE_BZIP2=	yes
 PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
-- 
cgit v1.2.3