svn commit: r339357 - head/Mk/Uses

[Pietro Cerutti]

Author: gahr
Date: Fri Jan 10 13:44:54 2014
New Revision: 339357
URL: http://svnweb.freebsd.org/changeset/ports/339357

Log:
  - Handle the case where both tcl and tk are part of USES
  
  Approved by:	bapt (portmgr)

Modified:
  head/Mk/Uses/tcl.mk
  head/Mk/Uses/tk.mk

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Fri Jan 10 13:42:59 2014	(r339356)
+++ head/Mk/Uses/tcl.mk	Fri Jan 10 13:44:54 2014	(r339357)
@@ -57,7 +57,13 @@
 # Build-time / Run-time only dependencies can be specified with build or run.
 #
 
-.if !defined(_INCLUDE_USES_TCL_MK)
+.if ${USES:Mtk} || ${USES:Mtk\:*}
+.if !defined(_TCLTK_PORT)
+_TCLTK_IGNORE=	yes
+.endif
+.endif
+
+.if !defined(_INCLUDE_USES_TCL_MK) && !defined(_TCLTK_IGNORE)
 _INCLUDE_USES_TCL_MK=	yes
 
 #
@@ -200,3 +206,5 @@ LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
 .endif
 
 .endif # defined(_INCLUDE_USES_TCL_MK)
+
+.undef _TCLTK_IGNORE

Modified: head/Mk/Uses/tk.mk
==============================================================================
--- head/Mk/Uses/tk.mk	Fri Jan 10 13:42:59 2014	(r339356)
+++ head/Mk/Uses/tk.mk	Fri Jan 10 13:44:54 2014	(r339357)
@@ -4,10 +4,6 @@
 #
 #
 
-.if ${USES:Mtcl} || ${USES:Mtcl\:*}
-IGNORE= Do not set both tcl and tk in USES
-.endif
-
 .if defined(tk_ARGS)
 tcl_ARGS:=	${tk_ARGS}
 .endif