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/xorg-libraries | |
| parent | e1a6778d62af45b2344eb0443dbd24344326c2d5 (diff) | |
| download | ports-fa45acf58dd2001e26c01622701c11313bf1ae91.tar.gz ports-fa45acf58dd2001e26c01622701c11313bf1ae91.zip | |
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/xorg-libraries')
| -rw-r--r-- | x11/xorg-libraries/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 19089ea15d82..11284afbccb0 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -27,13 +27,13 @@ COMMENT= X11 libraries and headers from X.Org LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CONFLICTS= XFree86-libraries-* \ +CONFLICTS= Mesa-* XFree86-libraries-* \ 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-* xproto-* + xextensions-* xf86ext-* xlibs-* xpm-* xproto-* EXTRA_PATCHES= ${CF_PATCHES} |