ports/107372: Mk/bsd.tcl.mk: add USE_TK_BUILD.

[Thierry Thomas]

>Number:         107372
>Category:       ports
>Synopsis:       Mk/bsd.tcl.mk: add USE_TK_BUILD.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 31 11:00:28 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
	- USE_TCL_BUILD exists, but USE_TK_BUILD is missing: when defined, it
	adds a LIB_DEPENDS on libtkxy.

	- Change a bit in Mk/bsd.port.mk to take it into account.

>How-To-Repeat:
	N/A.

>Fix:
	Please apply the following patches:

--- bsd.tcl.mk.diff begins here ---
--- Mk/bsd.tcl.mk.orig	Sat Oct  7 12:24:57 2006
+++ Mk/bsd.tcl.mk	Sat Dec 30 17:59:00 2006
@@ -15,11 +15,16 @@
 #				  version is used (8.4 currently).
 #				  Available values are: 84, 83, 82, 81 and 80.
 #
+# USE_TCL_BUILD		- Depend on tcl to build. Same syntax as USE_TCL.
+#
 # USE_TK		- Depend on tk to run. In case of incompatible APIs of different
 #				  TK versions the version can be specified directly. If version
 #				  is not specified (USE_TK=yes) then the latest version is
 #				  used (8.4 currently).
 #				  Available values are: 84, 83, 82, 81 and 80.
+#
+# USE_TK_BUILD		- Depend on tk to build. Same syntax as USE_TK.
+#
 ##
 # TCL_LIBDIR	- Path where tcl libraries can be found
 #
@@ -84,10 +89,15 @@
 .endif
 .endif # defined(USE_TCL)
 
-.if defined(USE_TK)
+.if defined(USE_TK) || defined(USE_TK_BUILD)
 
 _TK_VERSIONS=	84 83 82 81 80
 
+.if defined(USE_TK_BUILD)
+USE_TK=	${USE_TK_BUILD}
+_BUILD=		yes
+.endif
+
 .if ${USE_TK} == "yes"
 USE_TK=		84
 .endif
@@ -102,7 +112,11 @@
 .for ver in ${_TK_VERSIONS}
 . if ${USE_TK} == ${ver}
 _FOUND=		yes
+.  if defined(_BUILD)
+LIB_DEPENDS+=	tk${USE_TK}:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+.  else
 RUN_DEPENDS+=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+.  endif
 TCL_INCLUDEDIR=	${LOCALBASE}/include/tcl${TK_VER}
 TCL_LIBDIR=		${LOCALBASE}/lib/tcl${TK_VER}
 TK_INCLUDEDIR=	${LOCALBASE}/include/tk${TK_VER}
--- bsd.tcl.mk.diff ends here ---

--- bsd.port.mk.diff begins here ---
--- Mk/bsd.port.mk.orig	Sat Sep 30 21:25:45 2006
+++ Mk/bsd.port.mk	Sat Dec 30 17:56:16 2006
@@ -1497,7 +1497,7 @@
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 .endif
 
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK)
+.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD)
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 .endif
 
--- bsd.port.mk.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: