From owner-freebsd-ports@FreeBSD.ORG Tue Jan 4 09:30:19 2005 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A35816A4CF for ; Tue, 4 Jan 2005 09:30:19 +0000 (GMT) Received: from gandalf.online.bg (gandalf.online.bg [217.75.128.9]) by mx1.FreeBSD.org (Postfix) with SMTP id 570EF43D31 for ; Tue, 4 Jan 2005 09:30:18 +0000 (GMT) (envelope-from roam@ringlet.net) Received: (qmail 26956 invoked from network); 4 Jan 2005 09:30:14 -0000 Received: from unknown (HELO straylight.ringlet.net) (213.16.36.85) by gandalf.online.bg with SMTP; 4 Jan 2005 09:30:14 -0000 Received: (qmail 1073 invoked by uid 1000); 4 Jan 2005 09:30:17 -0000 Date: Tue, 4 Jan 2005 11:30:17 +0200 From: Peter Pentchev To: x11@FreeBSD.org Message-ID: <20050104093017.GA1048@straylight.m.ringlet.net> Mail-Followup-To: x11@FreeBSD.org, freebsd-ports@FreeBSD.org References: <20050104092619.GA787@straylight.m.ringlet.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="k1lZvvs/B4yU6o8G" Content-Disposition: inline In-Reply-To: <20050104092619.GA787@straylight.m.ringlet.net> User-Agent: Mutt/1.5.6i cc: freebsd-ports@FreeBSD.org Subject: Re: [PATCH] X.org/XFree86 DEPENDS_TARGET X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jan 2005 09:30:19 -0000 --k1lZvvs/B4yU6o8G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 04, 2005 at 11:26:19AM +0200, Peter Pentchev wrote: > Hi, >=20 > Maybe I should have spoken up earlier, since I've been running with > this little patch for pretty much a year now, but still, better late > than never, I guess :) Whoops. I certainly meant to CC this to -ports. > Currently, both x11/xorg and x11/XFree86-4 redefine the DEPENDS_TARGET > when a package is requested. What do y'all think about the following > trivial patch that makes it only override DEPENDS_TARGET if it does not > already contain a 'package' target? I always build all ports with a > DEPENDS_TARGET=3D'install package clean', which helps a lot, especially > with the X.org/XFree86 metaports ;) >=20 > Index: ports/x11/XFree86-4/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/ncvs/ports/x11/XFree86-4/Makefile,v > retrieving revision 1.160 > diff -u -r1.160 Makefile > --- ports/x11/XFree86-4/Makefile 23 Dec 2004 01:35:41 -0000 1.160 > +++ ports/x11/XFree86-4/Makefile 4 Jan 2005 09:25:18 -0000 > @@ -48,7 +48,7 @@ > @${ECHO_MSG} "upgrade XFree86. If you simply type 'make install' it ma= y use over 2GB to build" > @${ECHO_MSG} "all of the subports. You can install the ports singly if= you are low on space." > =20 > -.if make(package) > +.if make(package) && ${DEPENDS_TARGET:Mpackage} =3D=3D "" > DEPENDS_TARGET=3D"package" > .endif > .undef NOCLEANDEPENDS > Index: ports/x11/xorg/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/ncvs/ports/x11/xorg/Makefile,v > retrieving revision 1.9 > diff -u -r1.9 Makefile > --- ports/x11/xorg/Makefile 23 Dec 2004 01:35:42 -0000 1.9 > +++ ports/x11/xorg/Makefile 23 Dec 2004 12:43:48 -0000 > @@ -55,7 +55,7 @@ > @${ECHO_MSG} "upgrade X.Org. If you simply type 'make install' it may = use over 2GB to build" > @${ECHO_MSG} "all of the subports. You can install the ports singly if= you are low on space." > =20 > -.if make(package) > +.if make(package) && ${DEPENDS_TARGET:Mpackage} =3D=3D "" > DEPENDS_TARGET=3D"package" > .endif > =20 >=20 G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@cnsys.bg roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 This inert sentence is my body, but my soul is alive, dancing in the sparks= of your brain. --k1lZvvs/B4yU6o8G Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFB2mIp7Ri2jRYZRVMRApe+AKCfJ+xHmbJ/JnHw8xvdwzLjk270MwCfbKQa seiRUkCsMdQe5lPM/lFTMLU= =aVeI -----END PGP SIGNATURE----- --k1lZvvs/B4yU6o8G--