Mon Mar 5 13:35:20 2012 UTC ()
Use tclsh from pkgsrc for the case lang/tcl is buildlinked.


(obache)
diff -r1.21 -r1.22 pkgsrc/lang/tcl/buildlink3.mk
cvs diff -r1.21 -r1.22 pkgsrc/lang/tcl/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/tcl/buildlink3.mk 2009/06/14 22:58:03 1.21
+++ pkgsrc/lang/tcl/buildlink3.mk 2012/03/05 13:35:20 1.22
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.21 2009/06/14 22:58:03 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2012/03/05 13:35:20 obache Exp $
2 2
3BUILDLINK_TREE+= tcl 3BUILDLINK_TREE+= tcl
4 4
5.if !defined(TCL_BUILDLINK3_MK) 5.if !defined(TCL_BUILDLINK3_MK)
6TCL_BUILDLINK3_MK:= 6TCL_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1 8BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1
9BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1 9BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1
10BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl 10BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
11 11
12BUILDLINK_FILES.tcl+= bin/tclsh* 12BUILDLINK_FILES.tcl+= bin/tclsh*
13# 13#
14# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't 14# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
15# need to patch so many Makefiles. 15# need to patch so many Makefiles.
16# 16#
17BUILDLINK_TRANSFORM+= l:tcl:tcl84 17BUILDLINK_TRANSFORM+= l:tcl:tcl84
18BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84 18BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84
19 19
20TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh 20TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
21 21
 22_TOOLS_USE_PKGSRC.tclsh= yes
 23
22.include "../../mk/dlopen.buildlink3.mk" 24.include "../../mk/dlopen.buildlink3.mk"
23.endif # TCL_BUILDLINK3_MK 25.endif # TCL_BUILDLINK3_MK
24 26
25BUILDLINK_TREE+= -tcl 27BUILDLINK_TREE+= -tcl