summaryrefslogtreecommitdiff
path: root/x11/libX11
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-07-26 18:32:46 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-07-26 18:32:46 +0000
commitcf80d22f0c2870eb5efba6e1e5529ec9958bd51f (patch)
tree80753c1ca698256a05918ac0ebf81cfa69560399 /x11/libX11
parent* Replace scripts/configure with OPTIONS [1] (diff)
Register missing CONFLICTS, mostly on xorg-libraries-*
Reported by: Kent Stewart <kstewart@owt.com>
Notes
Notes: svn path=/head/; revision=114790
Diffstat (limited to 'x11/libX11')
-rw-r--r--x11/libX11/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index cd34518105b8..441c8f6f5588 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xexte
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}