Compile fails for ports/x11-toolkits/tk84 (fix attached) - It is probably a problem with the tcl port!!

[Zoltan Frombach]

I upgraded using portupgrade. I upgraded tcl first, it completed without any 
error or warning messages. Then I tried to upgrade tk (using portupgrade), 
and it fails, like this:

/usr/bin/sed -i.bak  -e 's=/usr/ports=${WRKDIRPREFIX}/usr/ports='  -e 
's=/usr/ports/x11-toolkits/tk84=${WRKDIRPREFIX}/usr/ports=' 
/usr/ports/x11-toolkits/tk
===>  Building for tk-8.4.6,2
cc -pipe -c -O -pipe -march=pentiumpro -Wall -Wconversion -Wno-implicit-int  
-fPIC  -I/usr/ports/x11-toolkits/tk84/work/tk8.4.6/unix -I/usr/ports/x11-toolkits
In file included from 
/usr/ports/x11-toolkits/tk84/work/tk8.4.6/generic/tkInt.h:21,
                 from 
/usr/ports/x11-toolkits/tk84/work/tk8.4.6/generic/tk3d.h:18,
                 from 
/usr/ports/x11-toolkits/tk84/work/tk8.4.6/generic/tk3d.c:16:
/usr/ports/x11-toolkits/tk84/work/tk8.4.6/generic/tk.h:70:20: tcl.h: No such 
file or directory
/usr/ports/x11-toolkits/tk84/work/tk8.4.6/generic/tk.h:72:9: #error Tk 8.4 
must be compiled with tcl.h from Tcl 8.4



When I do a grep SRC /usr/local/lib/tcl8.4/tclConfig.sh I get this:
TCL_SRC_DIR='${WRKDIRPREFIX}${WRKDIRPREFIX}/usr/ports/work/tcl8.4.6'

How did '${WRKDIRPREFIX}get there twice? Probably this was caused by a 
problem in the lates tcl port!! Can someone try to fix it?

Zoltan