Conflicts patch for XFree86-4-libraries / standalone X extension
ports
Michael Nottebrock
michaelnottebrock at gmx.net
Wed Mar 24 08:06:40 PST 2004
The attached patch properly marks XFree86-4-libraries and a number of
standalone ports of X extensions released by freedesktop.org as conflicting.
Ok to commit?
--
,_, | Michael Nottebrock | lofi at freebsd.org
(/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org
\u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org
-------------- next part --------------
Index: XFree86-4-libraries/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/XFree86-4-libraries/Makefile,v
retrieving revision 1.134
diff -u -r1.134 Makefile
--- XFree86-4-libraries/Makefile 6 Feb 2004 04:41:48 -0000 1.134
+++ XFree86-4-libraries/Makefile 24 Mar 2004 16:04:45 -0000
@@ -28,6 +28,11 @@
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-* libXv-* randrext-* renderext-* \
+ resourceext-* xextensions-* xproto-*
+
USE_X_PREFIX= no
PREFIX?= ${X11BASE}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
Index: libICE/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libICE/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libICE/Makefile 14 Mar 2004 06:17:36 -0000 1.3
+++ libICE/Makefile 24 Mar 2004 16:04:45 -0000
@@ -21,6 +21,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libSM/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libSM/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- libSM/Makefile 14 Mar 2004 06:17:36 -0000 1.5
+++ libSM/Makefile 24 Mar 2004 16:04:45 -0000
@@ -21,6 +21,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libX11/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libX11/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libX11/Makefile 4 Feb 2004 05:09:44 -0000 1.4
+++ libX11/Makefile 24 Mar 2004 16:04:45 -0000
@@ -21,6 +21,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXau/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXau/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libXau/Makefile 14 Mar 2004 06:17:37 -0000 1.4
+++ libXau/Makefile 24 Mar 2004 16:04:45 -0000
@@ -16,6 +16,8 @@
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXcursor/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXcursor/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- libXcursor/Makefile 22 Mar 2004 18:49:47 -0000 1.9
+++ libXcursor/Makefile 24 Mar 2004 16:04:45 -0000
@@ -22,6 +22,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXdmcp/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXdmcp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libXdmcp/Makefile 4 Feb 2004 05:09:44 -0000 1.3
+++ libXdmcp/Makefile 24 Mar 2004 16:04:45 -0000
@@ -20,6 +20,8 @@
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXext/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXext/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libXext/Makefile 14 Mar 2004 06:17:37 -0000 1.4
+++ libXext/Makefile 24 Mar 2004 16:04:45 -0000
@@ -20,6 +20,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXfont/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXfont/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libXfont/Makefile 4 Feb 2004 05:09:45 -0000 1.3
+++ libXfont/Makefile 24 Mar 2004 16:04:45 -0000
@@ -18,6 +18,8 @@
${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXi/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXi/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- libXi/Makefile 14 Mar 2004 06:17:37 -0000 1.6
+++ libXi/Makefile 24 Mar 2004 16:04:45 -0000
@@ -20,6 +20,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXpm/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXpm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libXpm/Makefile 14 Mar 2004 06:17:37 -0000 1.3
+++ libXpm/Makefile 24 Mar 2004 16:04:45 -0000
@@ -19,6 +19,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXrandr/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXrandr/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libXrandr/Makefile 11 Mar 2004 18:21:29 -0000 1.4
+++ libXrandr/Makefile 24 Mar 2004 16:04:45 -0000
@@ -22,6 +22,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXrender/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXrender/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libXrender/Makefile 14 Mar 2004 06:17:38 -0000 1.11
+++ libXrender/Makefile 24 Mar 2004 16:04:45 -0000
@@ -21,6 +21,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXres/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXres/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- libXres/Makefile 14 Mar 2004 06:17:38 -0000 1.9
+++ libXres/Makefile 24 Mar 2004 16:04:45 -0000
@@ -22,6 +22,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: libXv/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/libXv/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- libXv/Makefile 14 Mar 2004 06:17:38 -0000 1.8
+++ libXv/Makefile 24 Mar 2004 16:04:45 -0000
@@ -20,6 +20,8 @@
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: randrext/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/randrext/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- randrext/Makefile 4 Feb 2004 05:09:49 -0000 1.2
+++ randrext/Makefile 24 Mar 2004 16:04:46 -0000
@@ -14,6 +14,8 @@
MAINTAINER= x11 at FreeBSD.org
COMMENT= Header files and documentation for the X Resize and Rotate extension
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: renderext/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/renderext/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- renderext/Makefile 4 Feb 2004 05:09:49 -0000 1.7
+++ renderext/Makefile 24 Mar 2004 16:04:46 -0000
@@ -14,6 +14,8 @@
MAINTAINER= x11 at FreeBSD.org
COMMENT= Header files and documentation for the X render extension
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: resourceext/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/resourceext/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- resourceext/Makefile 4 Feb 2004 05:09:49 -0000 1.3
+++ resourceext/Makefile 24 Mar 2004 16:04:46 -0000
@@ -14,6 +14,8 @@
MAINTAINER= x11 at FreeBSD.org
COMMENT= X Resource usage extension headers
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: xextensions/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xextensions/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- xextensions/Makefile 4 Feb 2004 05:09:52 -0000 1.3
+++ xextensions/Makefile 24 Mar 2004 16:04:46 -0000
@@ -14,6 +14,8 @@
MAINTAINER= x11 at FreeBSD.org
COMMENT= X11 extension headers
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
Index: xproto/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xproto/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- xproto/Makefile 14 Mar 2004 07:21:14 -0000 1.4
+++ xproto/Makefile 24 Mar 2004 16:04:46 -0000
@@ -14,6 +14,8 @@
MAINTAINER= x11 at FreeBSD.org
COMMENT= X11 protocol headers
+CONFLICTS= XFree86-libraries-*
+
USE_BZIP2= yes
PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: signature
Url : http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20040324/4ecb10b8/attachment.bin
More information about the freebsd-x11
mailing list