aboutsummaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries
diff options
context:
space:
mode:
Diffstat (limited to 'x11/XFree86-4-libraries')
-rw-r--r--x11/XFree86-4-libraries/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index fdafd0b2f9ec..b42af914fd8c 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -27,12 +27,12 @@ COMMENT= XFree86-4 libraries and headers
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-CONFLICTS= libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \
- libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
+CONFLICTS= Mesa-* libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* \
+ libXaw-* libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \
libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \
panoramixext-* printext-* randrext-* renderext-* resourceext-* \
- xextensions-* xf86ext-* xlibs-* xorg-libraries-* xproto-*
+ xextensions-* xf86ext-* xlibs-* xorg-libraries-* xpm-* xproto-*
USE_X_PREFIX= no
PREFIX?= ${X11BASE}