aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2004-03-28 20:46:25 +0800
committerlofi <lofi@FreeBSD.org>2004-03-28 20:46:25 +0800
commitc40cd31cc056cff4c8aa8765e59cca256a4b3236 (patch)
tree965ba02489e4aff1ee9531129382549e36c18a5b
parentf63d3fe98675e7f66fa4dd358ad8bc9aec83a273 (diff)
downloadfreebsd-ports-gnome-c40cd31cc056cff4c8aa8765e59cca256a4b3236.tar.gz
freebsd-ports-gnome-c40cd31cc056cff4c8aa8765e59cca256a4b3236.tar.zst
freebsd-ports-gnome-c40cd31cc056cff4c8aa8765e59cca256a4b3236.zip
Declare CONFLICTS between libXt and XFree86-4-libraries
-rw-r--r--x11-toolkits/libXt/Makefile2
-rw-r--r--x11/XFree86-4-libraries/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 6a9d6811219d..e357767bcc05 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -20,6 +20,8 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 784075b1f37e..8d445654fe81 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
CONFLICTS= libICE-* libSM-* libX11-* libXau-* libXcursor-* libXdmcp-* \
libXext-* libXfont-* libXi-* libXpm-* libXrandr-* \
- libXrender-* libXres-* libXv-* randrext-* renderext-* \
+ libXrender-* libXres-* libXt-* libXv-* randrext-* renderext-* \
resourceext-* xextensions-* xproto-*
USE_X_PREFIX= no