diff options
| author | gahr <gahr@FreeBSD.org> | 2014-01-10 21:44:54 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2014-01-10 21:44:54 +0800 |
| commit | c8ede7a0d551a276f793636598c0d6ab4def50d5 (patch) | |
| tree | 666fa5367d5d650a2f22a84078587412790ccc60 /Mk | |
| parent | c765bd65f79a1b88fc612ccc0619d2b81c8ab51c (diff) | |
| download | freebsd-ports-gnome-c8ede7a0d551a276f793636598c0d6ab4def50d5.tar.gz freebsd-ports-gnome-c8ede7a0d551a276f793636598c0d6ab4def50d5.tar.zst freebsd-ports-gnome-c8ede7a0d551a276f793636598c0d6ab4def50d5.zip | |
- Handle the case where both tcl and tk are part of USES
Approved by: bapt (portmgr)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/tcl.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/tk.mk | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk index 4d0a376c7e8c..2c528f09df0f 100644 --- a/Mk/Uses/tcl.mk +++ b/Mk/Uses/tcl.mk @@ -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 diff --git a/Mk/Uses/tk.mk b/Mk/Uses/tk.mk index d3f82a61d96b..7525499c12be 100644 --- a/Mk/Uses/tk.mk +++ b/Mk/Uses/tk.mk @@ -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 |