diff options
| author | anholt <anholt@FreeBSD.org> | 2004-05-10 13:42:34 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-05-10 13:42:34 +0800 |
| commit | 86bb720ee1aa05ddfeb919c6b82a7df6cb97df9a (patch) | |
| tree | 6ef78985d16548c41a01c6cb23dd672286a0fecd /x11 | |
| parent | 1566de6bfbfb0dcea7cee8a6992270d5b3a393a4 (diff) | |
| download | freebsd-ports-gnome-86bb720ee1aa05ddfeb919c6b82a7df6cb97df9a.tar.gz freebsd-ports-gnome-86bb720ee1aa05ddfeb919c6b82a7df6cb97df9a.tar.zst freebsd-ports-gnome-86bb720ee1aa05ddfeb919c6b82a7df6cb97df9a.zip | |
Register CONFLICTS for new xlibs ports.
Diffstat (limited to 'x11')
| -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} |