From owner-freebsd-x11@FreeBSD.ORG Wed Mar 24 08:06:40 2004 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A2B316A4CE for ; Wed, 24 Mar 2004 08:06:40 -0800 (PST) Received: from meitner.wh.uni-dortmund.de (meitner.wh.uni-dortmund.de [129.217.129.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DBFE43D2F for ; Wed, 24 Mar 2004 08:06:39 -0800 (PST) (envelope-from michaelnottebrock@gmx.net) Received: from lofi.dyndns.org (pc2-105.intern.meitner [10.3.12.105]) by meitner.wh.uni-dortmund.de (Postfix) with ESMTP id 318C21677B5 for ; Wed, 24 Mar 2004 17:06:38 +0100 (CET) Received: from [192.168.8.4] (kiste.my.domain [192.168.8.4]) (authenticated bits=0) by lofi.dyndns.org (8.12.10/8.12.10) with ESMTP id i2OG6bWv015393 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) for ; Wed, 24 Mar 2004 17:06:37 +0100 (CET) (envelope-from michaelnottebrock@gmx.net) From: Michael Nottebrock To: x11@freebsd.org Date: Wed, 24 Mar 2004 17:06:33 +0100 User-Agent: KMail/1.6.1 MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Boundary-03=_NIbYAEKMPNtpzOc"; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200403241706.37153.michaelnottebrock@gmx.net> X-Virus-Scanned: by amavisd-new Subject: Conflicts patch for XFree86-4-libraries / standalone X extension ports X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2004 16:06:40 -0000 --Boundary-03=_NIbYAEKMPNtpzOc Content-Type: multipart/mixed; boundary="Boundary-01=_JIbYAW8UmhXC5YF" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_JIbYAW8UmhXC5YF Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline The attached patch properly marks XFree86-4-libraries and a number of=20 standalone ports of X extensions released by freedesktop.org as conflicting= =2E=20 Ok to commit? =2D-=20 ,_, | Michael Nottebrock | lofi@freebsd.org (/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org \u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org --Boundary-01=_JIbYAW8UmhXC5YF Content-Type: text/plain; charset="us-ascii"; name="x-conflicts.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="x-conflicts.diff" Index: XFree86-4-libraries/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/XFree86-4-libraries/Makefile,v retrieving revision 1.134 diff -u -r1.134 Makefile =2D-- 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=3D freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig =20 +CONFLICTS=3D libICE-* libSM-* libX11-* libXau-* libXcursor-* libXdmcp-* \ + libXext-* libXfont-* libXi-* libXpm-* libXrandr-* \ + libXrender-* libXres-* libXv-* randrext-* renderext-* \ + resourceext-* xextensions-* xproto-* + USE_X_PREFIX=3D no PREFIX?=3D ${X11BASE} MTREE_FILE=3D /etc/mtree/BSD.x11-4.dist Index: libICE/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libICE/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libSM/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libSM/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libX11/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libX11/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXau/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXau/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- libXau/Makefile 14 Mar 2004 06:17:37 -0000 1.4 +++ libXau/Makefile 24 Mar 2004 16:04:45 -0000 @@ -16,6 +16,8 @@ =20 BUILD_DEPENDS=3D ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xp= roto =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXcursor/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXcursor/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXdmcp/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXdmcp/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- libXdmcp/Makefile 4 Feb 2004 05:09:44 -0000 1.3 +++ libXdmcp/Makefile 24 Mar 2004 16:04:45 -0000 @@ -20,6 +20,8 @@ =20 BUILD_DEPENDS=3D ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xp= roto =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXext/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXfont/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXfont/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- 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=3D freetype.9:${PORTSDIR}/print/freetype2 =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXi/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXi/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXpm/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXpm/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXrandr/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXrandr/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXrender/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXrender/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXres/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXres/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: libXv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/libXv/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile =2D-- 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=3D ${LIB_PC_DEPENDS} =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: randrext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/randrext/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile =2D-- 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=3D x11@FreeBSD.org COMMENT=3D Header files and documentation for the X Resize and Rotate exte= nsion =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: renderext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/renderext/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile =2D-- 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=3D x11@FreeBSD.org COMMENT=3D Header files and documentation for the X render extension =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: resourceext/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/resourceext/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- 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=3D x11@FreeBSD.org COMMENT=3D X Resource usage extension headers =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: xextensions/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/xextensions/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile =2D-- 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=3D x11@FreeBSD.org COMMENT=3D X11 extension headers =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes Index: xproto/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/x11/xproto/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- 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=3D x11@FreeBSD.org COMMENT=3D X11 protocol headers =20 +CONFLICTS=3D XFree86-libraries-* + USE_BZIP2=3D yes PREFIX?=3D ${X11BASE} GNU_CONFIGURE=3D yes --Boundary-01=_JIbYAW8UmhXC5YF-- --Boundary-03=_NIbYAEKMPNtpzOc Content-Type: application/pgp-signature Content-Description: signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBAYbINXhc68WspdLARAg03AKCUJsVAzRHcPE2+CcjO7Y7qc/zrqgCgk58b mF7fSxKSZwqWyD6bo6pU76Q= =MDRp -----END PGP SIGNATURE----- --Boundary-03=_NIbYAEKMPNtpzOc--