Tue Nov 16 16:24:40 2021 UTC ()
tcl: updated to 8.6.12
8.6.12:
Bug fixes
(adam)
diff -r1.116 -r1.117 pkgsrc/lang/tcl/Makefile
diff -r1.27 -r1.28 pkgsrc/lang/tcl/Makefile.version
diff -r1.28 -r1.29 pkgsrc/lang/tcl/PLIST
diff -r1.32 -r1.33 pkgsrc/lang/tcl/buildlink3.mk
diff -r1.81 -r1.82 pkgsrc/lang/tcl/distinfo
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.2.1_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.34.0_Makefile.in
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.34.0_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.1.2_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.2_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.2_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.2_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.6_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.2.2_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.36.0_Makefile.in
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.36.0_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.1.3_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.3_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.3_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.3_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.7_configure
diff -r1.17 -r1.18 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in
diff -r1.13 -r1.14 pkgsrc/lang/tcl/patches/patch-unix_configure
--- pkgsrc/lang/tcl/Makefile 2021/07/16 09:56:25 1.116
+++ pkgsrc/lang/tcl/Makefile 2021/11/16 16:24:39 1.117
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2021/07/16 09:56:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.117 2021/11/16 16:24:39 adam Exp $
DISTNAME= tcl${TCL_VERSION}-src
PKGNAME= tcl-${TCL_VERSION}
-PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
--- pkgsrc/lang/tcl/Makefile.version 2021/01/20 20:38:48 1.27
+++ pkgsrc/lang/tcl/Makefile.version 2021/11/16 16:24:39 1.28
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.27 2021/01/20 20:38:48 adam Exp $
+# $NetBSD: Makefile.version,v 1.28 2021/11/16 16:24:39 adam Exp $
# used by cad/xcircuit/Makefile
# used by devel/tcl-tclcl/Makefile
# used by lang/tcl/Makefile
@@ -7,10 +7,10 @@
TCL_SONUM= 86
TCL_BASEVER= 8.6
-TCL_VERSION= 8.6.11
+TCL_VERSION= 8.6.12
# Update bundled versions in lang/tcl/buildlink3.mk
-ITCL_VERSION= 4.2.1
+ITCL_VERSION= 4.2.2
-SQLITE3_VERSION= 3.34.0
+SQLITE3_VERSION= 3.36.0
-TDBC_VERSION= 1.1.2
+TDBC_VERSION= 1.1.3
-THREAD_VERSION= 2.8.6
+THREAD_VERSION= 2.8.7
--- pkgsrc/lang/tcl/PLIST 2021/01/20 20:38:48 1.28
+++ pkgsrc/lang/tcl/PLIST 2021/11/16 16:24:39 1.29
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2021/01/20 20:38:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2021/11/16 16:24:39 adam Exp $
bin/sqlite3_analyzer
bin/tclsh
bin/tclsh${BASEVER}
@@ -70,6 +70,7 @@
lib/tcl${BASEVER}/clock.tcl
lib/tcl${BASEVER}/encoding/ascii.enc
lib/tcl${BASEVER}/encoding/big5.enc
+lib/tcl${BASEVER}/encoding/cns11643.enc
lib/tcl${BASEVER}/encoding/cp1250.enc
lib/tcl${BASEVER}/encoding/cp1251.enc
lib/tcl${BASEVER}/encoding/cp1252.enc
@@ -113,6 +114,7 @@
lib/tcl${BASEVER}/encoding/iso2022.enc
lib/tcl${BASEVER}/encoding/iso8859-1.enc
lib/tcl${BASEVER}/encoding/iso8859-10.enc
+lib/tcl${BASEVER}/encoding/iso8859-11.enc
lib/tcl${BASEVER}/encoding/iso8859-13.enc
lib/tcl${BASEVER}/encoding/iso8859-14.enc
lib/tcl${BASEVER}/encoding/iso8859-15.enc
@@ -289,19 +291,14 @@
lib/tcl${BASEVER}/platform1.0/platform.tcl
lib/tcl${BASEVER}/safe.tcl
lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
-lib/tcl${BASEVER}/shell1.1/shell.tcl
+lib/tcl${BASEVER}/shell1.1/platform/shell.tcl
lib/tcl${BASEVER}/tclAppInit.c
lib/tcl${BASEVER}/tclIndex
lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl
lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl
lib/tcl${BASEVER}/tm.tcl
lib/tcl${BASEVER}/word.tcl
-lib/tcl8/${BASEVER}/http-2.9.5.tm
lib/tcl8/${BASEVER}/tdbc/sqlite3-${TDBC_VERSION}.tm
-lib/tcl8/8.4/platform-1.0.15.tm
-lib/tcl8/8.4/platform/shell-1.1.4.tm
-lib/tcl8/8.5/msgcat-1.6.1.tm
-lib/tcl8/8.5/tcltest-2.5.3.tm
lib/tclConfig.sh
lib/tclooConfig.sh
lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so
@@ -624,6 +621,7 @@
man/man3/Tcl_GetLongFromObj.3
man/man3/Tcl_GetMaster.3
man/man3/Tcl_GetMathFuncInfo.3
+man/man3/Tcl_GetMemoryInfo.3
man/man3/Tcl_GetModeFromStat.3
man/man3/Tcl_GetModificationTimeFromStat.3
man/man3/Tcl_GetNameOfExecutable.3
@@ -718,6 +716,8 @@
man/man3/Tcl_LoadFile.3
man/man3/Tcl_LogCommandInfo.3
man/man3/Tcl_Main.3
+man/man3/Tcl_MainEx.3
+man/man3/Tcl_MainExW.3
man/man3/Tcl_MakeFileChannel.3
man/man3/Tcl_MakeSafe.3
man/man3/Tcl_MakeTcpClientChannel.3
--- pkgsrc/lang/tcl/buildlink3.mk 2020/04/16 17:07:07 1.32
+++ pkgsrc/lang/tcl/buildlink3.mk 2021/11/16 16:24:39 1.33
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2020/04/16 17:07:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2021/11/16 16:24:39 adam Exp $
BUILDLINK_TREE+= tcl
@@ -22,8 +22,8 @@
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
# Bundled library
-ITCL_VERSION= 4.2.0
-TDBC_VERSION= 1.1.1
+ITCL_VERSION= 4.2.2
+TDBC_VERSION= 1.1.3
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
--- pkgsrc/lang/tcl/distinfo 2021/10/26 10:51:57 1.81
+++ pkgsrc/lang/tcl/distinfo 2021/11/16 16:24:39 1.82
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.81 2021/10/26 10:51:57 nia Exp $
+$NetBSD: distinfo,v 1.82 2021/11/16 16:24:39 adam Exp $
-BLAKE2s (tcl8.6.11-src.tar.gz) = 943bcb17c9e06060965495dc7ea0921eb2af3639e07bc708b8676763fea64d95
-SHA512 (tcl8.6.11-src.tar.gz) = f586f393d1ded48e6a678552b1c6b13ad0ca27963e5fe2c98e81bdd5c018197032abb11810d7c7268d68291fefac6b6a046c06df2b0ddd8a720abc32353c55b2
-Size (tcl8.6.11-src.tar.gz) = 10259009 bytes
+BLAKE2s (tcl8.6.12-src.tar.gz) = 1a0cbb0fcc1914b43f8b10cc0127fd3e86ae62f4bb449171664ade5621579461
+SHA512 (tcl8.6.12-src.tar.gz) = 15def824484309fff6831b436e33d91ab1c6b095178f427d1f58b9a04e5e676b18dfdf1d225c6ab9ec15dc233358c40789edc7daf91c5908a1837e9f337feb60
+Size (tcl8.6.12-src.tar.gz) = 10353486 bytes
SHA1 (patch-generic_tclInt.h) = f41a50e6461d0afacd1c8656944403e438ea6baf
SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.2.1_configure) = 9e821584605ee538915365b6cc986c84a466faad
-SHA1 (patch-pkgs_sqlite3.34.0_Makefile.in) = 5ba6810d5b13713d98e422ba1f33f9b3c4b010b7
-SHA1 (patch-pkgs_sqlite3.34.0_configure) = 1b6a4640ae045b159bfef7fbea5363c315845e45
-SHA1 (patch-pkgs_tdbc1.1.2_configure) = bd9879f688db73b8c9d7078ecf08db506dfb6703
-SHA1 (patch-pkgs_tdbcmysql1.1.2_configure) = fe5eb8be50574e9c619695b7cf21bda91aabb7b2
-SHA1 (patch-pkgs_tdbcodbc1.1.2_configure) = 35c0f144102304e631c7bad21d98b745aca5a19d
-SHA1 (patch-pkgs_tdbcpostgres1.1.2_configure) = 5ffe21c178a25723fb6c0901a153c969357b6cdb
-SHA1 (patch-pkgs_thread2.8.6_configure) = 2abebd054e02f973463b1cd7f2dd7cfd7d1a462d
+SHA1 (patch-pkgs_itcl4.2.2_configure) = 0d3f3004e5ca4fd94d69efc2753b06626f9cd130
+SHA1 (patch-pkgs_sqlite3.36.0_Makefile.in) = d86f3b78e36be6fe3247c16df3f451aaa3117cba
+SHA1 (patch-pkgs_sqlite3.36.0_configure) = 9133647d4e665d050cf89e30f92e1e700019ee1e
+SHA1 (patch-pkgs_tdbc1.1.3_configure) = e58338a2df7278a738bd41840a5f57247189c285
+SHA1 (patch-pkgs_tdbcmysql1.1.3_configure) = 2c131c54bb204c256e30b19724fcc6aefb076a40
+SHA1 (patch-pkgs_tdbcodbc1.1.3_configure) = 0dd5b4fa1e536415a7fe8c330d83e83348c93b2f
+SHA1 (patch-pkgs_tdbcpostgres1.1.3_configure) = afc07b976b31b0ca1982e1dc908f10eb19857405
+SHA1 (patch-pkgs_thread2.8.7_configure) = 972e926b03505bc4d4f354f7e170e9fdbf84d478
SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = cf3f3ebaaf9d73c07db44b4da5695741fc39f0ea
-SHA1 (patch-unix_configure) = 59c5554344672eee73b309cdf679669c0cf7f677
+SHA1 (patch-unix_Makefile.in) = a0c50c39118ec777fe61fa381cb53b71c69f1e02
+SHA1 (patch-unix_configure) = 2f3fae506031092cd5934b41b81c62e3d52e8576
SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
SHA1 (patch-unix_tclUnixCompat.c) = c5c124b5ccd240cbd34a83fd165c3dea208381cd
SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
$NetBSD: patch-pkgs_itcl4.2.2_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/itcl4.2.2/configure.orig 2021-11-01 01:02:18.000000000 +0000
+++ pkgs/itcl4.2.2/configure
@@ -7423,20 +7423,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_sqlite3.36.0_Makefile.in,v 1.1 2021/11/16 16:24:40 adam Exp $
Fix building with system sqlite3.
--- pkgs/sqlite3.36.0/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000
+++ pkgs/sqlite3.36.0/Makefile.in
@@ -154,7 +154,7 @@ SHARED_BUILD = @SHARED_BUILD@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
+PKG_CFLAGS = @PKG_CFLAGS@
# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
$NetBSD: patch-pkgs_sqlite3.36.0_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/sqlite3.36.0/configure.orig 2021-09-12 22:15:31.000000000 +0000
+++ pkgs/sqlite3.36.0/configure
@@ -7387,20 +7387,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_tdbc1.1.3_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbc1.1.3/configure.orig 2021-11-01 00:45:16.000000000 +0000
+++ pkgs/tdbc1.1.3/configure
@@ -7553,20 +7553,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_tdbcmysql1.1.3_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcmysql1.1.3/configure.orig 2021-11-01 00:45:35.000000000 +0000
+++ pkgs/tdbcmysql1.1.3/configure
@@ -7907,20 +7907,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_tdbcodbc1.1.3_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcodbc1.1.3/configure.orig 2021-11-01 00:45:43.000000000 +0000
+++ pkgs/tdbcodbc1.1.3/configure
@@ -7907,20 +7907,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_tdbcpostgres1.1.3_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/tdbcpostgres1.1.3/configure.orig 2021-11-01 00:45:56.000000000 +0000
+++ pkgs/tdbcpostgres1.1.3/configure
@@ -7907,20 +7907,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
$NetBSD: patch-pkgs_thread2.8.7_configure,v 1.1 2021/11/16 16:24:40 adam Exp $
Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e
--- pkgs/thread2.8.7/configure.orig 2021-11-01 00:56:26.000000000 +0000
+++ pkgs/thread2.8.7/configure
@@ -13101,20 +13101,18 @@ then :
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
CFLAGS_OPTIMIZE="-O2"
# On OpenBSD: Compile with -pthread
# Don't link with -lpthread
LIBS=`echo $LIBS | sed s/-lpthread//`
CFLAGS="$CFLAGS -pthread"
# 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
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD='${CCLD} ${SHLIB_CFLAGS} -shared'
+ SHLIB_LD='${CCLD} ${SHLIB_CFLAGS} -shared ${LDFLAGS_DEFAULT}'
SHLIB_SUFFIX=".so"
LDFLAGS="$LDFLAGS -export-dynamic"
if test $doRpath = yes
--- pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2021/01/20 20:38:49 1.17
+++ pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2021/11/16 16:24:40 1.18
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_Makefile.in,v 1.17 2021/01/20 20:38:49 adam Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.18 2021/11/16 16:24:40 adam Exp $
Honour LDFLAGS.
---- unix/Makefile.in.orig 2020-12-31 01:31:43.000000000 +0000
+--- unix/Makefile.in.orig 2021-10-29 17:08:08.000000000 +0000
+++ unix/Makefile.in
@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -56,7 +56,7 @@
#TCL_LIB_FILE = libtcl.a
# Generic lib name used in rules that apply to tcl and tk
-@@ -710,7 +714,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
+@@ -711,7 +715,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
all: binaries libraries doc packages
@@ -65,7 +65,7 @@
libraries:
-@@ -729,6 +733,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+@@ -730,6 +734,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f $@
@MAKE_STUB_LIB@
@@ -77,8 +77,8 @@
# Make target which outputs the list of the .o contained in the Tcl lib useful
# to build a single big shared library containing Tcl and other extensions.
# Used for the Tcl Plugin. -- dl
-@@ -891,9 +900,16 @@ install-binaries: binaries
- done;
+@@ -893,9 +902,16 @@ install-binaries: binaries
+ done
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
@@ -95,49 +95,55 @@
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
@echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -946,6 +962,8 @@ install-libraries: libraries
- done;
+@@ -947,23 +963,32 @@ install-libraries: libraries
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \
+ done
@echo "Installing package http 2.9.5 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http/http.tcl";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http/http.tcl"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/http/pkgIndex.tcl";
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
- @for i in $(TOP_DIR)/library/opt/*.tcl ; \
- do \
-@@ -953,13 +971,21 @@ install-libraries: libraries
- done;
- @echo "Installing package msgcat 1.6.1 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)/msgcat1.6/msgcat.tcl";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/msgcat1.6/pkgIndex.tcl";
- @echo "Installing package tcltest 2.5.3 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)/tcltest2.5/tcltest.tcl";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/tcltest2.5/pkgIndex.tcl";
-
- @echo "Installing package platform 1.0.15 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)/platform1.0/platform.tcl";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/platform1.0/pkgIndex.tcl";
- @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)/shell1.1/shell.tcl";
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/shell1.1/pkgIndex.tcl";
-
- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -1044,7 +1070,7 @@ install-doc: doc
+ @for i in $(TOP_DIR)/library/opt/*.tcl; do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
done
+ @echo "Installing package msgcat 1.6.1 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
+- "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
++ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/msgcat.tcl"
++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl \
++ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/pkgIndex.tcl";
+ @echo "Installing package tcltest 2.5.3 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
+- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"
++ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/tcltest.tcl"
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl \
++ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/pkgIndex.tcl";
+ @echo "Installing package platform 1.0.18 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
+- "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"
++ "$(SCRIPT_INSTALL_DIR)/platform1.0/platform.tcl"
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl \
++ "$(SCRIPT_INSTALL_DIR)/platform1.0/pkgIndex.tcl";
+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module"
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
+- "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
++ "$(SCRIPT_INSTALL_DIR)/shell1.1/platform/shell.tcl"
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl \
++ "$(SCRIPT_INSTALL_DIR)/shell1.1/pkgIndex.tcl";
+ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
+ @for i in $(TOP_DIR)/library/encoding/*.enc; do \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
+@@ -1039,20 +1064,24 @@ install-doc: doc
+ done
install-headers:
-- @for i in "$(INCLUDE_INSTALL_DIR)"; \
-+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
- do \
+- @for i in "$(INCLUDE_INSTALL_DIR)"; do \
++ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -1053,13 +1079,17 @@ install-headers:
- fi; \
- done;
+ $(INSTALL_DATA_DIR) "$$i"; \
+ fi; \
+ done
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
@@ -156,15 +162,15 @@
do \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
- done;
+ done
# Optional target to install private headers
-@@ -1817,7 +1847,7 @@ configure-packages:
+@@ -1810,7 +1839,7 @@ configure-packages:
- mkdir -p $(PKG_DIR)/$$pkg; \
+ mkdir -p $(PKG_DIR)/$$pkg; \
- if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+ if [ ! -f $(PKG_DIR)/$$pkg/Makefile ] ; then \
- ( cd $(PKG_DIR)/$$pkg; \
+ ( cd $(PKG_DIR)/$$pkg; \
-- $$i/configure --with-tcl=../.. \
+- $$i/configure --with-tcl=../.. \
-+ $(SHELL) $$i/configure --with-tcl=../.. \
++ $(SHELL) $$i/configure --with-tcl=../.. \
- --with-tclinclude=$(GENERIC_DIR) \
+ --with-tclinclude=$(GENERIC_DIR) \
- $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
+ $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
- --enable-shared --enable-threads; ) || exit $$?; \
+ --enable-shared --enable-threads; ) || exit $$?; \
--- pkgsrc/lang/tcl/patches/patch-unix_configure 2021/01/20 20:38:49 1.13
+++ pkgsrc/lang/tcl/patches/patch-unix_configure 2021/11/16 16:24:40 1.14
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.13 2021/01/20 20:38:49 adam Exp $
+$NetBSD: patch-unix_configure,v 1.14 2021/11/16 16:24:40 adam Exp $
---- unix/configure.orig 2020-12-31 01:31:43.000000000 +0000
+--- unix/configure.orig 2021-11-04 15:04:06.000000000 +0000
+++ unix/configure
-@@ -6771,12 +6771,12 @@ fi
+@@ -6772,12 +6772,12 @@ fi
LD_SEARCH_FLAGS=""
;;
BSD/OS-4.*)
@@ -17,7 +17,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -7447,7 +7447,7 @@ fi
+@@ -7462,7 +7462,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
@@ -26,7 +26,7 @@
arch=`arch -s`
case "$arch" in
alpha|sparc64)
-@@ -7468,7 +7468,7 @@ fi
+@@ -7483,7 +7483,7 @@ fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
@@ -35,7 +35,7 @@
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then
-@@ -7490,7 +7490,7 @@ fi
+@@ -7505,7 +7505,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -44,15 +44,15 @@
if test $doRpath = yes; then
CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
-@@ -7540,7 +7540,6 @@ fi
- esac
+@@ -7523,7 +7523,6 @@ fi
+
;;
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
-@@ -8750,7 +8749,11 @@ fi
+@@ -8735,7 +8734,11 @@ fi
else
@@ -65,7 +65,7 @@
fi
-@@ -8785,7 +8788,7 @@ else
+@@ -8770,7 +8773,7 @@ else
fi
@@ -74,7 +74,7 @@
# Define TCL_LIBS now that we know what DL_LIBS is.
# The trick here is that we don't want to change the value of TCL_LIBS if
-@@ -18697,9 +18700,9 @@ fi
+@@ -18744,9 +18747,9 @@ fi
# building libtcl as a shared library instead of a static library.
#--------------------------------------------------------------------
@@ -87,7 +87,7 @@
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
# since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -18812,13 +18815,10 @@ else
+@@ -18859,13 +18862,10 @@ else
eval libdir="$libdir"
# default install directory for bundled packages
PACKAGE_DIR="$libdir"
@@ -104,7 +104,7 @@
fi
VERSION='${VERSION}'
eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -18837,10 +18837,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -18884,10 +18884,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks"
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
@@ -116,7 +116,7 @@
fi
#--------------------------------------------------------------------
-@@ -18855,12 +18853,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -18902,12 +18900,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
eval "TCL_STUB_LIB_DIR=\"${libdir}\""
@@ -130,7 +130,7 @@
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}"
-@@ -19014,34 +19007,15 @@ fi
+@@ -19061,34 +19054,15 @@ fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -174,7 +174,7 @@
-@@ -19669,6 +19643,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19718,6 +19692,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