diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2004-08-21 05:01:17 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2004-08-21 05:01:17 +0000 |
| commit | fa45acf58dd2001e26c01622701c11313bf1ae91 (patch) | |
| tree | 77953edb2ac7289af55f53576d9edf5ba2bbfe1e /x11/XFree86-4-libraries/Makefile | |
| parent | Add conflicts to XFree86- and xorg- libraries, as they already include (diff) | |
Add conflicts to Mesa and xpm ports. Libraries that they install are
already included in this port.
Noticed by: David Julien (david dot julien at gmail dot com)
PR: ports/70004
Approved by: anholt (mentor)
Notes
Notes:
svn path=/head/; revision=116870
Diffstat (limited to 'x11/XFree86-4-libraries/Makefile')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 6 |
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} |