diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-05-10 05:42:34 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-05-10 05:42:34 +0000 |
| commit | 02a1e62287842be79a2bb7ea485263639edf1353 (patch) | |
| tree | 420083283264a9bc978f2dcd2c190730fee95db6 /x11/XFree86-4-libraries/Makefile | |
| parent | Register CONFLICTS on xorg-server. (diff) | |
Register CONFLICTS for new xlibs ports.
Notes
Notes:
svn path=/head/; revision=108804
Diffstat (limited to 'x11/XFree86-4-libraries/Makefile')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 54970f04f380..e15ba4a24769 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -28,10 +28,12 @@ COMMENT= XFree86-4 libraries and headers LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CONFLICTS= libICE-* libSM-* libX11-* libXau-* libXcursor-* libXdmcp-* \ - libXext-* libXfont-* libXi-* libXpm-* libXrandr-* \ - libXrender-* libXres-* libXt-* libXv-* randrext-* renderext-* \ - resourceext-* xextensions-* xproto-* +CONFLICTS= 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-* USE_X_PREFIX= no PREFIX?= ${X11BASE} |