[PATCH] X.org/XFree86 DEPENDS_TARGET

[Peter Pentchev]

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 :)

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 ;)

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	4 Jan 2005 09:25:18 -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) && ${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	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."
 
-.if make(package)
+.if make(package) && ${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
Nostalgia ain't what it used to be.
-------------- 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/20050104/4694f1c9/attachment.bin