From owner-cvs-all@FreeBSD.ORG Mon May 21 14:34:58 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C87A516A41F; Mon, 21 May 2007 14:34:58 +0000 (UTC) (envelope-from flz@FreeBSD.org) Received: from smtp6-g19.free.fr (smtp6-g19.free.fr [212.27.42.36]) by mx1.freebsd.org (Postfix) with ESMTP id 61D9813C4AE; Mon, 21 May 2007 14:34:58 +0000 (UTC) (envelope-from flz@FreeBSD.org) Received: from smtp.xbsd.org (unknown [82.233.2.192]) by smtp6-g19.free.fr (Postfix) with ESMTP id AFE588DFEB; Mon, 21 May 2007 16:34:57 +0200 (CEST) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by smtp.xbsd.org (Postfix) with ESMTP id 034A812DC4; Mon, 21 May 2007 16:34:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at xbsd.org Received: from smtp.xbsd.org ([127.0.0.1]) by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aVa4qrrPPBL7; Mon, 21 May 2007 16:34:48 +0200 (CEST) Received: from [193.95.134.156] (mayday.esat.net [193.95.134.156]) by smtp.xbsd.org (Postfix) with ESMTP id 07A9912DC0; Mon, 21 May 2007 16:34:47 +0200 (CEST) Message-ID: <4651AE43.9030300@FreeBSD.org> Date: Mon, 21 May 2007 15:35:47 +0100 From: Florent Thoumie User-Agent: Thunderbird 1.5.0.9 (X11/20070122) MIME-Version: 1.0 To: =?ISO-8859-15?Q?Dag-Erling_Sm=F8rgrav?= References: <200705211021.l4LALdGa025468@repoman.freebsd.org> <86k5v2tnhv.fsf@dwp.des.no> <4651884F.3080207@FreeBSD.org> <867ir2tibr.fsf@dwp.des.no> <4651A262.2070905@FreeBSD.org> <86r6pas14i.fsf@dwp.des.no> In-Reply-To: <86r6pas14i.fsf@dwp.des.no> X-Enigmail-Version: 0.94.1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig1C4A9163BFAA6D6B96C98439" Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.port.mk X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2007 14:34:58 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1C4A9163BFAA6D6B96C98439 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Dag-Erling Sm=F8rgrav wrote: > Florent Thoumie writes: >> Let's just set USE_XLIB=3Dyes if X_WINDOW_SYSTEM =3D=3D xfree86-4 and = USE_XORG >> is defined. >=20 > Yes, that would be the easiest solution. >=20 > What about USE_X_PREFIX, BTW? I assume that X.org-aware ports are not > supposed to define it? Perhaps there should be a check for that, > issuing a warning (or aborting the build) if both USE_X_PREFIX and > USE_XORG are set at the same time. This one should go as well. >> DES or I could prepare a bpm patch for this if there's an empty slot o= n >> pointyhat for a new exp-run. >=20 > Something like this? >=20 > @@ -1916,9 +1921,13 @@ > ${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}= > .endif > =20 > +.if defined(USE_XPM) > +USE_XORG+=3D xpm > +.endif > + > .if ${X_WINDOW_SYSTEM:L} =3D=3D xfree86-4 > =20 > -.if defined(USE_XPM) > +.if defined(USE_XORG) > USE_XLIB=3D yes > .endif > =20 > @@ -1927,14 +1936,6 @@ > =20 > .else > =20 > -.if defined(USE_XPM) > -LIB_DEPENDS+=3D Xpm.4:${PORTSDIR}/x11/libXpm > -# XXX - At some point we'll have to fix ports to use USE_XORG to > -# the right value and remove both USE_XPM and USE_XLIB. Hopefully > -# XFree86-4 will be gone in the meantime. > -USE_XLIB=3D yes > -.endif > - > XAWVER=3D 8 > PKG_IGNORE_DEPENDS?=3D 'this_port_does_not_exist' > =20 >=20 > Note that the file numbers won't line up, because I have other patches > in my bsd.port.mk. Seems good to me. I could as well start replacing both (USE_XLIB|USE_X_PREFIX)=3Dyes with USE_XORG=3Dyes. We'll take care of usi= ng finer dependencies later. Also, USE_IMAKE currently implies USE_XLIB, I'm not sure this is really needed but I haven't really looked into this yet. --=20 Florent Thoumie flz@FreeBSD.org FreeBSD Committer --------------enig1C4A9163BFAA6D6B96C98439 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGUa5HMxEkbVFH3PQRCgQVAJ43khgGvnFtdoM8Igpt+QHDNBqPGQCeNBvX SlF2HXBGdBXnypcmFNpRGNs= =Gfsu -----END PGP SIGNATURE----- --------------enig1C4A9163BFAA6D6B96C98439--