add a non-threaded libtcl.so, for embedding into non-threaded applications

12 files changed, 1376 insertions, 0 deletions

diff --git a/lang/libtcl-nothread/DESCR b/lang/libtcl-nothread/DESCR
new file mode 100644
index 00000000000..b22bfecedd3
--- /dev/null
+++ b/lang/libtcl-nothread/DESCR
@@ -0,0 +1,8 @@
+This package contains Tcl, John Osterhout's Tool Command Language, an
+exceedingly simple language great for general scripting and for
+embedding in other programs.
+
+The best way to get started with Tcl is to read ``Tcl and the Tk
+Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X
+or ``Practical Programming in Tcl and Tk'' by Brent B. Welch,
+Prentice Hall PTR, ISBN 0-13-616830-X.
diff --git a/lang/libtcl-nothread/Makefile b/lang/libtcl-nothread/Makefile
new file mode 100644
index 00000000000..7604c2d1390
--- /dev/null
+++ b/lang/libtcl-nothread/Makefile
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+#
+
+DISTNAME=		tcl8.4.6-src
+PKGNAME=		libtcl-nothread-8.4.6
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tcl/}
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://www.tcl.tk/
+COMMENT=		TCL library for embedding
+
+DEPENDS+=		tcl>=8.4.6nb5:../../lang/tcl
+
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
+GNU_CONFIGURE=		yes
+MAKE_ENV+=		TOUCH="${TOUCH}"
+MAKE_ENV+=		NOTHREAD_SUFX=-nothread
+
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+
+TCLLIB=			libtcl84-nothread.la
+ALL_TARGET=		${TCLLIB}
+
+# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
+CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
+
+.include "../../mk/bsd.prefs.mk"
+
+# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
+# tickled by the Tcl code that manifests in code generation problems.
+#
+.if (${MACHINE_PLATFORM:MNetBSD-1.5*-m68k} != "")
+CONFIGURE_ENV+=		COMPILER_OPTIMIZATION_BUG=YES
+.endif
+
+post-configure:
+	${SED} 's|tcl84|tcl84-nothread|g' <${WRKSRC}/tclConfig.sh \
+		>${WRKSRC}/tclConfig-nothread.sh
+
+do-install:
+	cd ${WRKSRC} && \
+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${TCLLIB} ${PREFIX}/lib; \
+	${INSTALL_DATA} tclConfig-nothread.sh ${PREFIX}/lib
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/libtcl-nothread/PLIST b/lang/libtcl-nothread/PLIST
new file mode 100644
index 00000000000..67ed144319b
--- /dev/null
+++ b/lang/libtcl-nothread/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+lib/libtcl84-nothread.a
+lib/libtcl84-nothread.la
+lib/libtcl84-nothread.so
+lib/libtcl84-nothread.so.1
+lib/libtcl84-nothread.so.1.0
+lib/tclConfig-nothread.sh
diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk
new file mode 100644
index 00000000000..82ff66394e9
--- /dev/null
+++ b/lang/libtcl-nothread/buildlink3.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+TCLNT_BUILDLINK3_MK:=	${TCLNT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tclnt
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntclnt}
+BUILDLINK_PACKAGES+=	tclnt
+
+.if !empty(TCLNT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6
+BUILDLINK_PKGSRCDIR.tclnt?=	../../lang/libtcl-nothread
+
+BUILDLINK_FILES.tcl=	bin/tclsh*
+#
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
+#
+BUILDLINK_TRANSFORM+=	l:tcl:tcl84-nothread
+BUILDLINK_TRANSFORM+=	l:tcl8.4:tcl84-nothread
+
+TCLCONFIG_SH?=		${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh
+BUILD_ENV+=		_TCL_NOTHREAD=yes
+
+.endif	# TCLNT_BUILDLINK3_MK
+
+_TCL_NOTHREAD=		yes
+.include "../../lang/tcl/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libtcl-nothread/distinfo b/lang/libtcl-nothread/distinfo
new file mode 100644
index 00000000000..d3f2cef3570
--- /dev/null
+++ b/lang/libtcl-nothread/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
+Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
+SHA1 (patch-aa) = 39a4b3649c840ad1ccdce34fc8c3b4f3e38c3e06
+SHA1 (patch-ab) = 7b5dc8c937fedf43042a558f7afdec2a93ba3a62
+SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
+SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
+SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
+SHA1 (patch-ag) = d1b038f6006ef3611fec9d8cef314f8959a5cd08
+SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff --git a/lang/libtcl-nothread/patches/patch-aa b/lang/libtcl-nothread/patches/patch-aa
new file mode 100644
index 00000000000..99078e9618e
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-aa
@@ -0,0 +1,113 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- Makefile.in.orig	2004-03-02 00:58:59.000000000 +0100
++++ Makefile.in
+@@ -76,7 +76,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
+ TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
+ 
+ # Libraries built with optimization switches have this additional extension
+-TCL_DBGX		= @TCL_DBGX@
++TCL_DBGX		= ${NOTHREAD_SUFX}
+ 
+ # warning flags
+ CFLAGS_WARNING		= @CFLAGS_WARNING@
+@@ -95,7 +95,7 @@ CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@ -DT
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
+ LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
+-LDFLAGS			= @LDFLAGS@ @LDFLAGS_DEFAULT@
++LDFLAGS			= @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
+@@ -172,8 +172,8 @@ SHELL			= /bin/sh
+ INSTALL_STRIP_PROGRAM   = -s
+ INSTALL_STRIP_LIBRARY  = -S -S
+ 
+-INSTALL			= @srcdir@/install-sh -c
+-INSTALL_PROGRAM		= ${INSTALL}
++INSTALL                 := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
++INSTALL_PROGRAM         = ${INSTALL} -s
+ INSTALL_LIBRARY		= ${INSTALL}
+ INSTALL_DATA		= ${INSTALL} -m 644
+ 
+@@ -191,7 +191,7 @@ TCL_EXE			= tclsh
+ # these definitions by hand.
+ 
+ STLIB_LD		= @STLIB_LD@
+-SHLIB_LD		= @SHLIB_LD@
++SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
+ SHLIB_CFLAGS		= @SHLIB_CFLAGS@
+ SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+@@ -217,6 +217,7 @@ BUILD_DLTEST		= @BUILD_DLTEST@
+ #BUILD_DLTEST		=
+ 
+ TCL_LIB_FILE		= @TCL_LIB_FILE@
++TCL_LA_FILE		= ${TCL_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TCL_LIB_FILE		= libtcl.a
+ 
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -254,8 +255,9 @@ DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
+ # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
+ TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
+ 
+-CC			= @CC@
+ #CC			= purify -best-effort @CC@ -DPURIFY
++CC			= ${LIBTOOL} --mode=compile @CC@
++LD			= ${LIBTOOL} --mode=link @CC@
+ 
+ # Flags to be passed to mkLinks to control whether the manpages
+ # should be compressed and linked with softlinks
+@@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+ 
+ all: binaries libraries doc
+ 
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+ 
+ libraries:
+ 
+@@ -453,7 +455,7 @@ doc:
+ 
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tcl.
+-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
++${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ 	rm -f $@
+ 	@MAKE_LIB@
+ 
+@@ -473,8 +475,8 @@ tclLibObjs:
+ objs: ${OBJS}
+ 
+ 
+-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+-	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
++	${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ 		${CC_SEARCH_FLAGS} -o tclsh
+ 
+ # Resetting the LIB_RUNTIME_DIR below is required so that
+@@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # burned into its ld search path. This keeps tcltest from
+ # picking up an already installed version of the Tcl library.
+ 
+-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
++tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
+ 	$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
+ 
+ tcltest-real:
+-	${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++	${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ 		${CC_SEARCH_FLAGS} -o tcltest
+ 
+ # Note, in the target below TCL_LIBRARY needs to be set or else
+@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+ 
+ xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ 	@DL_OBJS@ ${BUILD_DLTEST}
+-	${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
++	${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ 		@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ 		${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
+ 
diff --git a/lang/libtcl-nothread/patches/patch-ab b/lang/libtcl-nothread/patches/patch-ab
new file mode 100644
index 00000000000..faa94d808e4
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-ab
@@ -0,0 +1,525 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- configure.orig	Mon Mar  1 18:58:59 2004
++++ configure
+@@ -5613,12 +5613,13 @@ fi
+     # Step 3: set configuration options based on system name and version.
+ 
+     do64bit_ok=no
++    TCL_LIB_SPEC_RPATH=""
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+     ECHO_VERSION='`echo ${VERSION}`'
+-    TCL_LIB_VERSIONS_OK=ok
++    TCL_LIB_VERSIONS_OK=nodots
+     CFLAGS_DEBUG=-g
+     CFLAGS_OPTIMIZE=-O
+     if test "$GCC" = "yes" ; then
+@@ -5682,7 +5683,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 
+ 	    DL_OBJS="tclLoadDl.o"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 
+ 	    LD_LIBRARY_PATH_VAR="LIBPATH"
+ 
+@@ -5693,7 +5694,7 @@ fi
+ 		else 
+ 		    do64bit_ok=yes
+ 		    EXTRA_CFLAGS="-q64"
+-		    LDFLAGS="-q64"
++		    LD_FLAGS="-q64"
+ 		    RANLIB="${RANLIB} -X64"
+ 		    AR="${AR} -X64"
+ 		    SHLIB_LD_FLAGS="-b64"
+@@ -5734,7 +5735,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    LD_LIBRARY_PATH_VAR="LIBPATH"
+@@ -5754,7 +5755,7 @@ fi
+ 		else 
+ 		    do64bit_ok=yes
+ 		    EXTRA_CFLAGS="-q64"
+-		    LDFLAGS="-q64"
++		    LD_FLAGS="-q64"
+ 		    RANLIB="${RANLIB} -X64"
+ 		    AR="${AR} -X64"
+ 		    SHLIB_LD_FLAGS="-b64"
+@@ -5830,7 +5831,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -5841,7 +5842,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS="-export-dynamic"
++	    LD_FLAGS="-export-dynamic"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -5852,7 +5853,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -5916,7 +5917,7 @@ fi
+ 		SHLIB_LD_LIBS='${LIBS}'
+ 		DL_OBJS="tclLoadShl.o"
+ 		DL_LIBS="-ldld"
+-		LDFLAGS="-Wl,-E"
++		LD_FLAGS="-Wl,-E"
+ 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -5952,10 +5953,10 @@ fi
+ 		    do64bit_ok=yes
+ 		    if test "`uname -m`" = "ia64" ; then
+ 			EXTRA_CFLAGS="+DD64"
+-			LDFLAGS="+DD64 $LDFLAGS"
++			LD_FLAGS="+DD64 $LD_FLAGS"
+ 		    else
+ 			EXTRA_CFLAGS="+DA2.0W"
+-			LDFLAGS="+DA2.0W $LDFLAGS"
++			LD_FLAGS="+DA2.0W $LD_FLAGS"
+ 		    fi
+ 		fi
+ 	    fi
+@@ -6009,7 +6010,7 @@ fi
+ 		SHLIB_LD_LIBS=""
+ 		DL_OBJS="tclLoadShl.o"
+ 		DL_LIBS="-ldld"
+-		LDFLAGS="-Wl,-E"
++		LD_FLAGS="-Wl,-E"
+ 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -6022,7 +6023,7 @@ fi
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+@@ -6037,7 +6038,7 @@ fi
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    EXTRA_CFLAGS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    ;;
+ 	IRIX-6.*)
+ 	    SHLIB_CFLAGS=""
+@@ -6050,7 +6051,7 @@ fi
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "$GCC" = "yes" ; then
+ 		EXTRA_CFLAGS="-mabi=n32"
+-		LDFLAGS="-mabi=n32"
++		LD_FLAGS="-mabi=n32"
+ 	    else
+ 		case $system in
+ 		    IRIX-6.3)
+@@ -6061,7 +6062,7 @@ fi
+ 			EXTRA_CFLAGS="-n32"
+ 			;;
+ 		esac
+-		LDFLAGS="-n32"
++		LD_FLAGS="-n32"
+ 	    fi
+ 	    ;;
+ 	IRIX64-6.*)
+@@ -6071,7 +6072,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 
+@@ -6084,7 +6085,7 @@ fi
+ 	            do64bit_ok=yes
+ 	            SHLIB_LD="ld -64 -shared -rdata_shared"
+ 	            EXTRA_CFLAGS="-64"
+-	            LDFLAGS="-64"
++	            LD_FLAGS="-64"
+ 	        fi
+ 	    fi
+ 	    ;;
+@@ -6103,7 +6104,7 @@ fi
+ 		SHLIB_LD="${CC} -shared"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+-		LDFLAGS="-rdynamic"
++		LD_FLAGS="-rdynamic"
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    else
+@@ -6139,7 +6140,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+ 		    SHLIB_LD="ld -shared"
+ 		    DL_OBJS="tclLoadDld.o"
+ 		    DL_LIBS="-ldld"
+-		    LDFLAGS=""
++		    LD_FLAGS=""
+ 		    CC_SEARCH_FLAGS=""
+ 		    LD_SEARCH_FLAGS=""
+ else
+@@ -6178,7 +6179,7 @@ EOF
+ 		SHLIB_LD="${CC} -shared"
+ 		DL_OBJS=""
+ 		DL_LIBS="-ldl"
+-		LDFLAGS="-rdynamic"
++		LD_FLAGS="-rdynamic"
+ 		CC_SEARCH_FLAGS=""
+ 		LD_SEARCH_FLAGS=""
+ 	    else
+@@ -6214,7 +6215,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+ 		    SHLIB_LD="ld -shared"
+ 		    DL_OBJS=""
+ 		    DL_LIBS="-ldld"
+-		    LDFLAGS=""
++		    LD_FLAGS=""
+ 		    CC_SEARCH_FLAGS=""
+ 		    LD_SEARCH_FLAGS=""
+ else
+@@ -6233,7 +6234,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6244,11 +6245,14 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS="-Wl,-Bexport"
++	    LD_FLAGS="-Wl,-Bexport"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+ 	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
++	    if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
++		CFLAGS_OPTIMIZE=-O0
++	    fi
+ 	    # Not available on all versions:  check for include file.
+ 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+@@ -6281,18 +6285,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
+   
+ 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
+ 		SHLIB_CFLAGS="-fPIC"
+-		SHLIB_LD="ld -Bshareable -x"
+ 		SHLIB_LD_LIBS=""
+ 		SHLIB_SUFFIX=".so"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS=""
+-		LDFLAGS=""
++		LD_FLAGS=""
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 		echo $ac_n "checking for ELF""... $ac_c" 1>&6
+-echo "configure:6294: checking for ELF" >&5
++echo "configure:6308: checking for ELF" >&5
+ 		cat > conftest.$ac_ext <<EOF
+-#line 6296 "configure"
++#line 6310 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __ELF__
+@@ -6303,11 +6305,20 @@ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   rm -rf conftest*
+-  echo "$ac_t""yes" 1>&6
++  
++		    echo "$ac_t""yes" 1>&6
++		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
++		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++		    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++		
+ else
+   rm -rf conftest*
+-  echo "$ac_t""no" 1>&6
++  
++		    echo "$ac_t""no" 1>&6
++		    SHLIB_LD="ld -Bshareable -x"
++		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
++		    TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ 		
+ fi
+@@ -6323,7 +6334,7 @@ else
+ 		SHLIB_SUFFIX=".a"
+ 		DL_OBJS="tclLoadAout.o"
+ 		DL_LIBS=""
+-		LDFLAGS=""
++		LD_FLAGS=""
+ 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+@@ -6344,14 +6355,14 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-export-dynamic"
++	    LD_FLAGS="-export-dynamic"
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+ 		# The -pthread needs to go in the CFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+ 		EXTRA_CFLAGS="-pthread"
+-	    	LDFLAGS="$LDFLAGS -pthread"
++	    	LD_FLAGS="$LD_FLAGS -pthread"
+ 	    fi
+ 	    case $system in
+ 	    FreeBSD-3.*)
+@@ -6372,7 +6383,7 @@ fi
+ 	    DL_OBJS="tclLoadDyld.o"
+ 	    PLAT_OBJS="tclMacOSXBundle.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-prebind"
++	    LD_FLAGS="-prebind"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    CFLAGS_OPTIMIZE="-Os"
+@@ -6389,7 +6400,7 @@ fi
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadNext.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6409,7 +6420,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadOSF.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6425,7 +6436,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6441,7 +6452,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "$GCC" = "yes" ; then
+@@ -6458,7 +6469,7 @@ EOF
+ 		    LIBS="$LIBS -lpthread -lmach -lexc"
+ 		else
+ 		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
+-		    LDFLAGS="-pthread"
++		    LD_FLAGS="-pthread"
+ 		fi
+ 	    fi
+ 
+@@ -6473,7 +6484,7 @@ EOF
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    # dlopen is in -lc on QNX
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6484,7 +6495,7 @@ EOF
+ 	    SHLIB_SUFFIX=".a"
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    ;;
+@@ -6494,10 +6505,10 @@ EOF
+ 	    # below.
+ 	    if test "$GCC" = "yes" ; then
+ 	    	SHLIB_CFLAGS="-fPIC -melf"
+-	    	LDFLAGS="-melf -Wl,-Bexport"
++	    	LD_FLAGS="-melf -Wl,-Bexport"
+ 	    else
+ 	    	SHLIB_CFLAGS="-Kpic -belf"
+-	    	LDFLAGS="-belf -Wl,-Bexport"
++	    	LD_FLAGS="-belf -Wl,-Bexport"
+ 	    fi
+ 	    SHLIB_LD="ld -G"
+ 	    SHLIB_LD_LIBS=""
+@@ -6514,7 +6525,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -6525,7 +6536,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 
+@@ -6561,7 +6572,7 @@ EOF
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    if test "$GCC" = "yes" ; then
+ 		SHLIB_LD="$CC -shared"
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+@@ -6587,7 +6598,7 @@ EOF
+ 
+ 
+ 	    SHLIB_CFLAGS="-KPIC"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+     
+ 	    # Check to enable 64-bit flags for compiler/linker
+ 	    if test "$do64bit" = "yes" ; then
+@@ -6599,10 +6610,10 @@ EOF
+ 			    do64bit_ok=yes
+ 			    if test "$do64bitVIS" = "yes" ; then
+ 				EXTRA_CFLAGS="-xarch=v9a"
+-			    	LDFLAGS="-xarch=v9a"
++			    	LD_FLAGS="-xarch=v9a"
+ 			    else
+ 				EXTRA_CFLAGS="-xarch=v9"
+-			    	LDFLAGS="-xarch=v9"
++			    	LD_FLAGS="-xarch=v9"
+ 			    fi
+ 			fi
+ 		else
+@@ -6634,7 +6645,7 @@ EOF
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    if test "$GCC" != "yes" ; then
+@@ -6675,9 +6686,9 @@ rm -f conftest*
+ 	    LDFLAGS=$hold_ldflags
+ 	    echo "$ac_t""$found" 1>&6
+ 	    if test $found = yes; then
+-	    LDFLAGS="-Wl,-Bexport"
++	    LD_FLAGS="-Wl,-Bexport"
+ 	    else
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    fi
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+@@ -6852,7 +6863,7 @@ fi
+ 	SHLIB_SUFFIX=""
+ 	DL_OBJS="tclLoadNone.o"
+ 	DL_LIBS=""
+-	LDFLAGS=""
++	LD_FLAGS=""
+ 	CC_SEARCH_FLAGS=""
+ 	LD_SEARCH_FLAGS=""
+ 	BUILD_DLTEST=""
+@@ -6889,16 +6900,16 @@ fi
+     fi
+ 
+     if test "$SHARED_LIB_SUFFIX" = "" ; then
+-	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
++	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}${SHLIB_SUFFIX}'
+     fi
+     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
+-	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
++	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+     fi
+ 
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(TCL_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+ 
+@@ -7217,7 +7228,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+         TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
+     fi
+     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
+-    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
+ else
+     TCL_BUILD_EXP_FILE="lib.exp"
+     eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
+@@ -7247,13 +7258,19 @@ VERSION=${TCL_VERSION}
+ #--------------------------------------------------------------------
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+-    TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
++    TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+ elif test "$prefix" != "$exec_prefix"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
+ fi
+-
++for dir in ${TCL_PACKAGE_PATH_ADD}; do
++    if test -z "${TCL_PACKAGE_PATH}"; then
++      TCL_PACKAGE_PATH="$dir"
++    else
++      TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++    fi
++done
+ #--------------------------------------------------------------------
+ #       The statements below define various symbols relating to Tcl
+ #       stub support.
+@@ -7487,6 +7504,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+ s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+ s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g
+ s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
++s%@LD_FLAGS@%$LD_FLAGS%g
+ s%@STLIB_LD@%$STLIB_LD%g
+ s%@SHLIB_LD@%$SHLIB_LD%g
+ s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g
diff --git a/lang/libtcl-nothread/patches/patch-ac b/lang/libtcl-nothread/patches/patch-ac
new file mode 100644
index 00000000000..a1e30e5f7cc
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-ac
@@ -0,0 +1,45 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- tclUnixInit.c.orig	2004-02-17 17:46:54.000000000 -0600
++++ tclUnixInit.c
+@@ -28,6 +28,11 @@
+ #	include <dlfcn.h>
+ #   endif
+ #endif
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/utsname.h>
++#endif
+ 
+ /*
+  * The Init script (common to Windows and Unix platforms) is
+@@ -730,6 +735,11 @@ TclpSetVariables(interp)
+     int unameOK;
+     CONST char *user;
+     Tcl_DString ds;
++#if defined(__NetBSD__)
++    char machine_arch[SYS_NMLN];
++    int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
++    size_t len = sizeof(machine_arch);
++#endif
+ 
+ #ifdef HAVE_CFBUNDLE
+     char tclLibPath[MAXPATHLEN + 1];
+@@ -832,8 +842,16 @@ TclpSetVariables(interp)
+ 	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
+ 		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
+ 	}
++#if defined(__NetBSD__)
++	if (sysctl(mib, sizeof(mib) / sizeof(int), machine_arch, &len, NULL, 0) < 0)
++	    unameOK = 0;
++	else
++	    Tcl_SetVar2(interp, "tcl_platform", "machine", machine_arch,
++		    TCL_GLOBAL_ONLY);
++#else
+ 	Tcl_SetVar2(interp, "tcl_platform", "machine", name.machine,
+ 		TCL_GLOBAL_ONLY);
++#endif
+     }
+ #endif
+     if (!unameOK) {
diff --git a/lang/libtcl-nothread/patches/patch-ae b/lang/libtcl-nothread/patches/patch-ae
new file mode 100644
index 00000000000..52f063f6c54
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-ae
@@ -0,0 +1,37 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+--- configure.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ configure.in
+@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+         TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
+     fi
+     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
+-    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
+ else
+     TCL_BUILD_EXP_FILE="lib.exp"
+     eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
+@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
+ #--------------------------------------------------------------------
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+-    TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
++    TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+ elif test "$prefix" != "$exec_prefix"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib"
++    TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
+ fi
+-
++for dir in ${TCL_PACKAGE_PATH_ADD}; do
++    if test -z "${TCL_PACKAGE_PATH}"; then
++      TCL_PACKAGE_PATH="$dir"
++    else
++      TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++    fi
++done
+ #--------------------------------------------------------------------
+ #       The statements below define various symbols relating to Tcl
+ #       stub support.
diff --git a/lang/libtcl-nothread/patches/patch-af b/lang/libtcl-nothread/patches/patch-af
new file mode 100644
index 00000000000..646cf9842fd
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-af
@@ -0,0 +1,518 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- tcl.m4.orig	Mon Mar  1 18:58:59 2004
++++ tcl.m4
+@@ -651,7 +651,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
+ #                       loading for Tcl on this system.
+ #       DL_LIBS -       Library file(s) to include in tclsh and other base
+ #                       applications in order for the "load" command to work.
+-#       LDFLAGS -      Flags to pass to the compiler when linking object
++#       LD_FLAGS -      Flags to pass to the compiler when linking object
+ #                       files into an executable application binary such
+ #                       as tclsh.
+ #       LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
+@@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+     # Step 3: set configuration options based on system name and version.
+ 
+     do64bit_ok=no
++    TCL_LIB_SPEC_RPATH=""
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+@@ -839,7 +840,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 
+ 	    DL_OBJS="tclLoadDl.o"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 
+ 	    LD_LIBRARY_PATH_VAR="LIBPATH"
+ 
+@@ -850,7 +851,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		else 
+ 		    do64bit_ok=yes
+ 		    EXTRA_CFLAGS="-q64"
+-		    LDFLAGS="-q64"
++		    LD_FLAGS="-q64"
+ 		    RANLIB="${RANLIB} -X64"
+ 		    AR="${AR} -X64"
+ 		    SHLIB_LD_FLAGS="-b64"
+@@ -891,7 +892,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    LD_LIBRARY_PATH_VAR="LIBPATH"
+@@ -911,7 +912,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		else 
+ 		    do64bit_ok=yes
+ 		    EXTRA_CFLAGS="-q64"
+-		    LDFLAGS="-q64"
++		    LD_FLAGS="-q64"
+ 		    RANLIB="${RANLIB} -X64"
+ 		    AR="${AR} -X64"
+ 		    SHLIB_LD_FLAGS="-b64"
+@@ -944,7 +945,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -955,7 +956,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS="-export-dynamic"
++	    LD_FLAGS="-export-dynamic"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -966,7 +967,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -984,7 +985,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_LD_LIBS='${LIBS}'
+ 		DL_OBJS="tclLoadShl.o"
+ 		DL_LIBS="-ldld"
+-		LDFLAGS="-Wl,-E"
++		LD_FLAGS="-Wl,-E"
+ 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -1020,10 +1021,10 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		    do64bit_ok=yes
+ 		    if test "`uname -m`" = "ia64" ; then
+ 			EXTRA_CFLAGS="+DD64"
+-			LDFLAGS="+DD64 $LDFLAGS"
++			LD_FLAGS="+DD64 $LD_FLAGS"
+ 		    else
+ 			EXTRA_CFLAGS="+DA2.0W"
+-			LDFLAGS="+DA2.0W $LDFLAGS"
++			LD_FLAGS="+DA2.0W $LD_FLAGS"
+ 		    fi
+ 		fi
+ 	    fi
+@@ -1037,7 +1038,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_LD_LIBS=""
+ 		DL_OBJS="tclLoadShl.o"
+ 		DL_LIBS="-ldld"
+-		LDFLAGS="-Wl,-E"
++		LD_FLAGS="-Wl,-E"
+ 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -1050,7 +1051,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+@@ -1065,7 +1066,10 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    EXTRA_CFLAGS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	IRIX-6.*)
+ 	    SHLIB_CFLAGS=""
+@@ -1078,7 +1082,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "$GCC" = "yes" ; then
+ 		EXTRA_CFLAGS="-mabi=n32"
+-		LDFLAGS="-mabi=n32"
++		LD_FLAGS="-mabi=n32"
+ 	    else
+ 		case $system in
+ 		    IRIX-6.3)
+@@ -1089,8 +1093,11 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 			EXTRA_CFLAGS="-n32"
+ 			;;
+ 		esac
+-		LDFLAGS="-n32"
++		LD_FLAGS="-n32"
+ 	    fi
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	IRIX64-6.*)
+ 	    SHLIB_CFLAGS=""
+@@ -1099,7 +1106,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 
+@@ -1112,9 +1119,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	            do64bit_ok=yes
+ 	            SHLIB_LD="ld -64 -shared -rdata_shared"
+ 	            EXTRA_CFLAGS="-64"
+-	            LDFLAGS="-64"
++	            LD_FLAGS="-64"
+ 	        fi
+ 	    fi
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Linux*)
+ 	    SHLIB_CFLAGS="-fPIC"
+@@ -1131,7 +1141,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_LD="${CC} -shared"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+-		LDFLAGS="-rdynamic"
++		LD_FLAGS="-rdynamic"
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    else
+@@ -1139,7 +1149,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		    SHLIB_LD="ld -shared"
+ 		    DL_OBJS="tclLoadDld.o"
+ 		    DL_LIBS="-ldld"
+-		    LDFLAGS=""
++		    LD_FLAGS=""
+ 		    CC_SEARCH_FLAGS=""
+ 		    LD_SEARCH_FLAGS=""])
+ 	    fi
+@@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # XIM peeking works under XFree86.
+ 	    AC_DEFINE(PEEK_XCLOSEIM)
+ 
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	GNU*)
+ 	    SHLIB_CFLAGS="-fPIC"
+@@ -1171,7 +1184,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_LD="${CC} -shared"
+ 		DL_OBJS=""
+ 		DL_LIBS="-ldl"
+-		LDFLAGS="-rdynamic"
++		LD_FLAGS="-rdynamic"
+ 		CC_SEARCH_FLAGS=""
+ 		LD_SEARCH_FLAGS=""
+ 	    else
+@@ -1179,7 +1192,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		    SHLIB_LD="ld -shared"
+ 		    DL_OBJS=""
+ 		    DL_LIBS="-ldld"
+-		    LDFLAGS=""
++		    LD_FLAGS=""
+ 		    CC_SEARCH_FLAGS=""
+ 		    LD_SEARCH_FLAGS=""])
+ 	    fi
+@@ -1194,7 +1207,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1205,34 +1218,42 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS="-Wl,-Bexport"
++	    LD_FLAGS="-Wl,-Bexport"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+ 	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
++	    if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
++		CFLAGS_OPTIMIZE=-O0
++	    fi
+ 	    # Not available on all versions:  check for include file.
+ 	    AC_CHECK_HEADER(dlfcn.h, [
+ 		# NetBSD/SPARC needs -fPIC, -fpic will not do.
+ 		SHLIB_CFLAGS="-fPIC"
+-		SHLIB_LD="ld -Bshareable -x"
+ 		SHLIB_LD_LIBS=""
+ 		SHLIB_SUFFIX=".so"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS=""
+-		LDFLAGS=""
++		LD_FLAGS=""
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 		AC_MSG_CHECKING(for ELF)
+ 		AC_EGREP_CPP(yes, [
+ #ifdef __ELF__
+ 	yes
+ #endif
+-		],
++		], [
+ 		    AC_MSG_RESULT(yes)
+-		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
++		    SHLIB_LD='${TCL_CC} -shared -Wl,-x'
++		    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++		    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
++		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++		], [
+ 		    AC_MSG_RESULT(no)
++		    SHLIB_LD="ld -Bshareable -x"
++		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
++		    TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
+ 		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+-		)
++		])
+ 	    ], [
+ 		SHLIB_CFLAGS=""
+ 		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+@@ -1240,7 +1261,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		SHLIB_SUFFIX=".a"
+ 		DL_OBJS="tclLoadAout.o"
+ 		DL_LIBS=""
+-		LDFLAGS=""
++		LD_FLAGS=""
+ 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+@@ -1259,14 +1280,14 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-export-dynamic"
++	    LD_FLAGS="-export-dynamic"
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+ 		# The -pthread needs to go in the CFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+ 		EXTRA_CFLAGS="-pthread"
+-	    	LDFLAGS="$LDFLAGS -pthread"
++	    	LD_FLAGS="$LD_FLAGS -pthread"
+ 	    fi
+ 	    case $system in
+ 	    FreeBSD-3.*)
+@@ -1287,7 +1308,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    DL_OBJS="tclLoadDyld.o"
+ 	    PLAT_OBJS="tclMacOSXBundle.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-prebind"
++	    LD_FLAGS="-prebind"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    CFLAGS_OPTIMIZE="-Os"
+@@ -1304,7 +1325,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadNext.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1321,7 +1342,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadOSF.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1337,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1353,7 +1374,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "$GCC" = "yes" ; then
+@@ -1370,7 +1391,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		    LIBS="$LIBS -lpthread -lmach -lexc"
+ 		else
+ 		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
+-		    LDFLAGS="-pthread"
++		    LD_FLAGS="-pthread"
+ 		fi
+ 	    fi
+ 
+@@ -1385,7 +1406,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    # dlopen is in -lc on QNX
+ 	    DL_LIBS=""
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1396,7 +1417,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".a"
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    ;;
+@@ -1406,10 +1427,10 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # below.
+ 	    if test "$GCC" = "yes" ; then
+ 	    	SHLIB_CFLAGS="-fPIC -melf"
+-	    	LDFLAGS="-melf -Wl,-Bexport"
++	    	LD_FLAGS="-melf -Wl,-Bexport"
+ 	    else
+ 	    	SHLIB_CFLAGS="-Kpic -belf"
+-	    	LDFLAGS="-belf -Wl,-Bexport"
++	    	LD_FLAGS="-belf -Wl,-Bexport"
+ 	    fi
+ 	    SHLIB_LD="ld -G"
+ 	    SHLIB_LD_LIBS=""
+@@ -1426,7 +1447,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+@@ -1437,7 +1458,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 
+@@ -1467,7 +1488,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    if test "$GCC" = "yes" ; then
+ 		SHLIB_LD="$CC -shared"
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+@@ -1487,7 +1508,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
+ 
+ 	    SHLIB_CFLAGS="-KPIC"
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+     
+ 	    # Check to enable 64-bit flags for compiler/linker
+ 	    if test "$do64bit" = "yes" ; then
+@@ -1499,10 +1520,10 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 			    do64bit_ok=yes
+ 			    if test "$do64bitVIS" = "yes" ; then
+ 				EXTRA_CFLAGS="-xarch=v9a"
+-			    	LDFLAGS="-xarch=v9a"
++			    	LD_FLAGS="-xarch=v9a"
+ 			    else
+ 				EXTRA_CFLAGS="-xarch=v9"
+-			    	LDFLAGS="-xarch=v9"
++			    	LD_FLAGS="-xarch=v9"
+ 			    fi
+ 			fi
+ 		else
+@@ -1526,6 +1547,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+ 	    fi
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	ULTRIX-4.*)
+ 	    SHLIB_CFLAGS="-G 0"
+@@ -1534,7 +1558,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    DL_OBJS="tclLoadAout.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="-Wl,-D,08000000"
++	    LD_FLAGS="-Wl,-D,08000000"
+ 	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    if test "$GCC" != "yes" ; then
+@@ -1557,9 +1581,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    LDFLAGS=$hold_ldflags
+ 	    AC_MSG_RESULT($found)
+ 	    if test $found = yes; then
+-	    LDFLAGS="-Wl,-Bexport"
++	    LD_FLAGS="-Wl,-Bexport"
+ 	    else
+-	    LDFLAGS=""
++	    LD_FLAGS=""
+ 	    fi
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+@@ -1665,7 +1689,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	SHLIB_SUFFIX=""
+ 	DL_OBJS="tclLoadNone.o"
+ 	DL_LIBS=""
+-	LDFLAGS=""
++	LD_FLAGS=""
+ 	CC_SEARCH_FLAGS=""
+ 	LD_SEARCH_FLAGS=""
+ 	BUILD_DLTEST=""
+@@ -1710,8 +1734,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 
+     if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-        MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+-        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++        MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+     else
+         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+ 
+@@ -1741,10 +1765,10 @@ dnl        esac
+ 
+     # Stub lib does not depend on shared/static configuration
+     if test "$RANLIB" = "" ; then
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS}'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+     else
+-        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
++        MAKE_STUB_LIB='${STLIB_LD} -o [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
+         INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+     fi
+ 
+@@ -1762,6 +1786,7 @@ dnl        esac
+     AC_SUBST(LDFLAGS)
+     AC_SUBST(LDFLAGS_DEBUG)
+     AC_SUBST(LDFLAGS_OPTIMIZE)
++    AC_SUBST(LD_FLAGS)
+     AC_SUBST(CC_SEARCH_FLAGS)
+     AC_SUBST(LD_SEARCH_FLAGS)
+ 
diff --git a/lang/libtcl-nothread/patches/patch-ag b/lang/libtcl-nothread/patches/patch-ag
new file mode 100644
index 00000000000..6b906e52e12
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+--- tclConfig.sh.in.orig	Mon Mar  1 18:58:59 2004
++++ tclConfig.sh.in
+@@ -90,7 +90,7 @@ TCL_DL_LIBS='@DL_LIBS@'
+ 
+ # Flags to pass to the compiler when linking object files into
+ # 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
diff --git a/lang/libtcl-nothread/patches/patch-ah b/lang/libtcl-nothread/patches/patch-ah
new file mode 100644
index 00000000000..bd63ce685f3
--- /dev/null
+++ b/lang/libtcl-nothread/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- tclUnixFCmd.c.orig	2003-10-03 19:45:37.000000000 +0200
++++ tclUnixFCmd.c
+@@ -561,6 +561,14 @@ TclpDeleteFile(path)
+  *---------------------------------------------------------------------------
+  */
+ 
++/* Reintroduced here for the benefit of scotty */
++int
++TclpCreateDirectory(path)
++    CONST char *path;
++{
++    return DoCreateDirectory(path);
++}
++
+ int 
+ TclpObjCreateDirectory(pathPtr)
+     Tcl_Obj *pathPtr;