aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/libGL/Makefile2
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXdmcp/Makefile2
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXfont/Makefile2
-rw-r--r--x11/libXi/Makefile2
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXp/Makefile2
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXrandr/Makefile2
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile2
-rw-r--r--x11/libXv/Makefile2
-rw-r--r--x11/libXxf86/Makefile2
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/panoramixext/Makefile2
-rw-r--r--x11/printext/Makefile2
-rw-r--r--x11/randrext/Makefile2
-rw-r--r--x11/renderext/Makefile2
-rw-r--r--x11/resourceext/Makefile2
-rw-r--r--x11/xextensions/Makefile2
-rw-r--r--x11/xf86ext/Makefile2
-rw-r--r--x11/xproto/Makefile2
27 files changed, 27 insertions, 27 deletions
diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile
index b0fa28c7381e..2cdea87d155a 100644
--- a/x11/libGL/Makefile
+++ b/x11/libGL/Makefile
@@ -18,7 +18,7 @@ COMMENT= OpenGL library that renders using GLX or DRI
LIB_DEPENDS= Xxf86vm.1:${PORTSDIR}/x11/libXxf86
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
EXTRA_PATCHES= ${CF_PATCHES}
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 3b641ce3bc18..49388ed84ee4 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 0ce5222007a4..79a756690053 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index cd34518105b8..441c8f6f5588 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xexte
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index f77afa80c431..dd0d31ef1d83 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -16,7 +16,7 @@ COMMENT= Authentication Protocol library for X11
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 71d60757de53..d67e10e27563 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index cd0860fa37a2..10bfcf8b55f0 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -22,7 +22,7 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 001047a60313..6880a743a6ce 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -18,7 +18,7 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xext
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile
index 1deaf0bbe6ee..cf8c153baa2a 100644
--- a/x11/libXfont/Makefile
+++ b/x11/libXfont/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig \
${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index f964f3d97533..5314485cb1fb 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index e432df6ebd1f..5101e7fd04e4 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -18,7 +18,7 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index cebc3c740d77..28bb0bc09b5a 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -19,7 +19,7 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_IMAKE= YES
USE_X_PREFIX= no
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index f6c5a8e3b00e..780c594c0391 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index cfdee6702ee7..d52cfd2bb535 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randr.pc:${PORTSDIR}/x11/randrext \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index b0014447d5fe..d95b03b47564 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index c089539b5d8c..5d8780d6a751 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/resourceext.pc:${PORTSDIR}/x11/resou
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 5e635edb316d..1d7f6133e33e 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -17,7 +17,7 @@ LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/libXxf86/Makefile b/x11/libXxf86/Makefile
index 58699752656e..899b7dc6c856 100644
--- a/x11/libXxf86/Makefile
+++ b/x11/libXxf86/Makefile
@@ -19,7 +19,7 @@ LIB_PC_DEPENDS= ${X11BASE}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86
BUILD_DEPENDS= ${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_IMAKE= YES
USE_X_PREFIX= no
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 80843c0158b8..399db009efb4 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xexte
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_IMAKE= yes
USE_X_PREFIX= no
diff --git a/x11/panoramixext/Makefile b/x11/panoramixext/Makefile
index 5534112cacbc..b266d27b3d99 100644
--- a/x11/panoramixext/Makefile
+++ b/x11/panoramixext/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Header files and documentation for the X PanoramiX extension
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/printext/Makefile b/x11/printext/Makefile
index bdedc5070322..0e346c9118ab 100644
--- a/x11/printext/Makefile
+++ b/x11/printext/Makefile
@@ -14,7 +14,7 @@ DISTNAME= X11R6.7.0-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= Header files for the X Print Extension
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
PREFIX?= ${X11BASE}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index 9f34030674da..a3628ae4d4e7 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Header files and documentation for the X Resize and Rotate extension
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile
index f96032844a95..fb32678966a1 100644
--- a/x11/renderext/Makefile
+++ b/x11/renderext/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Header files and documentation for the X render extension
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile
index 1681ecee2412..26a3bf1eb1aa 100644
--- a/x11/resourceext/Makefile
+++ b/x11/resourceext/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Resource usage extension headers
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile
index f04b8fa01183..97c217dd4a05 100644
--- a/x11/xextensions/Makefile
+++ b/x11/xextensions/Makefile
@@ -16,7 +16,7 @@ COMMENT= X11 extension headers
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
diff --git a/x11/xf86ext/Makefile b/x11/xf86ext/Makefile
index 48ba3930a9f5..8e31a63bd841 100644
--- a/x11/xf86ext/Makefile
+++ b/x11/xf86ext/Makefile
@@ -16,7 +16,7 @@ COMMENT= Header files for miscellaneous XFree86 X Extensions
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
PREFIX?= ${X11BASE}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index e0b6750460c0..830af89f5f24 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 protocol headers
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:14:17 +0000