 @@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.78 2014/10/31 21:11:18 adam Exp $
+# $NetBSD: Makefile,v 1.78.6.1 2015/07/04 15:04:26 bsiegert Exp $
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
 PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tcl.tk/
 COMMENT=	Tool Command Language, a dynamic language
 LICENSE=	2-clause-bsd
 .include "../../lang/tcl/Makefile.version"
 WRKSRC=			${WRKDIR}/tcl${TCL_VERSION}
 USE_GCC_RUNTIME=	yes
 @@ -25,24 +26,28 @@ PKGCONFIG_OVERRIDE+=	unix/tcl.pc.in
 CHECK_PORTABILITY_SKIP=	win/configure
 # The test target gives better results when not run as root.
 TEST_TARGET=		test
 .include "options.mk"
 # This is needed for SGI and maybe sun (according to tcl developers)
 .if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	ac_cv_func_gethostbyname_r=no
 .endif
 SUBST_CLASSES+=		tcl-config
 SUBST_STAGE.tcl-config=	post-build
 SUBST_FILES.tcl-config=	unix/tclConfig.sh
 SUBST_SED.tcl-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tcl-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tcl|"
 PLIST_SUBST+=		SONUM=${TCL_SONUM}
 PLIST_SUBST+=		BASEVER=${TCL_BASEVER}
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.65 2015/05/21 10:37:59 adam Exp $
+$NetBSD: distinfo,v 1.65.2.1 2015/07/04 15:04:26 bsiegert Exp $
 SHA1 (tcl8.6.4-src.tar.gz) = 33c5a083a23cf54f15e25a9e787dc39ef3fa0a2b
 RMD160 (tcl8.6.4-src.tar.gz) = 9a30b9083edba13aeef53ba6483b88202264f6dc
 Size (tcl8.6.4-src.tar.gz) = 8915556 bytes
 SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
 SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.3_configure) = b49bd258d424c9d9643659519624c1a93bdc867d
+SHA1 (patch-pkgs_itcl4.0.3_configure) = 8350140809004c1157f9650b9c29e49af0120304
-SHA1 (patch-pkgs_sqlite3.8.8.3_configure) = 181ecbfaf3b26c67ae3e5fe8cd319188b4e89c5f
+SHA1 (patch-pkgs_sqlite3.8.8.3_configure) = e49e8b345330a08e4f931bf21d45d89c72b9099f
-SHA1 (patch-pkgs_tdbc1.0.3_configure) = 23c46840cf353027f508115d6154d023b87bd83e
+SHA1 (patch-pkgs_tdbc1.0.3_configure) = 39c1f010155a9b10ebcdefce065b3dfe26a09491
-SHA1 (patch-pkgs_tdbcmysql1.0.3_configure) = bab1df97a74f6ecb7aa5dcfb06998beca342e504
+SHA1 (patch-pkgs_tdbcmysql1.0.3_configure) = b38503fce5fe49213cf3612a0fe589dd79e4ab9c
-SHA1 (patch-pkgs_tdbcodbc1.0.3_configure) = 16b5e720d17cd6e3a7fcabe31e4f364ae804f01c
+SHA1 (patch-pkgs_tdbcodbc1.0.3_configure) = 5e4d10312768ad42e6b5d2a033ca4b3ee98cf861
-SHA1 (patch-pkgs_tdbcpostgres1.0.3_configure) = 1419e36de841ac1f71e2fe7f0663e0bd6e487006
+SHA1 (patch-pkgs_tdbcpostgres1.0.3_configure) = 57e99769900fc8d55f61096badc037aed6c4b60e
-SHA1 (patch-pkgs_thread2.7.2_configure) = a322d7e715b59b208ccbb4884a03d131c84bc356
+SHA1 (patch-pkgs_thread2.7.2_configure) = 1912b6411bf7b0dc0719fcb6d67c0aa848de85e3
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
 SHA1 (patch-unix_Makefile.in) = 70cd193ca4bf93a0dc635c4ea0681686699277bf
-SHA1 (patch-unix_configure) = abe7ec2bccea451d69d2df2587d3189971f17d9a
+SHA1 (patch-unix_configure) = a3a0965e82b81093ba53cb5bb31842138272450a
 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
 SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
 SHA1 (patch-unix_tclUnixPort.h) = 6efe848c16c550f6adee4bec011891755bb23620

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_itcl4.0.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_itcl4.0.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/itcl4.0.3/configure.orig	2015-03-06 18:19:29.000000000 +0000
 +++ pkgs/itcl4.0.3/configure
-@@ -7338,7 +7338,6 @@ fi
+@@ -7338,8 +7338,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7359,8 +7358,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7382,7 +7379,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_sqlite3.8.8.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.8.8.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/sqlite3.8.8.3/configure.orig	2015-03-06 18:27:28.000000000 +0000
 +++ pkgs/sqlite3.8.8.3/configure
-@@ -7274,7 +7274,6 @@ fi
+@@ -7274,8 +7274,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7295,8 +7294,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7318,7 +7315,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_tdbc1.0.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_tdbc1.0.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/tdbc1.0.3/configure.orig	2015-03-06 18:30:36.000000000 +0000
 +++ pkgs/tdbc1.0.3/configure
-@@ -7465,7 +7465,6 @@ fi
+@@ -7465,8 +7465,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7486,8 +7485,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7509,7 +7506,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.0.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/tdbcmysql1.0.3/configure.orig	2015-03-06 18:34:04.000000000 +0000
 +++ pkgs/tdbcmysql1.0.3/configure
-@@ -7814,7 +7814,6 @@ fi
+@@ -7814,8 +7814,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7835,8 +7834,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7858,7 +7855,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.0.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/tdbcodbc1.0.3/configure.orig	2015-03-06 18:35:24.000000000 +0000
 +++ pkgs/tdbcodbc1.0.3/configure
-@@ -7808,7 +7808,6 @@ fi
+@@ -7808,8 +7808,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7829,8 +7828,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7852,7 +7849,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.3_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.0.3_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/tdbcpostgres1.0.3/configure.orig	2015-03-06 18:36:37.000000000 +0000
 +++ pkgs/tdbcpostgres1.0.3/configure
-@@ -7808,7 +7808,6 @@ fi
+@@ -7808,8 +7808,7 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -7829,8 +7828,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -7852,7 +7849,7 @@ fi
  fi
  	    ;;

 @@ -1,27 +1,29 @@
-$NetBSD: patch-pkgs_thread2.7.2_configure,v 1.1 2015/05/21 10:37:59 adam Exp $
+$NetBSD: patch-pkgs_thread2.7.2_configure,v 1.1.2.1 2015/07/04 15:04:26 bsiegert Exp $
 Add support for DragonFly.
 --- pkgs/thread2.7.2/configure.orig	2015-03-06 18:38:33.000000000 +0000
 +++ pkgs/thread2.7.2/configure
-@@ -9312,7 +9312,6 @@ fi
+@@ -9312,8 +9312,7 @@ fi
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
+-		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
 @@ -9334,8 +9333,6 @@ fi
  fi
  	    # OpenBSD doesn't do version numbers with dots.
 -	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 -	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 @@ -9359,7 +9356,7 @@ fi
  fi
  	    ;;

 @@ -1,134 +1,167 @@
-$NetBSD: patch-unix_configure,v 1.7 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-unix_configure,v 1.7.6.1 2015/07/04 15:04:26 bsiegert Exp $
---- unix/configure.orig	2014-08-26 15:23:08.000000000 +0000
+--- unix/configure.orig	2015-03-11 13:59:56.000000000 +0000
 +++ unix/configure
-@@ -7666,7 +7666,7 @@ fi
+@@ -6989,12 +6989,12 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	BSD/OS-4.*)
 -	    SHLIB_CFLAGS="-export-dynamic -fPIC"
 +	    SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC"
  	    SHLIB_LD='${CC} -shared'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS="$LDFLAGS --export-dynamic"
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -7665,7 +7665,7 @@ fi
  	    CC_SEARCH_FLAGS=""
  	    LD_SEARCH_FLAGS=""
  	    ;;
 -	OpenBSD-*)
 +	OpenBSD-*|MirBSD-*)
  	    arch=`arch -s`
  	    case "$arch" in
  	    vax)
-@@ -7740,7 +7740,7 @@ fi
+@@ -7695,7 +7695,7 @@ fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
 -		LDFLAGS="-Wl,-export-dynamic"
 +		LDFLAGS="-Wl,--export-dynamic"
  		;;
  	    esac
  	    case "$arch" in
@@ -7729,7 +7729,7 @@ fi
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  	    if test $doRpath = yes; then
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -7746,7 +7746,7 @@ fi
  fi
  	    ;;
 -	FreeBSD-*)
 +	FreeBSD-*|DragonFly-*)
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7775,7 +7775,6 @@ fi
+@@ -7780,7 +7780,6 @@ fi
  	    esac
  	    ;;
  	Darwin-*)
 -	    CFLAGS_OPTIMIZE="-Os"
  	    SHLIB_CFLAGS="-fno-common"
  	    # To avoid discrepancies between what headers configure sees during
  	    # preprocessing tests and compiling tests, move any -isysroot and
-@@ -8949,7 +8948,7 @@ fi
+@@ -8954,7 +8953,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
 -	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 +	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8991,7 +8990,11 @@ fi
+@@ -8996,7 +8995,11 @@ fi
  else
 -            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
 +        if test "${SHLIB_SUFFIX}" = ".dylib" ; then
 +            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
 +        else
 +            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
 +        fi
  fi
-@@ -9025,7 +9028,7 @@ fi
+@@ -9030,7 +9033,7 @@ fi
  else
          MAKE_STUB_LIB='${STLIB_LD} $@ ${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))'
 +        INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(STUB_LIB_FILE))'
  fi
-@@ -19059,9 +19062,9 @@ fi
+@@ -19064,9 +19067,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
 -TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 -TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 -eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 +TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a
 +TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX}
 +eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
  # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
  # since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19174,13 +19177,10 @@ else
+@@ -19179,13 +19182,10 @@ else
      eval libdir="$libdir"
      # default install directory for bundled packages
      PACKAGE_DIR="$libdir"
 -    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -        TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
 -    else
 -        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
 -    fi
 +    TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
      TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
 -    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
 +    TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}"
 +    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
  fi
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19199,12 +19199,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19204,12 +19204,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
  	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
 -elif test "$prefix/lib" != "$libdir"; then
 -    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
  else
 -    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
 +    TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
  fi
++
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
-@@ -19217,12 +19216,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19222,12 +19221,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
 -else
 -    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
 -fi
+-
 +TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -19376,34 +19370,15 @@ fi
+@@ -19381,34 +19375,15 @@ fi
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
 -#
 -# If the first sed substitution is executed (which looks for macros that
 -# take arguments), then we branch to the quote section.  Otherwise,
 -# look for a macro that doesn't take arguments.
 -cat >confdef2opt.sed <<\_ACEOF
 -t clear
 -: clear
 -s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
 -t quote
 -s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
 @@ -152,21 +185,21 @@ $NetBSD: patch-unix_configure,v 1.7 2014
 -rm -f confdef2opt.sed
 +cat > conftest.defs <<\EOF
 +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
 +s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
 +s%\[%\\&%g
 +s%\]%\\&%g
 +s%\$%$$%g
 +EOF
 +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
 +rm -f conftest.defs
-@@ -20031,6 +20006,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -20036,6 +20013,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
  s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
  s,@DLTEST_LD@,$DLTEST_LD,;t t
  s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
 +s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
  CEOF
  _ACEOF