Fix up some Makefile logic that got broken by the libtool patches (and

prevented it from building on some platforms). Ensure that the built
library is named libtk84 (as opposed to libtk8.4) on all platforms.

6 files changed, 116 insertions, 99 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index dc82b71661f..d1cef50a38a 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/03/25 22:49:15 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/09 23:39:00 danw Exp $
 
 DISTNAME=	tk8.4.6-src
 PKGNAME=	tk-8.4.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -46,13 +46,6 @@ post-patch:
 	${RM} -f mkLinks.tmp;						\
 	${CHMOD} +x mkLinks;
 
-pre-install:
-	cd ${WRKSRC}; for file in					\
-		tkUnixInit.o libtk84.so wish;				\
-	do								\
-		${TOUCH} $${file};					\
-	done
-
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
 	${RM} -rf ${WRKDIR}/man
diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk
index 439c1e88f27..5e814440310 100644
--- a/x11/tk/buildlink2.mk
+++ b/x11/tk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/04/09 23:39:00 danw Exp $
 
 .if !defined(TK_BUILDLINK2_MK)
 TK_BUILDLINK2_MK=	# defined
@@ -22,10 +22,11 @@ USE_X11=	YES
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 
-# Make "-ltk" resolve into "-ltk84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=		l:tk:tk84
+BUILDLINK_TRANSFORM+=		l:tk8.4:tk84
 
 BUILDLINK_TARGETS+=	tk-buildlink
 
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index c787a5c40e0..576b580eeac 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/04/09 23:39:00 danw Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -16,10 +16,11 @@ BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk=	bin/wish*
 #
-# Make "-ltk" resolve into "-ltk84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltk" and "-ltk8.4" resolve into "-ltk84", so that we don't
+# need to patch so many Makefiles.
 #
 BUILDLINK_TRANSFORM+=	l:tk:tk84
+BUILDLINK_TRANSFORM+=	l:tk8.4:tk84
 
 .endif	# TK_BUILDLINK3_MK
 
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 78fd043f088..91cece2cefe 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: distinfo,v 1.16 2004/04/09 23:39:00 danw Exp $
 
 SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88
 Size (tk8.4.6-src.tar.gz) = 3230760 bytes
-SHA1 (patch-aa) = 8d5ef8ca0667c1cec570b8b661d3c3cabf0c44e1
-SHA1 (patch-ab) = a64ea12d46f1e5a7893ac7489c0815f7e1f6fabb
+SHA1 (patch-aa) = 60fd440a16607a9000fd16b1a6f6461d2d717fdd
+SHA1 (patch-ab) = 1673dd6d9e5a7bfd3e85004f34da1c28f3258353
 SHA1 (patch-ac) = 055e64d4a3a1e93f6e122ebdad270fb1490fe381
 SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index 04f2f252fb5..228c5224865 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2004/04/09 23:39:00 danw Exp $
 
 --- Makefile.in.orig	Mon Mar  1 19:04:48 2004
 +++ Makefile.in
@@ -31,7 +31,15 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -234,7 +234,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+@@ -208,6 +208,7 @@ TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
+ #TK_STUB_LIB_FLAG	= -ltkstub
+ 
+ TK_LIB_FILE		= @TK_LIB_FILE@
++TK_LA_FILE		= ${TK_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TK_LIB_FILE		= libtk.a
+ 
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -234,7 +235,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
  # The values of the symbolis normally set by the configure script.
  
  STLIB_LD		= @STLIB_LD@
@@ -40,7 +48,7 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
  SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
  TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
-@@ -274,7 +274,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
+@@ -274,7 +275,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
  # should be compressed and linked with softlinks
  MKLINKS_FLAGS           = @MKLINKS_FLAGS@
  
@@ -50,16 +58,36 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
  
  CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
  -I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -422,7 +423,7 @@ objs: ${OBJS}
+@@ -390,7 +392,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+ 
+ all: binaries libraries doc
+ 
+-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
++binaries: ${TK_LA_FILE} ${STUB_LIB_FILE} wish
+ 
+ libraries:
  
+@@ -402,7 +404,7 @@ doc: $(SRC_DIR)/doc/man.macros
  
- wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tk.
+-${LIB_FILE}: ${OBJS}
++${TK_LA_FILE}: ${OBJS}
+ 	rm -f $@
+ 	@MAKE_LIB@
+ 
+@@ -421,8 +423,8 @@ tkLibObjs:
+ objs: ${OBJS}
+ 
+ 
+-wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
 -	$(CC) $(LDFLAGS) $(WISH_OBJS) \
++wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE)
 +	$(LD) $(LDFLAGS) $(WISH_OBJS) \
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
  
-@@ -436,7 +437,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -436,7 +438,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
  	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
  
  tktest-real:
@@ -68,7 +96,7 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
  
-@@ -445,7 +446,7 @@ tktest-real:
+@@ -445,7 +447,7 @@ tktest-real:
  # lib location logic from tktest, and it is not clear where this
  # test.o object file comes from.
  xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -77,3 +105,12 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
  		@TK_BUILD_LIB_SPEC@ \
  		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
  
+@@ -507,7 +509,7 @@ install-strip:
+ # some ranlibs write to current directory, and this might not always be
+ # possible (e.g. if installing as root).
+ 
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+ 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index dd3dd946ea7..9a0ca28da75 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-ab,v 1.16 2004/04/09 23:39:00 danw Exp $
 
 --- configure.orig	Mon Mar  1 19:04:48 2004
 +++ configure
-@@ -2071,6 +2071,7 @@ fi
+@@ -2071,12 +2071,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,6 +10,13 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
      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
 @@ -2140,7 +2141,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  
@@ -113,19 +120,16 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -2495,7 +2496,10 @@ fi
+@@ -2495,7 +2496,7 @@ fi
  	    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=""
-@@ -2508,7 +2512,7 @@ fi
+@@ -2508,7 +2509,7 @@ fi
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    if test "$GCC" = "yes" ; then
  		EXTRA_CFLAGS="-mabi=n32"
@@ -134,20 +138,16 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    else
  		case $system in
  		    IRIX-6.3)
-@@ -2519,8 +2523,11 @@ fi
+@@ -2519,7 +2520,7 @@ fi
  			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=""
-@@ -2529,7 +2536,7 @@ fi
+@@ -2529,7 +2530,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -156,7 +156,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  
-@@ -2542,9 +2549,12 @@ fi
+@@ -2542,7 +2543,7 @@ fi
  	            do64bit_ok=yes
  	            SHLIB_LD="ld -64 -shared -rdata_shared"
  	            EXTRA_CFLAGS="-64"
@@ -164,13 +164,8 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
 +	            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"
-@@ -2561,7 +2571,7 @@ fi
+@@ -2561,7 +2562,7 @@ fi
  		SHLIB_LD="${CC} -shared"
  		DL_OBJS="tclLoadDl.o"
  		DL_LIBS="-ldl"
@@ -179,7 +174,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    else
-@@ -2597,7 +2607,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2597,7 +2598,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
  		    SHLIB_LD="ld -shared"
  		    DL_OBJS="tclLoadDld.o"
  		    DL_LIBS="-ldld"
@@ -188,17 +183,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		    CC_SEARCH_FLAGS=""
  		    LD_SEARCH_FLAGS=""
  else
-@@ -2626,6 +2636,9 @@ fi
- EOF
- 
- 
-+	    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"
-@@ -2636,7 +2649,7 @@ EOF
+@@ -2636,7 +2637,7 @@ EOF
  		SHLIB_LD="${CC} -shared"
  		DL_OBJS=""
  		DL_LIBS="-ldl"
@@ -207,7 +192,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		CC_SEARCH_FLAGS=""
  		LD_SEARCH_FLAGS=""
  	    else
-@@ -2672,7 +2685,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2672,7 +2673,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
  		    SHLIB_LD="ld -shared"
  		    DL_OBJS=""
  		    DL_LIBS="-ldld"
@@ -216,7 +201,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		    CC_SEARCH_FLAGS=""
  		    LD_SEARCH_FLAGS=""
  else
-@@ -2691,7 +2704,7 @@ fi
+@@ -2691,7 +2692,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
@@ -225,7 +210,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2702,7 +2715,7 @@ fi
+@@ -2702,7 +2703,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
@@ -234,7 +219,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2739,12 +2752,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2739,12 +2740,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -248,7 +233,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		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
-@@ -2761,13 +2773,23 @@ EOF
+@@ -2761,13 +2761,23 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -274,7 +259,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  fi
  rm -f conftest*
  
-@@ -2781,7 +2803,7 @@ else
+@@ -2781,7 +2791,7 @@ else
  		SHLIB_SUFFIX=".a"
  		DL_OBJS="tclLoadAout.o"
  		DL_LIBS=""
@@ -283,7 +268,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -2802,14 +2824,14 @@ fi
+@@ -2802,14 +2812,14 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -300,7 +285,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    fi
  	    case $system in
  	    FreeBSD-3.*)
-@@ -2830,7 +2852,7 @@ fi
+@@ -2830,7 +2840,7 @@ fi
  	    DL_OBJS="tclLoadDyld.o"
  	    PLAT_OBJS="tclMacOSXBundle.o"
  	    DL_LIBS=""
@@ -309,7 +294,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    CFLAGS_OPTIMIZE="-Os"
-@@ -2847,7 +2869,7 @@ fi
+@@ -2847,7 +2857,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadNext.o"
  	    DL_LIBS=""
@@ -318,7 +303,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2867,7 +2889,7 @@ EOF
+@@ -2867,7 +2877,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadOSF.o"
  	    DL_LIBS=""
@@ -327,7 +312,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2883,7 +2905,7 @@ EOF
+@@ -2883,7 +2893,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -336,7 +321,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2899,7 +2921,7 @@ EOF
+@@ -2899,7 +2909,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -345,7 +330,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  	    if test "$GCC" = "yes" ; then
-@@ -2916,7 +2938,7 @@ EOF
+@@ -2916,7 +2926,7 @@ EOF
  		    LIBS="$LIBS -lpthread -lmach -lexc"
  		else
  		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
@@ -354,7 +339,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		fi
  	    fi
  
-@@ -2931,7 +2953,7 @@ EOF
+@@ -2931,7 +2941,7 @@ EOF
  	    DL_OBJS="tclLoadDl.o"
  	    # dlopen is in -lc on QNX
  	    DL_LIBS=""
@@ -363,7 +348,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2942,7 +2964,7 @@ EOF
+@@ -2942,7 +2952,7 @@ EOF
  	    SHLIB_SUFFIX=".a"
  	    DL_OBJS="tclLoadAout.o"
  	    DL_LIBS=""
@@ -372,7 +357,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    ;;
-@@ -2952,10 +2974,10 @@ EOF
+@@ -2952,10 +2962,10 @@ EOF
  	    # below.
  	    if test "$GCC" = "yes" ; then
  	    	SHLIB_CFLAGS="-fPIC -melf"
@@ -385,7 +370,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    fi
  	    SHLIB_LD="ld -G"
  	    SHLIB_LD_LIBS=""
-@@ -2972,7 +2994,7 @@ EOF
+@@ -2972,7 +2982,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
@@ -394,7 +379,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
-@@ -2983,7 +3005,7 @@ EOF
+@@ -2983,7 +2993,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
@@ -403,7 +388,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  
-@@ -3019,7 +3041,7 @@ EOF
+@@ -3019,7 +3029,7 @@ EOF
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
@@ -412,7 +397,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    if test "$GCC" = "yes" ; then
  		SHLIB_LD="$CC -shared"
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -3045,7 +3067,7 @@ EOF
+@@ -3045,7 +3055,7 @@ EOF
  
  
  	    SHLIB_CFLAGS="-KPIC"
@@ -421,7 +406,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
      
  	    # Check to enable 64-bit flags for compiler/linker
  	    if test "$do64bit" = "yes" ; then
-@@ -3057,10 +3079,10 @@ EOF
+@@ -3057,10 +3067,10 @@ EOF
  			    do64bit_ok=yes
  			    if test "$do64bitVIS" = "yes" ; then
  				EXTRA_CFLAGS="-xarch=v9a"
@@ -434,17 +419,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  			    fi
  			fi
  		else
-@@ -3084,6 +3106,9 @@ EOF
- 		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"
-@@ -3092,7 +3117,7 @@ EOF
+@@ -3092,7 +3102,7 @@ EOF
  	    SHLIB_LD_LIBS='${LIBS}'
  	    DL_OBJS="tclLoadAout.o"
  	    DL_LIBS=""
@@ -453,7 +428,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    if test "$GCC" != "yes" ; then
-@@ -3133,9 +3158,9 @@ rm -f conftest*
+@@ -3133,9 +3143,9 @@ rm -f conftest*
  	    LDFLAGS=$hold_ldflags
  	    echo "$ac_t""$found" 1>&6
  	    if test $found = yes; then
@@ -465,7 +440,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	    fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
-@@ -3310,7 +3335,7 @@ fi
+@@ -3310,7 +3320,7 @@ fi
  	SHLIB_SUFFIX=""
  	DL_OBJS="tclLoadNone.o"
  	DL_LIBS=""
@@ -474,18 +449,28 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	CC_SEARCH_FLAGS=""
  	LD_SEARCH_FLAGS=""
  	BUILD_DLTEST=""
-@@ -3355,8 +3380,8 @@ fi
+@@ -3347,16 +3357,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 ${@: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)'
++        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) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -4428,7 +4453,11 @@ echo "configure:4426: checking for X11 l
+@@ -4428,7 +4438,11 @@ echo "configure:4426: checking for X11 l
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		echo "$ac_t""$i" 1>&6
@@ -498,7 +483,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -4437,7 +4466,11 @@ echo "configure:4426: checking for X11 l
+@@ -4437,7 +4451,11 @@ echo "configure:4426: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -511,7 +496,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -4507,6 +4540,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4507,6 +4525,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -522,7 +507,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5156,11 +5193,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -5156,11 +5178,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
@@ -542,7 +527,7 @@ $NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
      TK_BUILD_EXP_FILE=""
      TK_EXP_FILE=""
  else
-@@ -5405,6 +5449,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+@@ -5405,6 +5434,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