[pkgsrc/trunk]: pkgsrc/lang/tcl add hooks to plug in a non-threaded version o...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63be9bb38e15
branches:  trunk
changeset: 476906:63be9bb38e15
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jun 22 18:34:09 2004 +0000

description:
add hooks to plug in a non-threaded version of libtcl.so (needed for
embedding into non-threaded programs) without duplicating anything else

diffstat:

 lang/tcl/Makefile         |   4 ++--
 lang/tcl/buildlink3.mk    |   4 +++-
 lang/tcl/distinfo         |   4 ++--
 lang/tcl/patches/patch-ag |  21 +++++++++++++++------
 4 files changed, 22 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r 9ec215b127e0 -r 63be9bb38e15 lang/tcl/Makefile
--- a/lang/tcl/Makefile Tue Jun 22 18:31:58 2004 +0000
+++ b/lang/tcl/Makefile Tue Jun 22 18:34:09 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2004/06/15 16:39:12 jwise Exp $
+# $NetBSD: Makefile,v 1.35 2004/06/22 18:34:09 drochner Exp $
 #
 
 DISTNAME=              tcl8.4.6-src
 PKGNAME=               tcl-8.4.6
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff -r 9ec215b127e0 -r 63be9bb38e15 lang/tcl/buildlink3.mk
--- a/lang/tcl/buildlink3.mk    Tue Jun 22 18:31:58 2004 +0000
+++ b/lang/tcl/buildlink3.mk    Tue Jun 22 18:34:09 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/06/15 16:39:12 jwise Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/06/22 18:34:09 drochner Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=    ${TCL_BUILDLINK3_MK}+
@@ -26,6 +26,8 @@
 
 .endif # TCL_BUILDLINK3_MK
 
+.if !defined(_TCL_NOTHREAD)
 .include "../../mk/pthread.buildlink3.mk"
+.endif
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 9ec215b127e0 -r 63be9bb38e15 lang/tcl/distinfo
--- a/lang/tcl/distinfo Tue Jun 22 18:31:58 2004 +0000
+++ b/lang/tcl/distinfo Tue Jun 22 18:34:09 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2004/05/13 12:57:42 he Exp $
+$NetBSD: distinfo,v 1.24 2004/06/22 18:34:09 drochner Exp $
 
 SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
 Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
@@ -7,5 +7,5 @@
 SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
 SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
 SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
-SHA1 (patch-ag) = d1b038f6006ef3611fec9d8cef314f8959a5cd08
+SHA1 (patch-ag) = 24d047f68140b15ebb7823426ae06d83204b1da9
 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff -r 9ec215b127e0 -r 63be9bb38e15 lang/tcl/patches/patch-ag
--- a/lang/tcl/patches/patch-ag Tue Jun 22 18:31:58 2004 +0000
+++ b/lang/tcl/patches/patch-ag Tue Jun 22 18:34:09 2004 +0000
@@ -1,13 +1,22 @@
-$NetBSD: patch-ag,v 1.1 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2004/06/22 18:34:09 drochner Exp $
 
---- tclConfig.sh.in.orig       Mon Mar  1 18:58:59 2004
+--- tclConfig.sh.in.orig       2004-03-02 00:58:59.000000000 +0100
 +++ tclConfig.sh.in
-@@ -90,7 +90,7 @@ TCL_DL_LIBS='@DL_LIBS@'
+@@ -13,2 +13,4 @@
  
- # Flags to pass to the compiler when linking object files into
++if [ -z "${_TCL_NOTHREAD}" ]; then
++
+ # Tcl's version number.
+@@ -92,3 +94,3 @@ TCL_DL_LIBS='@DL_LIBS@'
  # an executable tclsh or tcltest binary.
 -TCL_LD_FLAGS='@LDFLAGS@'
 +TCL_LD_FLAGS='@LD_FLAGS@'
  
- # Flags to pass to ld, such as "-R /usr/local/tcl/lib", that tell the
- # run-time dynamic linker where to look for shared libraries such as
+@@ -180 +182,7 @@ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+ TCL_THREADS=@TCL_THREADS@
++
++else
++
++. @prefix@/lib/tclConfig-nothread.sh
++
++fi