[PATCH] X.org/XFree86 DEPENDS_TARGET

[Peter Pentchev]

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 not
> > > already contain a 'package' target?  I always build all ports with a
> > > DEPENDS_TARGET='install package clean', which helps a lot, especially
> > > with the X.org/XFree86 metaports ;)
> [snip]
> > > -.if make(package)
> > > +.if make(package) && ${DEPENDS_TARGET:Mpackage} == ""
> 
> This doesn't seem to work if DEPENDS_TARGET is not defined,

Good catch, thanks!
	
> the following line however does:
> 
> .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
===================================================================
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 you are low on space."
 
-.if make(package)
+.if make(package) && empty(DEPENDS_TARGET:Mpackage)
 DEPENDS_TARGET="package"
 .endif
 .undef NOCLEANDEPENDS
Index: ports/x11/xorg/Makefile
===================================================================
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 use over 2GB to build"
 	@${ECHO_MSG} "all of the subports.  You can install the ports singly if you are low on space."
 
-.if make(package)
+.if make(package) && empty(DEPENDS_TARGET:Mpackage)
 DEPENDS_TARGET="package"
 .endif
 
G'luck,
Peter

-- 
Peter Pentchev	roam at ringlet.net    roam at cnsys.bg    roam at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-x11/attachments/20050115/d1fffdcd/attachment.bin