From owner-freebsd-x11@FreeBSD.ORG Mon Aug 16 16:50:24 2004 Return-Path: Delivered-To: freebsd-x11@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C737D16A4CE for ; Mon, 16 Aug 2004 16:50:24 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A652143D5C for ; Mon, 16 Aug 2004 16:50:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GGoOcD032449 for ; Mon, 16 Aug 2004 16:50:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7GGoOIK032448; Mon, 16 Aug 2004 16:50:24 GMT (envelope-from gnats) Date: Mon, 16 Aug 2004 16:50:24 GMT Message-Id: <200408161650.i7GGoOIK032448@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org From: Dejan Lesjak Subject: Re: ports/70004: Unable to compile wmweather+ because of xpm X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dejan Lesjak List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2004 16:50:24 -0000 The following reply was made to PR ports/70004; it has been noted by GNATS. From: Dejan Lesjak To: freebsd-gnats-submit@freebsd.org, david.julien@gmail.com Cc: Subject: Re: ports/70004: Unable to compile wmweather+ because of xpm Date: Mon, 16 Aug 2004 18:43:21 +0200 --Boundary-00=_pQOIBFActUt57bV Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline I agree. Furthermore I think conflicts should also be added to graphics/mesagl port. Here are some patches. --Boundary-00=_pQOIBFActUt57bV Content-Type: text/x-diff; charset="us-ascii"; name="mesagl.conflicts.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mesagl.conflicts.patch" Index: Makefile =================================================================== RCS file: /usr/local/freebsd-cvs/ports/graphics/mesagl/Makefile,v retrieving revision 1.64 diff -u -r1.64 Makefile --- Makefile 23 Jul 2004 19:10:10 -0000 1.64 +++ Makefile 16 Aug 2004 16:23:57 -0000 @@ -18,6 +18,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A graphics library similar to SGI's OpenGL +CONFLICTS= XFree86-libraries-[0-9]* xorg-libraries-[0-9]* + USE_BZIP2= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes --Boundary-00=_pQOIBFActUt57bV Content-Type: text/x-diff; charset="us-ascii"; name="xpm.conflicts.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xpm.conflicts.patch" Index: Makefile =================================================================== RCS file: /usr/local/freebsd-cvs/ports/graphics/xpm/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- Makefile 23 Jul 2004 19:10:11 -0000 1.39 +++ Makefile 16 Aug 2004 16:29:59 -0000 @@ -14,6 +14,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The X Pixmap library +CONFLICTS= XFree86-libraries-[0-9]* xorg-libraries-[0-9]* + USE_IMAKE= yes INSTALLS_SHLIB= yes --Boundary-00=_pQOIBFActUt57bV Content-Type: text/x-diff; charset="us-ascii"; name="XFree86-4-libraries.conflicts.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="XFree86-4-libraries.conflicts.patch" Index: Makefile =================================================================== RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-libraries/Makefile,v retrieving revision 1.141 diff -u -r1.141 Makefile --- Makefile 10 Aug 2004 01:29:16 -0000 1.141 +++ Makefile 16 Aug 2004 15:17:59 -0000 @@ -27,12 +27,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CONFLICTS= libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \ - libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \ +CONFLICTS= Mesa-* 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-* xorg-libraries-* xproto-* + xextensions-* xf86ext-* xlibs-* xorg-libraries-* xpm-* xproto-* USE_X_PREFIX= no PREFIX?= ${X11BASE} --Boundary-00=_pQOIBFActUt57bV Content-Type: text/x-diff; charset="us-ascii"; name="xorg-libraries.conflicts.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xorg-libraries.conflicts.patch" Index: Makefile =================================================================== RCS file: /usr/local/freebsd-cvs/ports/x11/xorg-libraries/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 4 Aug 2004 09:02:45 -0000 1.7 +++ Makefile 16 Aug 2004 15:18:54 -0000 @@ -27,13 +27,13 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CONFLICTS= XFree86-libraries-* \ +CONFLICTS= Mesa-* XFree86-libraries-* \ 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-* + xextensions-* xf86ext-* xlibs-* xpm-* xproto-* EXTRA_PATCHES= ${CF_PATCHES} --Boundary-00=_pQOIBFActUt57bV--