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
cvs diff -r1.116 -r1.117 pkgsrc/lang/tcl/Makefile (expand / switch to unified diff)

--- 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,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.116 2021/07/16 09:56:25 jperkin Exp $ 1# $NetBSD: Makefile,v 1.117 2021/11/16 16:24:39 adam Exp $
2 2
3DISTNAME= tcl${TCL_VERSION}-src 3DISTNAME= tcl${TCL_VERSION}-src
4PKGNAME= tcl-${TCL_VERSION} 4PKGNAME= tcl-${TCL_VERSION}
5PKGREVISION= 1 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.tcl.tk/ 9HOMEPAGE= https://www.tcl.tk/
11COMMENT= Tool Command Language, a dynamic language 10COMMENT= Tool Command Language, a dynamic language
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14.include "../../lang/tcl/Makefile.version" 13.include "../../lang/tcl/Makefile.version"
15 14
16WRKSRC= ${WRKDIR}/tcl${TCL_VERSION} 15WRKSRC= ${WRKDIR}/tcl${TCL_VERSION}
17 16
18USE_GCC_RUNTIME= yes 17USE_GCC_RUNTIME= yes
cvs diff -r1.27 -r1.28 pkgsrc/lang/tcl/Makefile.version (expand / switch to unified diff)

--- 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,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.version,v 1.27 2021/01/20 20:38:48 adam Exp $ 1# $NetBSD: Makefile.version,v 1.28 2021/11/16 16:24:39 adam Exp $
2# used by cad/xcircuit/Makefile 2# used by cad/xcircuit/Makefile
3# used by devel/tcl-tclcl/Makefile 3# used by devel/tcl-tclcl/Makefile
4# used by lang/tcl/Makefile 4# used by lang/tcl/Makefile
5# used by lang/tcl-otcl/Makefile 5# used by lang/tcl-otcl/Makefile
6# used by print/tcl-pdflib/Makefile 6# used by print/tcl-pdflib/Makefile
7 7
8TCL_SONUM= 86 8TCL_SONUM= 86
9TCL_BASEVER= 8.6 9TCL_BASEVER= 8.6
10TCL_VERSION= 8.6.11 10TCL_VERSION= 8.6.12
11 11
12# Update bundled versions in lang/tcl/buildlink3.mk 12# Update bundled versions in lang/tcl/buildlink3.mk
13ITCL_VERSION= 4.2.1 13ITCL_VERSION= 4.2.2
14SQLITE3_VERSION= 3.34.0 14SQLITE3_VERSION= 3.36.0
15TDBC_VERSION= 1.1.2 15TDBC_VERSION= 1.1.3
16THREAD_VERSION= 2.8.6 16THREAD_VERSION= 2.8.7
cvs diff -r1.28 -r1.29 pkgsrc/lang/tcl/PLIST (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.28 2021/01/20 20:38:48 adam Exp $ 1@comment $NetBSD: PLIST,v 1.29 2021/11/16 16:24:39 adam Exp $
2bin/sqlite3_analyzer 2bin/sqlite3_analyzer
3bin/tclsh 3bin/tclsh
4bin/tclsh${BASEVER} 4bin/tclsh${BASEVER}
5include/fakemysql.h 5include/fakemysql.h
6include/fakepq.h 6include/fakepq.h
7include/fakesql.h 7include/fakesql.h
8include/itcl.h 8include/itcl.h
9include/itcl2TclOO.h 9include/itcl2TclOO.h
10include/itclDecls.h 10include/itclDecls.h
11include/itclInt.h 11include/itclInt.h
12include/itclIntDecls.h 12include/itclIntDecls.h
13include/itclMigrate2TclCore.h 13include/itclMigrate2TclCore.h
14include/itclTclIntStubsFcn.h 14include/itclTclIntStubsFcn.h
@@ -60,26 +60,27 @@ lib/itcl${ITCL_VERSION}/libitcl${ITCL_VE @@ -60,26 +60,27 @@ lib/itcl${ITCL_VERSION}/libitcl${ITCL_VE
60lib/itcl${ITCL_VERSION}/libitclstub${ITCL_VERSION}.a 60lib/itcl${ITCL_VERSION}/libitclstub${ITCL_VERSION}.a
61lib/itcl${ITCL_VERSION}/pkgIndex.tcl 61lib/itcl${ITCL_VERSION}/pkgIndex.tcl
62lib/libtcl${SONUM}.a 62lib/libtcl${SONUM}.a
63lib/libtcl${SONUM}.so 63lib/libtcl${SONUM}.so
64lib/libtcl${SONUM}.so.1.0 64lib/libtcl${SONUM}.so.1.0
65lib/libtclstub${SONUM}.a 65lib/libtclstub${SONUM}.a
66lib/pkgconfig/tcl.pc 66lib/pkgconfig/tcl.pc
67lib/sqlite${SQLITE3_VERSION}/libsqlite${SQLITE3_VERSION}.so 67lib/sqlite${SQLITE3_VERSION}/libsqlite${SQLITE3_VERSION}.so
68lib/sqlite${SQLITE3_VERSION}/pkgIndex.tcl 68lib/sqlite${SQLITE3_VERSION}/pkgIndex.tcl
69lib/tcl${BASEVER}/auto.tcl 69lib/tcl${BASEVER}/auto.tcl
70lib/tcl${BASEVER}/clock.tcl 70lib/tcl${BASEVER}/clock.tcl
71lib/tcl${BASEVER}/encoding/ascii.enc 71lib/tcl${BASEVER}/encoding/ascii.enc
72lib/tcl${BASEVER}/encoding/big5.enc 72lib/tcl${BASEVER}/encoding/big5.enc
 73lib/tcl${BASEVER}/encoding/cns11643.enc
73lib/tcl${BASEVER}/encoding/cp1250.enc 74lib/tcl${BASEVER}/encoding/cp1250.enc
74lib/tcl${BASEVER}/encoding/cp1251.enc 75lib/tcl${BASEVER}/encoding/cp1251.enc
75lib/tcl${BASEVER}/encoding/cp1252.enc 76lib/tcl${BASEVER}/encoding/cp1252.enc
76lib/tcl${BASEVER}/encoding/cp1253.enc 77lib/tcl${BASEVER}/encoding/cp1253.enc
77lib/tcl${BASEVER}/encoding/cp1254.enc 78lib/tcl${BASEVER}/encoding/cp1254.enc
78lib/tcl${BASEVER}/encoding/cp1255.enc 79lib/tcl${BASEVER}/encoding/cp1255.enc
79lib/tcl${BASEVER}/encoding/cp1256.enc 80lib/tcl${BASEVER}/encoding/cp1256.enc
80lib/tcl${BASEVER}/encoding/cp1257.enc 81lib/tcl${BASEVER}/encoding/cp1257.enc
81lib/tcl${BASEVER}/encoding/cp1258.enc 82lib/tcl${BASEVER}/encoding/cp1258.enc
82lib/tcl${BASEVER}/encoding/cp437.enc 83lib/tcl${BASEVER}/encoding/cp437.enc
83lib/tcl${BASEVER}/encoding/cp737.enc 84lib/tcl${BASEVER}/encoding/cp737.enc
84lib/tcl${BASEVER}/encoding/cp775.enc 85lib/tcl${BASEVER}/encoding/cp775.enc
85lib/tcl${BASEVER}/encoding/cp850.enc 86lib/tcl${BASEVER}/encoding/cp850.enc
@@ -103,26 +104,27 @@ lib/tcl${BASEVER}/encoding/dingbats.enc @@ -103,26 +104,27 @@ lib/tcl${BASEVER}/encoding/dingbats.enc
103lib/tcl${BASEVER}/encoding/ebcdic.enc 104lib/tcl${BASEVER}/encoding/ebcdic.enc
104lib/tcl${BASEVER}/encoding/euc-cn.enc 105lib/tcl${BASEVER}/encoding/euc-cn.enc
105lib/tcl${BASEVER}/encoding/euc-jp.enc 106lib/tcl${BASEVER}/encoding/euc-jp.enc
106lib/tcl${BASEVER}/encoding/euc-kr.enc 107lib/tcl${BASEVER}/encoding/euc-kr.enc
107lib/tcl${BASEVER}/encoding/gb12345.enc 108lib/tcl${BASEVER}/encoding/gb12345.enc
108lib/tcl${BASEVER}/encoding/gb1988.enc 109lib/tcl${BASEVER}/encoding/gb1988.enc
109lib/tcl${BASEVER}/encoding/gb2312-raw.enc 110lib/tcl${BASEVER}/encoding/gb2312-raw.enc
110lib/tcl${BASEVER}/encoding/gb2312.enc 111lib/tcl${BASEVER}/encoding/gb2312.enc
111lib/tcl${BASEVER}/encoding/iso2022-jp.enc 112lib/tcl${BASEVER}/encoding/iso2022-jp.enc
112lib/tcl${BASEVER}/encoding/iso2022-kr.enc 113lib/tcl${BASEVER}/encoding/iso2022-kr.enc
113lib/tcl${BASEVER}/encoding/iso2022.enc 114lib/tcl${BASEVER}/encoding/iso2022.enc
114lib/tcl${BASEVER}/encoding/iso8859-1.enc 115lib/tcl${BASEVER}/encoding/iso8859-1.enc
115lib/tcl${BASEVER}/encoding/iso8859-10.enc 116lib/tcl${BASEVER}/encoding/iso8859-10.enc
 117lib/tcl${BASEVER}/encoding/iso8859-11.enc
116lib/tcl${BASEVER}/encoding/iso8859-13.enc 118lib/tcl${BASEVER}/encoding/iso8859-13.enc
117lib/tcl${BASEVER}/encoding/iso8859-14.enc 119lib/tcl${BASEVER}/encoding/iso8859-14.enc
118lib/tcl${BASEVER}/encoding/iso8859-15.enc 120lib/tcl${BASEVER}/encoding/iso8859-15.enc
119lib/tcl${BASEVER}/encoding/iso8859-16.enc 121lib/tcl${BASEVER}/encoding/iso8859-16.enc
120lib/tcl${BASEVER}/encoding/iso8859-2.enc 122lib/tcl${BASEVER}/encoding/iso8859-2.enc
121lib/tcl${BASEVER}/encoding/iso8859-3.enc 123lib/tcl${BASEVER}/encoding/iso8859-3.enc
122lib/tcl${BASEVER}/encoding/iso8859-4.enc 124lib/tcl${BASEVER}/encoding/iso8859-4.enc
123lib/tcl${BASEVER}/encoding/iso8859-5.enc 125lib/tcl${BASEVER}/encoding/iso8859-5.enc
124lib/tcl${BASEVER}/encoding/iso8859-6.enc 126lib/tcl${BASEVER}/encoding/iso8859-6.enc
125lib/tcl${BASEVER}/encoding/iso8859-7.enc 127lib/tcl${BASEVER}/encoding/iso8859-7.enc
126lib/tcl${BASEVER}/encoding/iso8859-8.enc 128lib/tcl${BASEVER}/encoding/iso8859-8.enc
127lib/tcl${BASEVER}/encoding/iso8859-9.enc 129lib/tcl${BASEVER}/encoding/iso8859-9.enc
128lib/tcl${BASEVER}/encoding/jis0201.enc 130lib/tcl${BASEVER}/encoding/jis0201.enc
@@ -279,39 +281,34 @@ lib/tcl${BASEVER}/msgs/vi.msg @@ -279,39 +281,34 @@ lib/tcl${BASEVER}/msgs/vi.msg
279lib/tcl${BASEVER}/msgs/zh.msg 281lib/tcl${BASEVER}/msgs/zh.msg
280lib/tcl${BASEVER}/msgs/zh_cn.msg 282lib/tcl${BASEVER}/msgs/zh_cn.msg
281lib/tcl${BASEVER}/msgs/zh_hk.msg 283lib/tcl${BASEVER}/msgs/zh_hk.msg
282lib/tcl${BASEVER}/msgs/zh_sg.msg 284lib/tcl${BASEVER}/msgs/zh_sg.msg
283lib/tcl${BASEVER}/msgs/zh_tw.msg 285lib/tcl${BASEVER}/msgs/zh_tw.msg
284lib/tcl${BASEVER}/opt0.4/optparse.tcl 286lib/tcl${BASEVER}/opt0.4/optparse.tcl
285lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl 287lib/tcl${BASEVER}/opt0.4/pkgIndex.tcl
286lib/tcl${BASEVER}/package.tcl 288lib/tcl${BASEVER}/package.tcl
287lib/tcl${BASEVER}/parray.tcl 289lib/tcl${BASEVER}/parray.tcl
288lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl 290lib/tcl${BASEVER}/platform1.0/pkgIndex.tcl
289lib/tcl${BASEVER}/platform1.0/platform.tcl 291lib/tcl${BASEVER}/platform1.0/platform.tcl
290lib/tcl${BASEVER}/safe.tcl 292lib/tcl${BASEVER}/safe.tcl
291lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl 293lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
292lib/tcl${BASEVER}/shell1.1/shell.tcl 294lib/tcl${BASEVER}/shell1.1/platform/shell.tcl
293lib/tcl${BASEVER}/tclAppInit.c 295lib/tcl${BASEVER}/tclAppInit.c
294lib/tcl${BASEVER}/tclIndex 296lib/tcl${BASEVER}/tclIndex
295lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl 297lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl
296lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl 298lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl
297lib/tcl${BASEVER}/tm.tcl 299lib/tcl${BASEVER}/tm.tcl
298lib/tcl${BASEVER}/word.tcl 300lib/tcl${BASEVER}/word.tcl
299lib/tcl8/${BASEVER}/http-2.9.5.tm 
300lib/tcl8/${BASEVER}/tdbc/sqlite3-${TDBC_VERSION}.tm 301lib/tcl8/${BASEVER}/tdbc/sqlite3-${TDBC_VERSION}.tm
301lib/tcl8/8.4/platform-1.0.15.tm 
302lib/tcl8/8.4/platform/shell-1.1.4.tm 
303lib/tcl8/8.5/msgcat-1.6.1.tm 
304lib/tcl8/8.5/tcltest-2.5.3.tm 
305lib/tclConfig.sh 302lib/tclConfig.sh
306lib/tclooConfig.sh 303lib/tclooConfig.sh
307lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so 304lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so
308lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a 305lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a
309lib/tdbc${TDBC_VERSION}/pkgIndex.tcl 306lib/tdbc${TDBC_VERSION}/pkgIndex.tcl
310lib/tdbc${TDBC_VERSION}/tdbc.tcl 307lib/tdbc${TDBC_VERSION}/tdbc.tcl
311lib/tdbc${TDBC_VERSION}/tdbcConfig.sh 308lib/tdbc${TDBC_VERSION}/tdbcConfig.sh
312lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so 309lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so
313lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl 310lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl
314lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl 311lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl
315lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so 312lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so
316lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl 313lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl
317lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl 314lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl
@@ -614,26 +611,27 @@ man/man3/Tcl_GetGlobalNamespace.3 @@ -614,26 +611,27 @@ man/man3/Tcl_GetGlobalNamespace.3
614man/man3/Tcl_GetGroupIdFromStat.3 611man/man3/Tcl_GetGroupIdFromStat.3
615man/man3/Tcl_GetHashKey.3 612man/man3/Tcl_GetHashKey.3
616man/man3/Tcl_GetHashValue.3 613man/man3/Tcl_GetHashValue.3
617man/man3/Tcl_GetHostName.3 614man/man3/Tcl_GetHostName.3
618man/man3/Tcl_GetIndexFromObj.3 615man/man3/Tcl_GetIndexFromObj.3
619man/man3/Tcl_GetIndexFromObjStruct.3 616man/man3/Tcl_GetIndexFromObjStruct.3
620man/man3/Tcl_GetInt.3 617man/man3/Tcl_GetInt.3
621man/man3/Tcl_GetIntFromObj.3 618man/man3/Tcl_GetIntFromObj.3
622man/man3/Tcl_GetInterpPath.3 619man/man3/Tcl_GetInterpPath.3
623man/man3/Tcl_GetLinkCountFromStat.3 620man/man3/Tcl_GetLinkCountFromStat.3
624man/man3/Tcl_GetLongFromObj.3 621man/man3/Tcl_GetLongFromObj.3
625man/man3/Tcl_GetMaster.3 622man/man3/Tcl_GetMaster.3
626man/man3/Tcl_GetMathFuncInfo.3 623man/man3/Tcl_GetMathFuncInfo.3
 624man/man3/Tcl_GetMemoryInfo.3
627man/man3/Tcl_GetModeFromStat.3 625man/man3/Tcl_GetModeFromStat.3
628man/man3/Tcl_GetModificationTimeFromStat.3 626man/man3/Tcl_GetModificationTimeFromStat.3
629man/man3/Tcl_GetNameOfExecutable.3 627man/man3/Tcl_GetNameOfExecutable.3
630man/man3/Tcl_GetNamespaceUnknownHandler.3 628man/man3/Tcl_GetNamespaceUnknownHandler.3
631man/man3/Tcl_GetObjResult.3 629man/man3/Tcl_GetObjResult.3
632man/man3/Tcl_GetObjType.3 630man/man3/Tcl_GetObjType.3
633man/man3/Tcl_GetObjectAsClass.3 631man/man3/Tcl_GetObjectAsClass.3
634man/man3/Tcl_GetObjectCommand.3 632man/man3/Tcl_GetObjectCommand.3
635man/man3/Tcl_GetObjectFromObj.3 633man/man3/Tcl_GetObjectFromObj.3
636man/man3/Tcl_GetObjectName.3 634man/man3/Tcl_GetObjectName.3
637man/man3/Tcl_GetObjectNamespace.3 635man/man3/Tcl_GetObjectNamespace.3
638man/man3/Tcl_GetOpenFile.3 636man/man3/Tcl_GetOpenFile.3
639man/man3/Tcl_GetParent.3 637man/man3/Tcl_GetParent.3
@@ -708,26 +706,28 @@ man/man3/Tcl_LimitTypeExceeded.3 @@ -708,26 +706,28 @@ man/man3/Tcl_LimitTypeExceeded.3
708man/man3/Tcl_LimitTypeReset.3 706man/man3/Tcl_LimitTypeReset.3
709man/man3/Tcl_LimitTypeSet.3 707man/man3/Tcl_LimitTypeSet.3
710man/man3/Tcl_LinkVar.3 708man/man3/Tcl_LinkVar.3
711man/man3/Tcl_ListMathFuncs.3 709man/man3/Tcl_ListMathFuncs.3
712man/man3/Tcl_ListObjAppendElement.3 710man/man3/Tcl_ListObjAppendElement.3
713man/man3/Tcl_ListObjAppendList.3 711man/man3/Tcl_ListObjAppendList.3
714man/man3/Tcl_ListObjGetElements.3 712man/man3/Tcl_ListObjGetElements.3
715man/man3/Tcl_ListObjIndex.3 713man/man3/Tcl_ListObjIndex.3
716man/man3/Tcl_ListObjLength.3 714man/man3/Tcl_ListObjLength.3
717man/man3/Tcl_ListObjReplace.3 715man/man3/Tcl_ListObjReplace.3
718man/man3/Tcl_LoadFile.3 716man/man3/Tcl_LoadFile.3
719man/man3/Tcl_LogCommandInfo.3 717man/man3/Tcl_LogCommandInfo.3
720man/man3/Tcl_Main.3 718man/man3/Tcl_Main.3
 719man/man3/Tcl_MainEx.3
 720man/man3/Tcl_MainExW.3
721man/man3/Tcl_MakeFileChannel.3 721man/man3/Tcl_MakeFileChannel.3
722man/man3/Tcl_MakeSafe.3 722man/man3/Tcl_MakeSafe.3
723man/man3/Tcl_MakeTcpClientChannel.3 723man/man3/Tcl_MakeTcpClientChannel.3
724man/man3/Tcl_Merge.3 724man/man3/Tcl_Merge.3
725man/man3/Tcl_MethodDeclarerClass.3 725man/man3/Tcl_MethodDeclarerClass.3
726man/man3/Tcl_MethodDeclarerObject.3 726man/man3/Tcl_MethodDeclarerObject.3
727man/man3/Tcl_MethodIsPublic.3 727man/man3/Tcl_MethodIsPublic.3
728man/man3/Tcl_MethodIsType.3 728man/man3/Tcl_MethodIsType.3
729man/man3/Tcl_MethodName.3 729man/man3/Tcl_MethodName.3
730man/man3/Tcl_MutexFinalize.3 730man/man3/Tcl_MutexFinalize.3
731man/man3/Tcl_MutexLock.3 731man/man3/Tcl_MutexLock.3
732man/man3/Tcl_MutexUnlock.3 732man/man3/Tcl_MutexUnlock.3
733man/man3/Tcl_NRAddCallback.3 733man/man3/Tcl_NRAddCallback.3
cvs diff -r1.32 -r1.33 pkgsrc/lang/tcl/buildlink3.mk (expand / switch to unified diff)

--- 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,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: buildlink3.mk,v 1.32 2020/04/16 17:07:07 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.33 2021/11/16 16:24:39 adam Exp $
2 2
3BUILDLINK_TREE+= tcl 3BUILDLINK_TREE+= tcl
4 4
5.if !defined(TCL_BUILDLINK3_MK) 5.if !defined(TCL_BUILDLINK3_MK)
6TCL_BUILDLINK3_MK:= 6TCL_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7 8BUILDLINK_API_DEPENDS.tcl+= tcl>=8.5.7
9BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.6.1nb1 9BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.6.1nb1
10BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl 10BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
11 11
12BUILDLINK_FILES.tcl+= bin/tclsh* 12BUILDLINK_FILES.tcl+= bin/tclsh*
13# 13#
14# Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't 14# Make "-ltcl" and "-ltcl8.6" resolve into "-ltcl86", so that we don't
15# need to patch so many Makefiles. 15# need to patch so many Makefiles.
16# 16#
17BUILDLINK_TRANSFORM+= l:tcl:tcl86 17BUILDLINK_TRANSFORM+= l:tcl:tcl86
18BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86 18BUILDLINK_TRANSFORM+= l:tcl8.6:tcl86
19 19
20_TOOLS_USE_PKGSRC.tclsh= yes 20_TOOLS_USE_PKGSRC.tclsh= yes
21 21
22TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh 22TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
23TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh 23TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
24# Bundled library 24# Bundled library
25ITCL_VERSION= 4.2.0 25ITCL_VERSION= 4.2.2
26TDBC_VERSION= 1.1.1 26TDBC_VERSION= 1.1.3
27 27
28.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
29.include "../../mk/dlopen.buildlink3.mk" 29.include "../../mk/dlopen.buildlink3.mk"
30.endif # TCL_BUILDLINK3_MK 30.endif # TCL_BUILDLINK3_MK
31 31
32BUILDLINK_TREE+= -tcl 32BUILDLINK_TREE+= -tcl
cvs diff -r1.81 -r1.82 pkgsrc/lang/tcl/distinfo (expand / switch to unified diff)

--- 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,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.81 2021/10/26 10:51:57 nia Exp $ 1$NetBSD: distinfo,v 1.82 2021/11/16 16:24:39 adam Exp $
2 2
3BLAKE2s (tcl8.6.11-src.tar.gz) = 943bcb17c9e06060965495dc7ea0921eb2af3639e07bc708b8676763fea64d95 3BLAKE2s (tcl8.6.12-src.tar.gz) = 1a0cbb0fcc1914b43f8b10cc0127fd3e86ae62f4bb449171664ade5621579461
4SHA512 (tcl8.6.11-src.tar.gz) = f586f393d1ded48e6a678552b1c6b13ad0ca27963e5fe2c98e81bdd5c018197032abb11810d7c7268d68291fefac6b6a046c06df2b0ddd8a720abc32353c55b2 4SHA512 (tcl8.6.12-src.tar.gz) = 15def824484309fff6831b436e33d91ab1c6b095178f427d1f58b9a04e5e676b18dfdf1d225c6ab9ec15dc233358c40789edc7daf91c5908a1837e9f337feb60
5Size (tcl8.6.11-src.tar.gz) = 10259009 bytes 5Size (tcl8.6.12-src.tar.gz) = 10353486 bytes
6SHA1 (patch-generic_tclInt.h) = f41a50e6461d0afacd1c8656944403e438ea6baf 6SHA1 (patch-generic_tclInt.h) = f41a50e6461d0afacd1c8656944403e438ea6baf
7SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e 7SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
8SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 8SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
9SHA1 (patch-pkgs_itcl4.2.1_configure) = 9e821584605ee538915365b6cc986c84a466faad 9SHA1 (patch-pkgs_itcl4.2.2_configure) = 0d3f3004e5ca4fd94d69efc2753b06626f9cd130
10SHA1 (patch-pkgs_sqlite3.34.0_Makefile.in) = 5ba6810d5b13713d98e422ba1f33f9b3c4b010b7 10SHA1 (patch-pkgs_sqlite3.36.0_Makefile.in) = d86f3b78e36be6fe3247c16df3f451aaa3117cba
11SHA1 (patch-pkgs_sqlite3.34.0_configure) = 1b6a4640ae045b159bfef7fbea5363c315845e45 11SHA1 (patch-pkgs_sqlite3.36.0_configure) = 9133647d4e665d050cf89e30f92e1e700019ee1e
12SHA1 (patch-pkgs_tdbc1.1.2_configure) = bd9879f688db73b8c9d7078ecf08db506dfb6703 12SHA1 (patch-pkgs_tdbc1.1.3_configure) = e58338a2df7278a738bd41840a5f57247189c285
13SHA1 (patch-pkgs_tdbcmysql1.1.2_configure) = fe5eb8be50574e9c619695b7cf21bda91aabb7b2 13SHA1 (patch-pkgs_tdbcmysql1.1.3_configure) = 2c131c54bb204c256e30b19724fcc6aefb076a40
14SHA1 (patch-pkgs_tdbcodbc1.1.2_configure) = 35c0f144102304e631c7bad21d98b745aca5a19d 14SHA1 (patch-pkgs_tdbcodbc1.1.3_configure) = 0dd5b4fa1e536415a7fe8c330d83e83348c93b2f
15SHA1 (patch-pkgs_tdbcpostgres1.1.2_configure) = 5ffe21c178a25723fb6c0901a153c969357b6cdb 15SHA1 (patch-pkgs_tdbcpostgres1.1.3_configure) = afc07b976b31b0ca1982e1dc908f10eb19857405
16SHA1 (patch-pkgs_thread2.8.6_configure) = 2abebd054e02f973463b1cd7f2dd7cfd7d1a462d 16SHA1 (patch-pkgs_thread2.8.7_configure) = 972e926b03505bc4d4f354f7e170e9fdbf84d478
17SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb 17SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
18SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 18SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
19SHA1 (patch-unix_Makefile.in) = cf3f3ebaaf9d73c07db44b4da5695741fc39f0ea 19SHA1 (patch-unix_Makefile.in) = a0c50c39118ec777fe61fa381cb53b71c69f1e02
20SHA1 (patch-unix_configure) = 59c5554344672eee73b309cdf679669c0cf7f677 20SHA1 (patch-unix_configure) = 2f3fae506031092cd5934b41b81c62e3d52e8576
21SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 21SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
22SHA1 (patch-unix_tclUnixCompat.c) = c5c124b5ccd240cbd34a83fd165c3dea208381cd 22SHA1 (patch-unix_tclUnixCompat.c) = c5c124b5ccd240cbd34a83fd165c3dea208381cd
23SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f 23SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
24SHA1 (patch-unix_tclUnixInit.c) = 6c4ff96d9dacbc37e02894a148144b368b8b6677 24SHA1 (patch-unix_tclUnixInit.c) = 6c4ff96d9dacbc37e02894a148144b368b8b6677
25SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7 25SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.2.1_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.34.0_Makefile.in
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.34.0_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.1.2_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.1.2_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.1.2_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.1.2_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.8.6_configure
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.2.2_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.36.0_Makefile.in
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.36.0_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.1.3_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.1.3_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.1.3_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.1.3_configure
$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
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.8.7_configure
$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
cvs diff -r1.17 -r1.18 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in (expand / switch to unified diff)

--- 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,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-unix_Makefile.in,v 1.17 2021/01/20 20:38:49 adam Exp $ 1$NetBSD: patch-unix_Makefile.in,v 1.18 2021/11/16 16:24:40 adam Exp $
2 2
3Honour LDFLAGS. 3Honour LDFLAGS.
4 4
5--- unix/Makefile.in.orig 2020-12-31 01:31:43.000000000 +0000 5--- unix/Makefile.in.orig 2021-10-29 17:08:08.000000000 +0000
6+++ unix/Makefile.in 6+++ unix/Makefile.in
7@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@ 7@@ -8,6 +8,7 @@ VERSION = @TCL_VERSION@
8 MAJOR_VERSION = @TCL_MAJOR_VERSION@ 8 MAJOR_VERSION = @TCL_MAJOR_VERSION@
9 MINOR_VERSION = @TCL_MINOR_VERSION@ 9 MINOR_VERSION = @TCL_MINOR_VERSION@
10 PATCH_LEVEL = @TCL_PATCH_LEVEL@ 10 PATCH_LEVEL = @TCL_PATCH_LEVEL@
11+SHLIB_VERSION = @SHLIB_VERSION@ 11+SHLIB_VERSION = @SHLIB_VERSION@
12  12
13 #-------------------------------------------------------------------------- 13 #--------------------------------------------------------------------------
14 # Things you can change to personalize the Makefile for your own site (you can 14 # Things you can change to personalize the Makefile for your own site (you can
15@@ -58,6 +59,8 @@ MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DI 15@@ -58,6 +59,8 @@ MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DI
16  16
17 # Directory in which to install the include file tcl.h: 17 # Directory in which to install the include file tcl.h:
18 INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) 18 INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -46,125 +46,131 @@ Honour LDFLAGS. @@ -46,125 +46,131 @@ Honour LDFLAGS.
46-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ 46-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
47+LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ @LDFLAGS@ 47+LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ @LDFLAGS@
48  48
49 # The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic loading is 49 # The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic loading is
50 # available; this causes everything in the "dltest" subdirectory to be built 50 # available; this causes everything in the "dltest" subdirectory to be built
51@@ -200,6 +203,7 @@ BUILD_DLTEST = @BUILD_DLTEST@ 51@@ -200,6 +203,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
52 #BUILD_DLTEST = 52 #BUILD_DLTEST =
53  53
54 TCL_LIB_FILE = @TCL_LIB_FILE@ 54 TCL_LIB_FILE = @TCL_LIB_FILE@
55+TCL_LIB_A_FILE = ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.a} 55+TCL_LIB_A_FILE = ${TCL_LIB_FILE:@SHLIB_SUFFIX@=.a}
56 #TCL_LIB_FILE = libtcl.a 56 #TCL_LIB_FILE = libtcl.a
57  57
58 # Generic lib name used in rules that apply to tcl and tk 58 # Generic lib name used in rules that apply to tcl and tk
59@@ -710,7 +714,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ 59@@ -711,7 +715,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
60  60
61 all: binaries libraries doc packages 61 all: binaries libraries doc packages
62  62
63-binaries: ${LIB_FILE} ${TCL_EXE} 63-binaries: ${LIB_FILE} ${TCL_EXE}
64+binaries: ${LIB_FILE} ${TCL_EXE} ${TCL_LIB_A_FILE} 64+binaries: ${LIB_FILE} ${TCL_EXE} ${TCL_LIB_A_FILE}
65  65
66 libraries: 66 libraries:
67  67
68@@ -729,6 +733,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} 68@@ -730,6 +734,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
69 rm -f $@ 69 rm -f $@
70 @MAKE_STUB_LIB@ 70 @MAKE_STUB_LIB@
71  71
72+${TCL_LIB_A_FILE}: ${OBJS} 72+${TCL_LIB_A_FILE}: ${OBJS}
73+ rm -rf $@ 73+ rm -rf $@
74+ ar cr $@ ${OBJS} 74+ ar cr $@ ${OBJS}
75+ $(RANLIB) $@ 75+ $(RANLIB) $@
76+ 76+
77 # Make target which outputs the list of the .o contained in the Tcl lib useful 77 # Make target which outputs the list of the .o contained in the Tcl lib useful
78 # to build a single big shared library containing Tcl and other extensions. 78 # to build a single big shared library containing Tcl and other extensions.
79 # Used for the Tcl Plugin. -- dl 79 # Used for the Tcl Plugin. -- dl
80@@ -891,9 +900,16 @@ install-binaries: binaries 80@@ -893,9 +902,16 @@ install-binaries: binaries
81 done; 81 done
82 @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" 82 @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
83 @@INSTALL_LIB@ 83 @@INSTALL_LIB@
84- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" 84- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
85+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \ 85+ @cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
86+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \ 86+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
87+ else \ 87+ else \
88+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \ 88+ ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX)$(SHLIB_VERSION) $(LIB_FILE) ; \
89+ fi 89+ fi
90+ @echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/" 90+ @echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
91+ @$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE} 91+ @$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
92 @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" 92 @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
93 @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" 93 @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
94+ @cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)${EXE_SUFFIX} tclsh 94+ @cd "$(BIN_INSTALL_DIR)" && ln -sf tclsh$(VERSION)${EXE_SUFFIX} tclsh
95 @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" 95 @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
96 @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" 96 @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
97 @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/" 97 @echo "Installing tclooConfig.sh to $(CONFIG_INSTALL_DIR)/"
98@@ -946,6 +962,8 @@ install-libraries: libraries 98@@ -947,23 +963,32 @@ install-libraries: libraries
99 done; 99 $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 100 done
100 @echo "Installing package http 2.9.5 as a Tcl Module"; 101 @echo "Installing package http 2.9.5 as a Tcl Module";
101 @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"; 102- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
102+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http/http.tcl"; 103+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)/http/http.tcl"
103+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/http/pkgIndex.tcl"; 104+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/http/pkgIndex.tcl";
104 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; 105 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
105 @for i in $(TOP_DIR)/library/opt/*.tcl ; \ 106 @for i in $(TOP_DIR)/library/opt/*.tcl; do \
106 do \ 107 $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
107@@ -953,13 +971,21 @@ install-libraries: libraries 108 done
108 done; 109 @echo "Installing package msgcat 1.6.1 as a Tcl Module"
109 @echo "Installing package msgcat 1.6.1 as a Tcl Module"; 110 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
110 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"; 111- "$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
111+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)/msgcat1.6/msgcat.tcl"; 112+ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/msgcat.tcl"
112+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/msgcat1.6/pkgIndex.tcl"; 113+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl \
113 @echo "Installing package tcltest 2.5.3 as a Tcl Module"; 114+ "$(SCRIPT_INSTALL_DIR)/msgcat1.6/pkgIndex.tcl";
114 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"; 115 @echo "Installing package tcltest 2.5.3 as a Tcl Module"
115+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)/tcltest2.5/tcltest.tcl"; 116 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
116+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/tcltest2.5/pkgIndex.tcl"; 117- "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"
117  118+ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/tcltest.tcl"
118 @echo "Installing package platform 1.0.15 as a Tcl Module"; 119+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl \
119 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm"; 120+ "$(SCRIPT_INSTALL_DIR)/tcltest2.5/pkgIndex.tcl";
120+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)/platform1.0/platform.tcl"; 121 @echo "Installing package platform 1.0.18 as a Tcl Module"
121+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/platform1.0/pkgIndex.tcl"; 122 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
122 @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; 123- "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"
123 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"; 124+ "$(SCRIPT_INSTALL_DIR)/platform1.0/platform.tcl"
124+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)/shell1.1/shell.tcl"; 125+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl \
125+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)/shell1.1/pkgIndex.tcl"; 126+ "$(SCRIPT_INSTALL_DIR)/platform1.0/pkgIndex.tcl";
126  127 @echo "Installing package platform::shell 1.1.4 as a Tcl Module"
127 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; 128 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
128 @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ 129- "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
129@@ -1044,7 +1070,7 @@ install-doc: doc 130+ "$(SCRIPT_INSTALL_DIR)/shell1.1/platform/shell.tcl"
 131+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl \
 132+ "$(SCRIPT_INSTALL_DIR)/shell1.1/pkgIndex.tcl";
 133 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
 134 @for i in $(TOP_DIR)/library/encoding/*.enc; do \
 135 $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
 136@@ -1039,20 +1064,24 @@ install-doc: doc
130 done 137 done
131  138
132 install-headers: 139 install-headers:
133- @for i in "$(INCLUDE_INSTALL_DIR)"; \ 140- @for i in "$(INCLUDE_INSTALL_DIR)"; do \
134+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ 141+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; do \
135 do \ 
136 if [ ! -d "$$i" ] ; then \ 142 if [ ! -d "$$i" ] ; then \
137 echo "Making directory $$i"; \ 143 echo "Making directory $$i"; \
138@@ -1053,13 +1079,17 @@ install-headers: 144 $(INSTALL_DATA_DIR) "$$i"; \
139 fi; \ 145 fi; \
140 done; 146 done
141 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; 147 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
142- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ 148- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
143- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \ 149- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
144- $(GENERIC_DIR)/tclPlatDecls.h \ 150- $(GENERIC_DIR)/tclPlatDecls.h \
145- $(GENERIC_DIR)/tclTomMath.h \ 151- $(GENERIC_DIR)/tclTomMath.h \
146- $(GENERIC_DIR)/tclTomMathDecls.h ; \ 152- $(GENERIC_DIR)/tclTomMathDecls.h ; \
147+ @for i in $(GENERIC_DIR)/*.h ; \ 153+ @for i in $(GENERIC_DIR)/*.h ; \
148+ do \ 154+ do \
149+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ 155+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
150+ done; 156+ done;
151+ @for i in $(UNIX_DIR)/*.h ; \ 157+ @for i in $(UNIX_DIR)/*.h ; \
152+ do \ 158+ do \
153+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ 159+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
154+ done; 160+ done;
155+ @for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \ 161+ @for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \
156 do \ 162 do \
157- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ 163- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
158+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \ 164+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
159 done; 165 done
160  166
161 # Optional target to install private headers 167 # Optional target to install private headers
162@@ -1817,7 +1847,7 @@ configure-packages: 168@@ -1810,7 +1839,7 @@ configure-packages:
163 mkdir -p $(PKG_DIR)/$$pkg; \ 169 mkdir -p $(PKG_DIR)/$$pkg; \
164 if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \ 170 if [ ! -f $(PKG_DIR)/$$pkg/Makefile ] ; then \
165 ( cd $(PKG_DIR)/$$pkg; \ 171 ( cd $(PKG_DIR)/$$pkg; \
166- $$i/configure --with-tcl=../.. \ 172- $$i/configure --with-tcl=../.. \
167+ $(SHELL) $$i/configure --with-tcl=../.. \ 173+ $(SHELL) $$i/configure --with-tcl=../.. \
168 --with-tclinclude=$(GENERIC_DIR) \ 174 --with-tclinclude=$(GENERIC_DIR) \
169 $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \ 175 $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
170 --enable-shared --enable-threads; ) || exit $$?; \ 176 --enable-shared --enable-threads; ) || exit $$?; \
cvs diff -r1.13 -r1.14 pkgsrc/lang/tcl/patches/patch-unix_configure (expand / switch to unified diff)

--- 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,146 +1,146 @@ @@ -1,146 +1,146 @@
1$NetBSD: patch-unix_configure,v 1.13 2021/01/20 20:38:49 adam Exp $ 1$NetBSD: patch-unix_configure,v 1.14 2021/11/16 16:24:40 adam Exp $
2 2
3--- unix/configure.orig 2020-12-31 01:31:43.000000000 +0000 3--- unix/configure.orig 2021-11-04 15:04:06.000000000 +0000
4+++ unix/configure 4+++ unix/configure
5@@ -6771,12 +6771,12 @@ fi 5@@ -6772,12 +6772,12 @@ fi
6 LD_SEARCH_FLAGS="" 6 LD_SEARCH_FLAGS=""
7 ;; 7 ;;
8 BSD/OS-4.*) 8 BSD/OS-4.*)
9- SHLIB_CFLAGS="-export-dynamic -fPIC" 9- SHLIB_CFLAGS="-export-dynamic -fPIC"
10+ SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC" 10+ SHLIB_CFLAGS="-Wl,--export-dynamic -fPIC"
11 SHLIB_LD='${CC} -shared' 11 SHLIB_LD='${CC} -shared'
12 SHLIB_SUFFIX=".so" 12 SHLIB_SUFFIX=".so"
13 DL_OBJS="tclLoadDl.o" 13 DL_OBJS="tclLoadDl.o"
14 DL_LIBS="-ldl" 14 DL_LIBS="-ldl"
15- LDFLAGS="$LDFLAGS -export-dynamic" 15- LDFLAGS="$LDFLAGS -export-dynamic"
16+ LDFLAGS="$LDFLAGS --export-dynamic" 16+ LDFLAGS="$LDFLAGS --export-dynamic"
17 CC_SEARCH_FLAGS="" 17 CC_SEARCH_FLAGS=""
18 LD_SEARCH_FLAGS="" 18 LD_SEARCH_FLAGS=""
19 ;; 19 ;;
20@@ -7447,7 +7447,7 @@ fi 20@@ -7462,7 +7462,7 @@ fi
21 CC_SEARCH_FLAGS="" 21 CC_SEARCH_FLAGS=""
22 LD_SEARCH_FLAGS="" 22 LD_SEARCH_FLAGS=""
23 ;; 23 ;;
24- OpenBSD-*) 24- OpenBSD-*)
25+ OpenBSD-*|MirBSD-*) 25+ OpenBSD-*|MirBSD-*)
26 arch=`arch -s` 26 arch=`arch -s`
27 case "$arch" in 27 case "$arch" in
28 alpha|sparc64) 28 alpha|sparc64)
29@@ -7468,7 +7468,7 @@ fi 29@@ -7483,7 +7483,7 @@ fi
30  30
31 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 31 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
32 SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' 32 SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
33- LDFLAGS="-Wl,-export-dynamic" 33- LDFLAGS="-Wl,-export-dynamic"
34+ LDFLAGS="-Wl,--export-dynamic" 34+ LDFLAGS="-Wl,--export-dynamic"
35 CFLAGS_OPTIMIZE="-O2" 35 CFLAGS_OPTIMIZE="-O2"
36 if test "${TCL_THREADS}" = "1"; then 36 if test "${TCL_THREADS}" = "1"; then
37  37
38@@ -7490,7 +7490,7 @@ fi 38@@ -7505,7 +7505,7 @@ fi
39 SHLIB_SUFFIX=".so" 39 SHLIB_SUFFIX=".so"
40 DL_OBJS="tclLoadDl.o" 40 DL_OBJS="tclLoadDl.o"
41 DL_LIBS="" 41 DL_LIBS=""
42- LDFLAGS="$LDFLAGS -export-dynamic" 42- LDFLAGS="$LDFLAGS -export-dynamic"
43+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic" 43+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
44 if test $doRpath = yes; then 44 if test $doRpath = yes; then
45  45
46 CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"' 46 CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
47@@ -7540,7 +7540,6 @@ fi 47@@ -7523,7 +7523,6 @@ fi
48 esac 48
49 ;; 49 ;;
50 Darwin-*) 50 Darwin-*)
51- CFLAGS_OPTIMIZE="-Os" 51- CFLAGS_OPTIMIZE="-Os"
52 SHLIB_CFLAGS="-fno-common" 52 SHLIB_CFLAGS="-fno-common"
53 # To avoid discrepancies between what headers configure sees during 53 # To avoid discrepancies between what headers configure sees during
54 # preprocessing tests and compiling tests, move any -isysroot and 54 # preprocessing tests and compiling tests, move any -isysroot and
55@@ -8750,7 +8749,11 @@ fi 55@@ -8735,7 +8734,11 @@ fi
56  56
57 else 57 else
58  58
59- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' 59- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
60+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then 60+ if test "${SHLIB_SUFFIX}" = ".dylib" ; then
61+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"' 61+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
62+ else 62+ else
63+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"' 63+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"'
64+ fi 64+ fi
65  65
66 fi 66 fi
67  67
68@@ -8785,7 +8788,7 @@ else 68@@ -8770,7 +8773,7 @@ else
69  69
70 fi 70 fi
71  71
72- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' 72- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
73+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"' 73+ INSTALL_STUB_LIB='$(INSTALL_DATA) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
74  74
75 # Define TCL_LIBS now that we know what DL_LIBS is. 75 # Define TCL_LIBS now that we know what DL_LIBS is.
76 # The trick here is that we don't want to change the value of TCL_LIBS if 76 # The trick here is that we don't want to change the value of TCL_LIBS if
77@@ -18697,9 +18700,9 @@ fi 77@@ -18744,9 +18747,9 @@ fi
78 # building libtcl as a shared library instead of a static library. 78 # building libtcl as a shared library instead of a static library.
79 #-------------------------------------------------------------------- 79 #--------------------------------------------------------------------
80  80
81-TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} 81-TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
82-TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX} 82-TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
83-eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 83-eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
84+TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a 84+TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a
85+TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX} 85+TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX}
86+eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}" 86+eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
87  87
88 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed 88 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
89 # since on some platforms TCL_LIB_FILE contains shell escapes. 89 # since on some platforms TCL_LIB_FILE contains shell escapes.
90@@ -18812,13 +18815,10 @@ else 90@@ -18859,13 +18862,10 @@ else
91 eval libdir="$libdir" 91 eval libdir="$libdir"
92 # default install directory for bundled packages 92 # default install directory for bundled packages
93 PACKAGE_DIR="$libdir" 93 PACKAGE_DIR="$libdir"
94- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 94- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
95- TCL_LIB_FLAG="-ltcl${TCL_VERSION}" 95- TCL_LIB_FLAG="-ltcl${TCL_VERSION}"
96- else 96- else
97- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" 97- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
98- fi 98- fi
99+ TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 99+ TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
100 TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" 100 TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
101- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" 101- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
102+ TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}" 102+ TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}"
103+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}" 103+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
104 fi 104 fi
105 VERSION='${VERSION}' 105 VERSION='${VERSION}'
106 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}" 106 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
107@@ -18837,10 +18837,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then 107@@ -18884,10 +18884,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
108 TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks" 108 TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl ~/Library/Frameworks /Library/Frameworks"
109 test -z "$TCL_MODULE_PATH" && \ 109 test -z "$TCL_MODULE_PATH" && \
110 TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" 110 TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
111-elif test "$prefix/lib" != "$libdir"; then 111-elif test "$prefix/lib" != "$libdir"; then
112- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}" 112- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
113 else 113 else
114- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}" 114- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
115+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib" 115+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
116 fi 116 fi
117  117
118 #-------------------------------------------------------------------- 118 #--------------------------------------------------------------------
119@@ -18855,12 +18853,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ 119@@ -18902,12 +18900,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
120 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" 120 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
121 eval "TCL_STUB_LIB_DIR=\"${libdir}\"" 121 eval "TCL_STUB_LIB_DIR=\"${libdir}\""
122  122
123-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 123-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
124- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" 124- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
125-else 125-else
126- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`" 126- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
127-fi 127-fi
128- 128-
129+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 129+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
130 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}" 130 TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
131 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" 131 TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
132 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 132 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
133@@ -19014,34 +19007,15 @@ fi 133@@ -19061,34 +19054,15 @@ fi
134 # Transform confdefs.h into DEFS. 134 # Transform confdefs.h into DEFS.
135 # Protect against shell expansion while executing Makefile rules. 135 # Protect against shell expansion while executing Makefile rules.
136 # Protect against Makefile macro expansion. 136 # Protect against Makefile macro expansion.
137-# 137-#
138-# If the first sed substitution is executed (which looks for macros that 138-# If the first sed substitution is executed (which looks for macros that
139-# take arguments), then we branch to the quote section. Otherwise, 139-# take arguments), then we branch to the quote section. Otherwise,
140-# look for a macro that doesn't take arguments. 140-# look for a macro that doesn't take arguments.
141-cat >confdef2opt.sed <<\_ACEOF 141-cat >confdef2opt.sed <<\_ACEOF
142-t clear 142-t clear
143-: clear 143-: clear
144-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g 144-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
145-t quote 145-t quote
146-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g 146-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
@@ -164,21 +164,21 @@ $NetBSD: patch-unix_configure,v 1.13 202 @@ -164,21 +164,21 @@ $NetBSD: patch-unix_configure,v 1.13 202
164-rm -f confdef2opt.sed 164-rm -f confdef2opt.sed
165+cat > conftest.defs <<\EOF 165+cat > conftest.defs <<\EOF
166+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g 166+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
167+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g 167+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
168+s%\[%\\&%g 168+s%\[%\\&%g
169+s%\]%\\&%g 169+s%\]%\\&%g
170+s%\$%$$%g 170+s%\$%$$%g
171+EOF 171+EOF
172+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` 172+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
173+rm -f conftest.defs 173+rm -f conftest.defs
174  174
175  175
176  176
177@@ -19669,6 +19643,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; 177@@ -19718,6 +19692,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
178 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t 178 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
179 s,@DLTEST_LD@,$DLTEST_LD,;t t 179 s,@DLTEST_LD@,$DLTEST_LD,;t t
180 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t 180 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
181+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t 181+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
182 CEOF 182 CEOF
183  183
184 _ACEOF 184 _ACEOF