From owner-freebsd-ports@FreeBSD.ORG Sat Jan 15 11:47:06 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 DB6F716A4CE for ; Sat, 15 Jan 2005 11:47:05 +0000 (GMT) Received: from gandalf.online.bg (gandalf.online.bg [217.75.128.9]) by mx1.FreeBSD.org (Postfix) with SMTP id 4BAD743D1D for ; Sat, 15 Jan 2005 11:47:04 +0000 (GMT) (envelope-from roam@ringlet.net) Received: (qmail 3401 invoked from network); 15 Jan 2005 11:46:59 -0000 Received: from unknown (HELO straylight.ringlet.net) (213.16.36.109) by gandalf.online.bg with SMTP; 15 Jan 2005 11:46:59 -0000 Received: (qmail 4169 invoked by uid 1000); 15 Jan 2005 11:47:01 -0000 Date: Sat, 15 Jan 2005 13:47:00 +0200 From: Peter Pentchev To: Dejan Lesjak Message-ID: <20050115114700.GA784@straylight.m.ringlet.net> Mail-Followup-To: Dejan Lesjak , freebsd-x11@freebsd.org, freebsd-ports@freebsd.org References: <20050104092619.GA787@straylight.m.ringlet.net> <20050104093017.GA1048@straylight.m.ringlet.net> <200501151216.33792.dejan.lesjak@ijs.si> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5vNYLRcllDrimb99" Content-Disposition: inline In-Reply-To: <200501151216.33792.dejan.lesjak@ijs.si> User-Agent: Mutt/1.5.6i cc: freebsd-x11@freebsd.org 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: Sat, 15 Jan 2005 11:47:06 -0000 --5vNYLRcllDrimb99 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jan 15, 2005 at 12:16:33PM +0100, Dejan Lesjak wrote: > On Tuesday 04 of January 2005 10:30, Peter Pentchev wrote: > > On Tue, Jan 04, 2005 at 11:26:19AM +0200, Peter Pentchev wrote: > > > Hi, > > > > > > 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 n= ot > > > already contain a 'package' target? I always build all ports with a > > > DEPENDS_TARGET=3D'install package clean', which helps a lot, especial= ly > > > with the X.org/XFree86 metaports ;) > [snip] > > > -.if make(package) > > > +.if make(package) && ${DEPENDS_TARGET:Mpackage} =3D=3D "" >=20 > This doesn't seem to work if DEPENDS_TARGET is not defined, Good catch, thanks! =09 > the following line however does: >=20 > .if make(package) && empty(${DEPENDS_TARGET:Mpackage}) I think you mean empty(DEPENDS_TARGET:Mpackage) here, without the ${}, or it would always test the wrong variable for emptiness. > Does this still work in your case as expected? Yes, the following patch works for me. Thanks a lot! 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 15 Jan 2005 11:43:34 -0000 @@ -48,7 +48,7 @@ @${ECHO_MSG} "upgrade XFree86. 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 y= ou are low on space." =20 -.if make(package) +.if make(package) && empty(DEPENDS_TARGET:Mpackage) 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 15 Jan 2005 11:44:31 -0000 @@ -55,7 +55,7 @@ @${ECHO_MSG} "upgrade X.Org. If you simply type 'make install' it may us= e over 2GB to build" @${ECHO_MSG} "all of the subports. You can install the ports singly if y= ou are low on space." =20 -.if make(package) +.if make(package) && empty(DEPENDS_TARGET:Mpackage) DEPENDS_TARGET=3D"package" .endif =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 I've heard that this sentence is a rumor. --5vNYLRcllDrimb99 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFB6QK07Ri2jRYZRVMRAnfqAKC3lry4doEletVW7V7IfF8fWB4dSQCeJq74 n4moXHYNr3T6EbPCajZJaag= =1jhC -----END PGP SIGNATURE----- --5vNYLRcllDrimb99--