Thu Apr 16 17:07:07 2020 UTC ()
tcl/tk: updated to 8.6.10

Changes in Tcl/Tk 8.6.10

Tcl Changes
New unsupported commands
tcl::unsupported::timerate
tcl::unsupported::corotype

Tk Changes

New Commands
tk::mac::PerformService
tk::mac::LaunchURL
tk::mac::GetAppPath
tk::mac::PrintDocument

Expanded Syntax / New Options
menubutton post x y index
combobox current end

Updated packages
http 2.9.1
Itcl 4.2.0
Thread 2.8.5
sqlite 3.30.1
tdbc 1.1.1


(adam)
diff -r1.109 -r1.110 pkgsrc/lang/tcl/Makefile
diff -r1.25 -r1.26 pkgsrc/lang/tcl/Makefile.version
diff -r1.25 -r1.26 pkgsrc/lang/tcl/PLIST
diff -r1.31 -r1.32 pkgsrc/lang/tcl/buildlink3.mk
diff -r1.77 -r1.78 pkgsrc/lang/tcl/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/tcl/patches/patch-generic_tclInt.h
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.1.2_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.0_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure
diff -r1.1 -r0 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.4_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_itcl4.2.0_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_Makefile.in
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_sqlite3.30.1.2_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbc1.1.1_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.1_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.1_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.1_configure
diff -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-pkgs_thread2.8.5_configure
diff -r1.15 -r1.16 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in
diff -r1.11 -r1.12 pkgsrc/lang/tcl/patches/patch-unix_configure
diff -r1.86 -r1.87 pkgsrc/x11/tk/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/tk/Makefile.version
diff -r1.17 -r1.18 pkgsrc/x11/tk/PLIST
diff -r1.54 -r1.55 pkgsrc/x11/tk/distinfo
cvs diff -r1.109 -r1.110 pkgsrc/lang/tcl/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile 2020/04/12 08:28:55 1.109
+++ pkgsrc/lang/tcl/Makefile 2020/04/16 17:07:07 1.110
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.109 2020/04/12 08:28:55 adam Exp $ 1# $NetBSD: Makefile,v 1.110 2020/04/16 17:07:07 adam Exp $
2 2
3DISTNAME= tcl${TCL_VERSION}-src 3DISTNAME= tcl${TCL_VERSION}-src
4PKGNAME= tcl-${TCL_VERSION} 4PKGNAME= tcl-${TCL_VERSION}
5PKGREVISION= 3 
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.25 -r1.26 pkgsrc/lang/tcl/Makefile.version (expand / switch to unified diff)

--- pkgsrc/lang/tcl/Makefile.version 2019/11/03 19:04:09 1.25
+++ pkgsrc/lang/tcl/Makefile.version 2020/04/16 17:07:07 1.26
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.version,v 1.25 2019/11/03 19:04:09 rillig Exp $ 1# $NetBSD: Makefile.version,v 1.26 2020/04/16 17:07:07 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.9 10TCL_VERSION= 8.6.10
11 11
12# Update bundled versions in lang/tcl/buildlink3.mk 12# Update bundled versions in lang/tcl/buildlink3.mk
13ITCL_VERSION= 4.1.2 13ITCL_VERSION= 4.2.0
14SQLITE3_VERSION= 3.25.3 14SQLITE3_VERSION= 3.30.1.2
15TDBC_VERSION= 1.1.0 15TDBC_VERSION= 1.1.1
16THREAD_VERSION= 2.8.4 16THREAD_VERSION= 2.8.5
cvs diff -r1.25 -r1.26 pkgsrc/lang/tcl/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/tcl/PLIST 2018/12/09 18:33:55 1.25
+++ pkgsrc/lang/tcl/PLIST 2020/04/16 17:07:07 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.25 2018/12/09 18:33:55 adam Exp $ 1@comment $NetBSD: PLIST,v 1.26 2020/04/16 17:07:07 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
@@ -289,49 +289,52 @@ lib/tcl${BASEVER}/platform1.0/pkgIndex.t @@ -289,49 +289,52 @@ lib/tcl${BASEVER}/platform1.0/pkgIndex.t
289lib/tcl${BASEVER}/platform1.0/platform.tcl 289lib/tcl${BASEVER}/platform1.0/platform.tcl
290lib/tcl${BASEVER}/safe.tcl 290lib/tcl${BASEVER}/safe.tcl
291lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl 291lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl
292lib/tcl${BASEVER}/shell1.1/shell.tcl 292lib/tcl${BASEVER}/shell1.1/shell.tcl
293lib/tcl${BASEVER}/tclAppInit.c 293lib/tcl${BASEVER}/tclAppInit.c
294lib/tcl${BASEVER}/tclIndex 294lib/tcl${BASEVER}/tclIndex
295lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl 295lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl
296lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl 296lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl
297lib/tcl${BASEVER}/tm.tcl 297lib/tcl${BASEVER}/tm.tcl
298lib/tcl${BASEVER}/word.tcl 298lib/tcl${BASEVER}/word.tcl
299lib/tcl8/8.4/platform-1.0.14.tm 299lib/tcl8/8.4/platform-1.0.14.tm
300lib/tcl8/8.4/platform/shell-1.1.4.tm 300lib/tcl8/8.4/platform/shell-1.1.4.tm
301lib/tcl8/8.5/msgcat-1.6.1.tm 301lib/tcl8/8.5/msgcat-1.6.1.tm
302lib/tcl8/8.5/tcltest-2.5.0.tm 302lib/tcl8/8.5/tcltest-2.5.1.tm
303lib/tcl8/8.6/http-2.9.0.tm 303lib/tcl8/8.6/http-2.9.1.tm
304lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm 304lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm
305lib/tclConfig.sh 305lib/tclConfig.sh
306lib/tclooConfig.sh 306lib/tclooConfig.sh
307lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so 307lib/tdbc${TDBC_VERSION}/libtdbc${TDBC_VERSION}.so
308lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a 308lib/tdbc${TDBC_VERSION}/libtdbcstub${TDBC_VERSION}.a
309lib/tdbc${TDBC_VERSION}/pkgIndex.tcl 309lib/tdbc${TDBC_VERSION}/pkgIndex.tcl
310lib/tdbc${TDBC_VERSION}/tdbc.tcl 310lib/tdbc${TDBC_VERSION}/tdbc.tcl
311lib/tdbc${TDBC_VERSION}/tdbcConfig.sh 311lib/tdbc${TDBC_VERSION}/tdbcConfig.sh
312lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so 312lib/tdbcmysql${TDBC_VERSION}/libtdbcmysql${TDBC_VERSION}.so
313lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl 313lib/tdbcmysql${TDBC_VERSION}/pkgIndex.tcl
314lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl 314lib/tdbcmysql${TDBC_VERSION}/tdbcmysql.tcl
315lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so 315lib/tdbcodbc${TDBC_VERSION}/libtdbcodbc${TDBC_VERSION}.so
316lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl 316lib/tdbcodbc${TDBC_VERSION}/pkgIndex.tcl
317lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl 317lib/tdbcodbc${TDBC_VERSION}/tdbcodbc.tcl
318lib/tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.so 318lib/tdbcpostgres${TDBC_VERSION}/libtdbcpostgres${TDBC_VERSION}.so
319lib/tdbcpostgres${TDBC_VERSION}/pkgIndex.tcl 319lib/tdbcpostgres${TDBC_VERSION}/pkgIndex.tcl
320lib/tdbcpostgres${TDBC_VERSION}/tdbcpostgres.tcl 320lib/tdbcpostgres${TDBC_VERSION}/tdbcpostgres.tcl
321lib/thread${THREAD_VERSION}/libthread${THREAD_VERSION}.so 321lib/thread${THREAD_VERSION}/libthread${THREAD_VERSION}.so
322lib/thread${THREAD_VERSION}/pkgIndex.tcl 322lib/thread${THREAD_VERSION}/pkgIndex.tcl
323lib/thread${THREAD_VERSION}/ttrace.tcl 323lib/thread${THREAD_VERSION}/ttrace.tcl
324man/man1/tclsh.1 324man/man1/tclsh.1
 325man/man3/DString.3
 326man/man3/Notifier.3
 327man/man3/RegExp.3
325man/man3/TCL_MEM_DEBUG.3 328man/man3/TCL_MEM_DEBUG.3
326man/man3/Tcl_Access.3 329man/man3/Tcl_Access.3
327man/man3/Tcl_AddErrorInfo.3 330man/man3/Tcl_AddErrorInfo.3
328man/man3/Tcl_AddObjErrorInfo.3 331man/man3/Tcl_AddObjErrorInfo.3
329man/man3/Tcl_AlertNotifier.3 332man/man3/Tcl_AlertNotifier.3
330man/man3/Tcl_Alloc.3 333man/man3/Tcl_Alloc.3
331man/man3/Tcl_AllocStatBuf.3 334man/man3/Tcl_AllocStatBuf.3
332man/man3/Tcl_AllowExceptions.3 335man/man3/Tcl_AllowExceptions.3
333man/man3/Tcl_AppInit.3 336man/man3/Tcl_AppInit.3
334man/man3/Tcl_AppendAllObjTypes.3 337man/man3/Tcl_AppendAllObjTypes.3
335man/man3/Tcl_AppendElement.3 338man/man3/Tcl_AppendElement.3
336man/man3/Tcl_AppendExportList.3 339man/man3/Tcl_AppendExportList.3
337man/man3/Tcl_AppendFormatToObj.3 340man/man3/Tcl_AppendFormatToObj.3
@@ -960,26 +963,27 @@ man/man3/Tcl_WriteRaw.3 @@ -960,26 +963,27 @@ man/man3/Tcl_WriteRaw.3
960man/man3/Tcl_WrongNumArgs.3 963man/man3/Tcl_WrongNumArgs.3
961man/man3/Tcl_ZlibAdler32.3 964man/man3/Tcl_ZlibAdler32.3
962man/man3/Tcl_ZlibCRC32.3 965man/man3/Tcl_ZlibCRC32.3
963man/man3/Tcl_ZlibDeflate.3 966man/man3/Tcl_ZlibDeflate.3
964man/man3/Tcl_ZlibInflate.3 967man/man3/Tcl_ZlibInflate.3
965man/man3/Tcl_ZlibStreamChecksum.3 968man/man3/Tcl_ZlibStreamChecksum.3
966man/man3/Tcl_ZlibStreamClose.3 969man/man3/Tcl_ZlibStreamClose.3
967man/man3/Tcl_ZlibStreamEof.3 970man/man3/Tcl_ZlibStreamEof.3
968man/man3/Tcl_ZlibStreamGet.3 971man/man3/Tcl_ZlibStreamGet.3
969man/man3/Tcl_ZlibStreamGetCommandName.3 972man/man3/Tcl_ZlibStreamGetCommandName.3
970man/man3/Tcl_ZlibStreamInit.3 973man/man3/Tcl_ZlibStreamInit.3
971man/man3/Tcl_ZlibStreamPut.3 974man/man3/Tcl_ZlibStreamPut.3
972man/man3/Tdbc_Init.3 975man/man3/Tdbc_Init.3
 976man/man3/Thread.3
973man/man3/attemptckalloc.3 977man/man3/attemptckalloc.3
974man/man3/attemptckrealloc.3 978man/man3/attemptckrealloc.3
975man/man3/ckalloc.3 979man/man3/ckalloc.3
976man/man3/ckfree.3 980man/man3/ckfree.3
977man/man3/ckrealloc.3 981man/man3/ckrealloc.3
978man/mann/Tcl.n 982man/mann/Tcl.n
979man/mann/after.n 983man/mann/after.n
980man/mann/append.n 984man/mann/append.n
981man/mann/apply.n 985man/mann/apply.n
982man/mann/argc.n 986man/mann/argc.n
983man/mann/argv.n 987man/mann/argv.n
984man/mann/argv0.n 988man/mann/argv0.n
985man/mann/array.n 989man/mann/array.n
@@ -1041,26 +1045,27 @@ man/mann/incr.n @@ -1041,26 +1045,27 @@ man/mann/incr.n
1041man/mann/info.n 1045man/mann/info.n
1042man/mann/interp.n 1046man/mann/interp.n
1043man/mann/is.n 1047man/mann/is.n
1044man/mann/itcl.n 1048man/mann/itcl.n
1045man/mann/itclcomponent.n 1049man/mann/itclcomponent.n
1046man/mann/itcldelegate.n 1050man/mann/itcldelegate.n
1047man/mann/itclextendedclass.n 1051man/mann/itclextendedclass.n
1048man/mann/itcloption.n 1052man/mann/itcloption.n
1049man/mann/itclvars.n 1053man/mann/itclvars.n
1050man/mann/itclwidget.n 1054man/mann/itclwidget.n
1051man/mann/join.n 1055man/mann/join.n
1052man/mann/lappend.n 1056man/mann/lappend.n
1053man/mann/lassign.n 1057man/mann/lassign.n
 1058man/mann/library.n
1054man/mann/lindex.n 1059man/mann/lindex.n
1055man/mann/linsert.n 1060man/mann/linsert.n
1056man/mann/list.n 1061man/mann/list.n
1057man/mann/llength.n 1062man/mann/llength.n
1058man/mann/lmap.n 1063man/mann/lmap.n
1059man/mann/load.n 1064man/mann/load.n
1060man/mann/local.n 1065man/mann/local.n
1061man/mann/lrange.n 1066man/mann/lrange.n
1062man/mann/lrepeat.n 1067man/mann/lrepeat.n
1063man/mann/lreplace.n 1068man/mann/lreplace.n
1064man/mann/lreverse.n 1069man/mann/lreverse.n
1065man/mann/lsearch.n 1070man/mann/lsearch.n
1066man/mann/lset.n 1071man/mann/lset.n
@@ -1070,28 +1075,30 @@ man/mann/mathop.n @@ -1070,28 +1075,30 @@ man/mann/mathop.n
1070man/mann/memory.n 1075man/mann/memory.n
1071man/mann/msgcat.n 1076man/mann/msgcat.n
1072man/mann/my.n 1077man/mann/my.n
1073man/mann/namespace.n 1078man/mann/namespace.n
1074man/mann/next.n 1079man/mann/next.n
1075man/mann/nextto.n 1080man/mann/nextto.n
1076man/mann/oo_class.n 1081man/mann/oo_class.n
1077man/mann/oo_copy.n 1082man/mann/oo_copy.n
1078man/mann/oo_define.n 1083man/mann/oo_define.n
1079man/mann/oo_objdefine.n 1084man/mann/oo_objdefine.n
1080man/mann/oo_object.n 1085man/mann/oo_object.n
1081man/mann/open.n 1086man/mann/open.n
1082man/mann/package.n 1087man/mann/package.n
 1088man/mann/packagens.n
1083man/mann/parray.n 1089man/mann/parray.n
1084man/mann/pid.n 1090man/mann/pid.n
 1091man/mann/pkgMkIndex.n
1085man/mann/pkg_create.n 1092man/mann/pkg_create.n
1086man/mann/pkg_mkIndex.n 1093man/mann/pkg_mkIndex.n
1087man/mann/platform.n 1094man/mann/platform.n
1088man/mann/platform_shell.n 1095man/mann/platform_shell.n
1089man/mann/proc.n 1096man/mann/proc.n
1090man/mann/puts.n 1097man/mann/puts.n
1091man/mann/pwd.n 1098man/mann/pwd.n
1092man/mann/re_syntax.n 1099man/mann/re_syntax.n
1093man/mann/read.n 1100man/mann/read.n
1094man/mann/refchan.n 1101man/mann/refchan.n
1095man/mann/regexp.n 1102man/mann/regexp.n
1096man/mann/registry.n 1103man/mann/registry.n
1097man/mann/regsub.n 1104man/mann/regsub.n
@@ -1135,26 +1142,27 @@ man/mann/tdbc.n @@ -1135,26 +1142,27 @@ man/mann/tdbc.n
1135man/mann/tdbc_connection.n 1142man/mann/tdbc_connection.n
1136man/mann/tdbc_mapSqlState.n 1143man/mann/tdbc_mapSqlState.n
1137man/mann/tdbc_mysql.n 1144man/mann/tdbc_mysql.n
1138man/mann/tdbc_odbc.n 1145man/mann/tdbc_odbc.n
1139man/mann/tdbc_postgres.n 1146man/mann/tdbc_postgres.n
1140man/mann/tdbc_resultset.n 1147man/mann/tdbc_resultset.n
1141man/mann/tdbc_sqlite3.n 1148man/mann/tdbc_sqlite3.n
1142man/mann/tdbc_statement.n 1149man/mann/tdbc_statement.n
1143man/mann/tdbc_tokenize.n 1150man/mann/tdbc_tokenize.n
1144man/mann/tell.n 1151man/mann/tell.n
1145man/mann/thread.n 1152man/mann/thread.n
1146man/mann/throw.n 1153man/mann/throw.n
1147man/mann/time.n 1154man/mann/time.n
 1155man/mann/timerate.n
1148man/mann/tm.n 1156man/mann/tm.n
1149man/mann/tpool.n 1157man/mann/tpool.n
1150man/mann/trace.n 1158man/mann/trace.n
1151man/mann/transchan.n 1159man/mann/transchan.n
1152man/mann/try.n 1160man/mann/try.n
1153man/mann/tsv.n 1161man/mann/tsv.n
1154man/mann/ttrace.n 1162man/mann/ttrace.n
1155man/mann/unknown.n 1163man/mann/unknown.n
1156man/mann/unload.n 1164man/mann/unload.n
1157man/mann/unset.n 1165man/mann/unset.n
1158man/mann/update.n 1166man/mann/update.n
1159man/mann/uplevel.n 1167man/mann/uplevel.n
1160man/mann/upvar.n 1168man/mann/upvar.n
cvs diff -r1.31 -r1.32 pkgsrc/lang/tcl/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/tcl/buildlink3.mk 2018/12/09 18:33:55 1.31
+++ pkgsrc/lang/tcl/buildlink3.mk 2020/04/16 17:07:07 1.32
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: buildlink3.mk,v 1.31 2018/12/09 18:33:55 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.32 2020/04/16 17:07:07 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.1.2 25ITCL_VERSION= 4.2.0
26TDBC_VERSION= 1.1.0 26TDBC_VERSION= 1.1.1
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.77 -r1.78 pkgsrc/lang/tcl/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/tcl/distinfo 2018/12/09 18:33:55 1.77
+++ pkgsrc/lang/tcl/distinfo 2020/04/16 17:07:07 1.78
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.77 2018/12/09 18:33:55 adam Exp $ 1$NetBSD: distinfo,v 1.78 2020/04/16 17:07:07 adam Exp $
2 2
3SHA1 (tcl8.6.9-src.tar.gz) = 861c5c8bbce9eda892c5e63b6035e09fad90a25f 3SHA1 (tcl8.6.10-src.tar.gz) = 0ba1dcc40db79749c322258781879a3c17093295
4RMD160 (tcl8.6.9-src.tar.gz) = 73d064888101ab3a4a832bd9b242937e5f26315c 4RMD160 (tcl8.6.10-src.tar.gz) = e44c76e48b77c825dc6fb7a78ef8f7297106784a
5SHA512 (tcl8.6.9-src.tar.gz) = 707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112 5SHA512 (tcl8.6.10-src.tar.gz) = c89b886e483320a284033de51b5363758ef4748d6248ae73eb8e90fbe76c180395f485135ca9bf1246dd567159a77ffc1e8cb537bc2fc4a09b01448928d0afd7
6Size (tcl8.6.9-src.tar.gz) = 10000896 bytes 6Size (tcl8.6.10-src.tar.gz) = 10144235 bytes
7SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22 7SHA1 (patch-generic_tclInt.h) = f41a50e6461d0afacd1c8656944403e438ea6baf
8SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e 8SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
9SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 9SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
10SHA1 (patch-pkgs_itcl4.1.2_configure) = 508efecf058cfd10cc1c815fa948616ee248d6ef 10SHA1 (patch-pkgs_itcl4.2.0_configure) = e84e707c48094f120cc600b660d4370c22a03de7
11SHA1 (patch-pkgs_sqlite3.25.3_Makefile.in) = 985bef7d2d6d8b96a9dd8072a3194620dc32b495 11SHA1 (patch-pkgs_sqlite3.30.1.2_Makefile.in) = 3e7035f0949007ffd27db3a7ae2632d9f1469aed
12SHA1 (patch-pkgs_sqlite3.25.3_configure) = 98dd6187eb3317d1c486f439fe889160a13415ef 12SHA1 (patch-pkgs_sqlite3.30.1.2_configure) = f0ec2cea5b80c624108a30435fb32662426b96c1
13SHA1 (patch-pkgs_tdbc1.1.0_configure) = ba65923172774dcd80151aa507a5633c8b7df3ba 13SHA1 (patch-pkgs_tdbc1.1.1_configure) = 6a8ca5f4a18d69a2838ae56133eab263c7579d14
14SHA1 (patch-pkgs_tdbcmysql1.1.0_configure) = 6cc5957be85cfca9df7b75dc7a932256d283d3dc 14SHA1 (patch-pkgs_tdbcmysql1.1.1_configure) = 2b82599a4fcd2114c815ef9583cb66130f06ba34
15SHA1 (patch-pkgs_tdbcodbc1.1.0_configure) = a082e2b0cd424bc19a3253a8ead2cd0ead9fb568 15SHA1 (patch-pkgs_tdbcodbc1.1.1_configure) = 5c0b4e2adf39c6c6a9488d1aab80768cf8bee489
16SHA1 (patch-pkgs_tdbcpostgres1.1.0_configure) = 6693bad209d40d8909eb35a08f93a6bbcb63d2c1 16SHA1 (patch-pkgs_tdbcpostgres1.1.1_configure) = dcecad9c96bd0f52cb4fc89228621b55495f7b79
17SHA1 (patch-pkgs_thread2.8.4_configure) = 5a02414b95cd7a41ff3d6be181e9cf1fe573cf13 17SHA1 (patch-pkgs_thread2.8.5_configure) = 0f11827bea5ca7f6419289a0b1cfa17843a184ee
18SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb 18SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
19SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 19SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
20SHA1 (patch-unix_Makefile.in) = a67bf7793579c80d363a62ef2efa6ed4ee1e2cbd 20SHA1 (patch-unix_Makefile.in) = ec1cd7d020502bfc3ff41b2652602fe9500a97f3
21SHA1 (patch-unix_configure) = f5b281877a6a40db1c1850be98819ff6612b16ce 21SHA1 (patch-unix_configure) = 94b3a54fb4e15022f2fb966f942fd7f32b370d32
22SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 22SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
23SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e 23SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e
24SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f 24SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
25SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88 25SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
26SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7 26SHA1 (patch-unix_tclUnixPort.h) = 9eff7a5d5842fe208b467fd2ad844192e2e6aec7
cvs diff -r1.2 -r1.3 pkgsrc/lang/tcl/patches/patch-generic_tclInt.h (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-generic_tclInt.h 2016/09/03 11:58:01 1.2
+++ pkgsrc/lang/tcl/patches/patch-generic_tclInt.h 2020/04/16 17:07:07 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-generic_tclInt.h,v 1.2 2016/09/03 11:58:01 adam Exp $ 1$NetBSD: patch-generic_tclInt.h,v 1.3 2020/04/16 17:07:07 adam Exp $
2 2
3--- generic/tclInt.h.orig 2016-07-11 11:51:23.000000000 +0000 3--- generic/tclInt.h.orig 2019-11-13 17:57:08.000000000 +0000
4+++ generic/tclInt.h 4+++ generic/tclInt.h
5@@ -38,16 +38,8 @@ 5@@ -38,16 +38,8 @@
6 #include <stdio.h> 6 #include <stdio.h>
7  7
8 #include <ctype.h> 8 #include <ctype.h>
9-#ifdef NO_STDLIB_H 9-#ifdef NO_STDLIB_H
10-# include "../compat/stdlib.h" 10-# include "../compat/stdlib.h"
11-#else 11-#else
12 # include <stdlib.h> 12 # include <stdlib.h>
13-#endif 13-#endif
14-#ifdef NO_STRING_H 14-#ifdef NO_STRING_H
15-#include "../compat/string.h" 15-#include "../compat/string.h"
16-#else 16-#else
17 #include <string.h> 17 #include <string.h>
18-#endif 18-#endif
19 #if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \ 19 #if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
20 || defined(__cplusplus) || defined(_MSC_VER) 20 || defined(__cplusplus) || defined(_MSC_VER) || defined(__ICC)
21 #include <stddef.h> 21 #include <stddef.h>
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.1.2_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.25.3_Makefile.in
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.25.3_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.1.0_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.1.0_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.1.0_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.1.0_configure
File Deleted: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.8.4_configure
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_itcl4.2.0_configure
$NetBSD: patch-pkgs_itcl4.2.0_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/itcl4.2.0/configure.orig	2019-11-20 16:38:54.000000000 +0000
+++ pkgs/itcl4.2.0/configure
@@ -6920,20 +6920,18 @@ 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"
 	    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; then :
@@ -6965,10 +6963,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_sqlite3.30.1.2_Makefile.in
$NetBSD: patch-pkgs_sqlite3.30.1.2_Makefile.in,v 1.1 2020/04/16 17:07:07 adam Exp $

Fix building with system sqlite3.

--- pkgs/sqlite3.30.1.2/Makefile.in.orig	2016-01-07 15:38:22.000000000 +0000
+++ pkgs/sqlite3.30.1.2/Makefile.in
@@ -150,7 +150,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.30.1.2_configure
$NetBSD: patch-pkgs_sqlite3.30.1.2_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/sqlite3.30.1.2/configure.orig	2019-11-21 19:01:58.000000000 +0000
+++ pkgs/sqlite3.30.1.2/configure
@@ -6876,20 +6876,18 @@ 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"
 	    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; then :
@@ -6921,10 +6919,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbc1.1.1_configure
$NetBSD: patch-pkgs_tdbc1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/tdbc1.1.1/configure.orig	2019-11-20 16:33:00.000000000 +0000
+++ pkgs/tdbc1.1.1/configure
@@ -7034,20 +7034,18 @@ 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"
 	    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; then :
@@ -7079,10 +7077,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcmysql1.1.1_configure
$NetBSD: patch-pkgs_tdbcmysql1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/tdbcmysql1.1.1/configure.orig	2019-11-20 16:33:39.000000000 +0000
+++ pkgs/tdbcmysql1.1.1/configure
@@ -7378,20 +7378,18 @@ 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"
 	    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; then :
@@ -7423,10 +7421,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcodbc1.1.1_configure
$NetBSD: patch-pkgs_tdbcodbc1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/tdbcodbc1.1.1/configure.orig	2019-11-20 16:34:11.000000000 +0000
+++ pkgs/tdbcodbc1.1.1/configure
@@ -7378,20 +7378,18 @@ 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"
 	    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; then :
@@ -7423,10 +7421,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_tdbcpostgres1.1.1_configure
$NetBSD: patch-pkgs_tdbcpostgres1.1.1_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/tdbcpostgres1.1.1/configure.orig	2019-11-20 16:34:44.000000000 +0000
+++ pkgs/tdbcpostgres1.1.1/configure
@@ -7378,20 +7378,18 @@ 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"
 	    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; then :
@@ -7423,10 +7421,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
File Added: pkgsrc/lang/tcl/patches/Attic/patch-pkgs_thread2.8.5_configure
$NetBSD: patch-pkgs_thread2.8.5_configure,v 1.1 2020/04/16 17:07:07 adam Exp $

Honor LDFLAGS on NetBSD.
https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e

--- pkgs/thread2.8.5/configure.orig	2019-11-20 16:36:54.000000000 +0000
+++ pkgs/thread2.8.5/configure
@@ -6934,20 +6934,18 @@ 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"
 	    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; then :
@@ -6979,10 +6977,6 @@ fi
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-		TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
cvs diff -r1.15 -r1.16 pkgsrc/lang/tcl/patches/patch-unix_Makefile.in (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2018/12/09 18:33:55 1.15
+++ pkgsrc/lang/tcl/patches/patch-unix_Makefile.in 2020/04/16 17:07:07 1.16
@@ -1,179 +1,179 @@ @@ -1,179 +1,179 @@
1$NetBSD: patch-unix_Makefile.in,v 1.15 2018/12/09 18:33:55 adam Exp $ 1$NetBSD: patch-unix_Makefile.in,v 1.16 2020/04/16 17:07:07 adam Exp $
2 2
3Honour LDFLAGS. 3Honour LDFLAGS.
4 4
5--- unix/Makefile.in.orig 2017-12-21 18:16:25.000000000 +0000 5--- unix/Makefile.in.orig 2019-11-21 19:10:50.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@@ -54,6 +55,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC 15@@ -55,6 +56,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC
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)
19+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/unix 19+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/unix
20+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/generic 20+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/tcl/generic
21  21
22 # Path to the private tcl header dir: 22 # Path to the private tcl header dir:
23 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 23 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
24@@ -103,7 +106,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ 24@@ -104,7 +107,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
25 #CFLAGS = $(CFLAGS_DEBUG) 25 #CFLAGS = $(CFLAGS_DEBUG)
26 #CFLAGS = $(CFLAGS_OPTIMIZE) 26 #CFLAGS = $(CFLAGS_OPTIMIZE)
27 #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) 27 #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
28-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ 28-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@
29+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ 29+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@
30  30
31 # Flags to pass to the linker 31 # Flags to pass to the linker
32 LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ 32 LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
33@@ -144,7 +147,7 @@ NO_DEPRECATED_FLAGS = 33@@ -145,7 +148,7 @@ NO_DEPRECATED_FLAGS =
34  34
35 # Some versions of make, like SGI's, use the following variable to determine 35 # Some versions of make, like SGI's, use the following variable to determine
36 # which shell to use for executing commands: 36 # which shell to use for executing commands:
37-SHELL = @MAKEFILE_SHELL@ 37-SHELL = @MAKEFILE_SHELL@
38+#SHELL = @MAKEFILE_SHELL@ 38+#SHELL = @MAKEFILE_SHELL@
39  39
40 # Tcl used to let the configure script choose which program to use for 40 # Tcl used to let the configure script choose which program to use for
41 # installing, but there are just too many different versions of "install" 41 # installing, but there are just too many different versions of "install"
42@@ -189,7 +192,7 @@ DLTEST_TARGETS = dltest.marker 42@@ -191,7 +194,7 @@ DLTEST_TARGETS = dltest.marker
43 # run-time. The first symbol is for use when creating a binary with cc, and 43 # run-time. The first symbol is for use when creating a binary with cc, and
44 # the second is for use when running ld directly. 44 # the second is for use when running ld directly.
45 CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@ 45 CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@
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@@ -202,6 +205,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@@ -614,7 +618,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ 59@@ -712,7 +716,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@@ -633,6 +637,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} 68@@ -731,6 +735,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@@ -795,9 +804,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@@ -821,7 +837,7 @@ install-libraries: libraries 98@@ -919,7 +935,7 @@ install-libraries: libraries
99 else true; \ 99 else true; \
100 fi; \ 100 fi; \
101 done; 101 done;
102- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ 102- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
103+ @for i in opt0.4 http1.0 encoding; \ 103+ @for i in opt0.4 http1.0 encoding; \
104 do \ 104 do \
105 if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ 105 if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
106 echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ 106 echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
107@@ -842,6 +858,8 @@ install-libraries: libraries 107@@ -940,6 +956,8 @@ install-libraries: libraries
108 done; 108 done;
109 @echo "Installing package http 2.9.0 as a Tcl Module"; 109 @echo "Installing package http 2.9.1 as a Tcl Module";
110 @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm; 110 @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.1.tm;
111+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl; 111+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl;
112+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl; 112+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl;
113 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; 113 @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
114 @for i in $(TOP_DIR)/library/opt/*.tcl ; \ 114 @for i in $(TOP_DIR)/library/opt/*.tcl ; \
115 do \ 115 do \
116@@ -849,13 +867,21 @@ install-libraries: libraries 116@@ -947,13 +965,21 @@ install-libraries: libraries
117 done; 117 done;
118 @echo "Installing package msgcat 1.6.1 as a Tcl Module"; 118 @echo "Installing package msgcat 1.6.1 as a Tcl Module";
119 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; 119 @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm;
120+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl; 120+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl;
121+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl; 121+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl;
122 @echo "Installing package tcltest 2.5.0 as a Tcl Module"; 122 @echo "Installing package tcltest 2.5.1 as a Tcl Module";
123 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.0.tm; 123 @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.1.tm;
124+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/tcltest.tcl; 124+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/tcltest.tcl;
125+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/pkgIndex.tcl; 125+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/pkgIndex.tcl;
126  126
127 @echo "Installing package platform 1.0.14 as a Tcl Module"; 127 @echo "Installing package platform 1.0.14 as a Tcl Module";
128 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; 128 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
129+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl; 129+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/platform.tcl;
130+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl; 130+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/platform1.0/pkgIndex.tcl;
131 @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; 131 @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
132 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; 132 @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
133+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl 133+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/shell.tcl
134+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl 134+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/shell1.1/pkgIndex.tcl
135  135
136 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; 136 @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
137 @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ 137 @for i in $(TOP_DIR)/library/encoding/*.enc ; do \
138@@ -940,7 +966,7 @@ install-doc: doc 138@@ -1038,7 +1064,7 @@ install-doc: doc
139 done 139 done
140  140
141 install-headers: 141 install-headers:
142- @for i in "$(INCLUDE_INSTALL_DIR)"; \ 142- @for i in "$(INCLUDE_INSTALL_DIR)"; \
143+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ 143+ @for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
144 do \ 144 do \
145 if [ ! -d "$$i" ] ; then \ 145 if [ ! -d "$$i" ] ; then \
146 echo "Making directory $$i"; \ 146 echo "Making directory $$i"; \
147@@ -949,13 +975,17 @@ install-headers: 147@@ -1047,13 +1073,17 @@ install-headers:
148 fi; \ 148 fi; \
149 done; 149 done;
150 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; 150 @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
151- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ 151- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
152- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \ 152- $(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
153- $(GENERIC_DIR)/tclPlatDecls.h \ 153- $(GENERIC_DIR)/tclPlatDecls.h \
154- $(GENERIC_DIR)/tclTomMath.h \ 154- $(GENERIC_DIR)/tclTomMath.h \
155- $(GENERIC_DIR)/tclTomMathDecls.h ; \ 155- $(GENERIC_DIR)/tclTomMathDecls.h ; \
156+ @for i in $(GENERIC_DIR)/*.h ; \ 156+ @for i in $(GENERIC_DIR)/*.h ; \
157+ do \ 157+ do \
158+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ 158+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
159+ done; 159+ done;
160+ @for i in $(UNIX_DIR)/*.h ; \ 160+ @for i in $(UNIX_DIR)/*.h ; \
161+ do \ 161+ do \
162+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ 162+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
163+ done; 163+ done;
164+ @for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \ 164+ @for i in tcl.h tclDecls.h tclOO.h tclOODecls.h tclPlatDecls.h; \
165 do \ 165 do \
166- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ 166- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
167+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \ 167+ cd "$(INCLUDE_INSTALL_DIR)" && ln -sf tcl/generic/$$i $$i; \
168 done; 168 done;
169  169
170 # Optional target to install private headers 170 # Optional target to install private headers
171@@ -1725,7 +1755,7 @@ configure-packages: 171@@ -1811,7 +1841,7 @@ configure-packages:
172 mkdir -p $(PKG_DIR)/$$pkg; \ 172 mkdir -p $(PKG_DIR)/$$pkg; \
173 if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \ 173 if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
174 ( cd $(PKG_DIR)/$$pkg; \ 174 ( cd $(PKG_DIR)/$$pkg; \
175- $$i/configure --with-tcl=../.. \ 175- $$i/configure --with-tcl=../.. \
176+ $(SHELL) $$i/configure --with-tcl=../.. \ 176+ $(SHELL) $$i/configure --with-tcl=../.. \
177 --with-tclinclude=$(GENERIC_DIR) \ 177 --with-tclinclude=$(GENERIC_DIR) \
178 $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \ 178 $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
179 --enable-shared --enable-threads; ) || exit $$?; \ 179 --enable-shared --enable-threads; ) || exit $$?; \
cvs diff -r1.11 -r1.12 pkgsrc/lang/tcl/patches/patch-unix_configure (expand / switch to unified diff)

--- pkgsrc/lang/tcl/patches/patch-unix_configure 2018/12/09 18:33:55 1.11
+++ pkgsrc/lang/tcl/patches/patch-unix_configure 2020/04/16 17:07:07 1.12
@@ -1,149 +1,146 @@ @@ -1,149 +1,146 @@
1$NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $ 1$NetBSD: patch-unix_configure,v 1.12 2020/04/16 17:07:07 adam Exp $
2 2
3--- unix/configure.orig 2017-08-09 14:45:58.000000000 +0000 3--- unix/configure.orig 2019-11-21 19:10:50.000000000 +0000
4+++ unix/configure 4+++ unix/configure
5@@ -6839,12 +6839,12 @@ fi 5@@ -6778,12 +6778,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@@ -7515,7 +7515,7 @@ fi 20@@ -7454,7 +7454,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@@ -7536,7 +7536,7 @@ fi 29@@ -7475,7 +7475,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@@ -7558,7 +7558,7 @@ fi 38@@ -7497,7 +7497,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@@ -7609,7 +7609,6 @@ fi 47@@ -7548,7 +7548,6 @@ fi
48 esac 48 esac
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@@ -8825,7 +8824,11 @@ fi 55@@ -8757,7 +8756,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@@ -8860,7 +8863,7 @@ else 68@@ -8792,7 +8795,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@@ -18891,9 +18894,9 @@ fi 77@@ -18700,9 +18703,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@@ -19006,13 +19009,10 @@ else 90@@ -18815,13 +18818,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@@ -19031,12 +19031,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then 107@@ -18840,10 +18840,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
108 TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/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 /System/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- 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- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" 114- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
115+ 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+ 
119 #-------------------------------------------------------------------- 118 #--------------------------------------------------------------------
120 # The statements below define various symbols relating to Tcl 119@@ -18858,12 +18856,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
121 # stub support. 
122@@ -19049,12 +19048,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ 
123 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" 120 eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
124 eval "TCL_STUB_LIB_DIR=${libdir}" 121 eval "TCL_STUB_LIB_DIR=${libdir}"
125  122
126-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then 123-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
127- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}" 124- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}"
128-else 125-else
129- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`" 126- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`"
130-fi 127-fi
131- 128-
132+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 129+TCL_STUB_LIB_FLAG="-ltclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
133 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}"
134 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}"
135 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 132 TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
136@@ -19208,34 +19202,15 @@ fi 133@@ -19017,34 +19010,15 @@ fi
137 # Transform confdefs.h into DEFS. 134 # Transform confdefs.h into DEFS.
138 # Protect against shell expansion while executing Makefile rules. 135 # Protect against shell expansion while executing Makefile rules.
139 # Protect against Makefile macro expansion. 136 # Protect against Makefile macro expansion.
140-# 137-#
141-# 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
142-# take arguments), then we branch to the quote section. Otherwise, 139-# take arguments), then we branch to the quote section. Otherwise,
143-# look for a macro that doesn't take arguments. 140-# look for a macro that doesn't take arguments.
144-cat >confdef2opt.sed <<\_ACEOF 141-cat >confdef2opt.sed <<\_ACEOF
145-t clear 142-t clear
146-: clear 143-: clear
147-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g 144-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
148-t quote 145-t quote
149-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g 146-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
@@ -167,21 +164,21 @@ $NetBSD: patch-unix_configure,v 1.11 201 @@ -167,21 +164,21 @@ $NetBSD: patch-unix_configure,v 1.11 201
167-rm -f confdef2opt.sed 164-rm -f confdef2opt.sed
168+cat > conftest.defs <<\EOF 165+cat > conftest.defs <<\EOF
169+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
170+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g 167+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
171+s%\[%\\&%g 168+s%\[%\\&%g
172+s%\]%\\&%g 169+s%\]%\\&%g
173+s%\$%$$%g 170+s%\$%$$%g
174+EOF 171+EOF
175+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` 172+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
176+rm -f conftest.defs 173+rm -f conftest.defs
177  174
178  175
179  176
180@@ -19863,6 +19838,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,; 177@@ -19672,6 +19646,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
181 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t 178 s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
182 s,@DLTEST_LD@,$DLTEST_LD,;t t 179 s,@DLTEST_LD@,$DLTEST_LD,;t t
183 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t 180 s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t
184+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t 181+s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
185 CEOF 182 CEOF
186  183
187 _ACEOF 184 _ACEOF
cvs diff -r1.86 -r1.87 pkgsrc/x11/tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/tk/Makefile 2020/01/26 17:32:27 1.86
+++ pkgsrc/x11/tk/Makefile 2020/04/16 17:07:07 1.87
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.86 2020/01/26 17:32:27 rillig Exp $ 1# $NetBSD: Makefile,v 1.87 2020/04/16 17:07:07 adam Exp $
2 2
3DISTNAME= tk${TK_VERSION}.1-src 3DISTNAME= tk${TK_VERSION}-src
4PKGNAME= tk-${TK_VERSION}.1 4PKGNAME= tk-${TK_VERSION}
5CATEGORIES= x11 lang 5CATEGORIES= x11 lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.tcl.tk/ 9HOMEPAGE= https://www.tcl.tk/
10COMMENT= Graphical toolkit for TCL 10COMMENT= Graphical toolkit for TCL
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13.include "../../x11/tk/Makefile.version" 13.include "../../x11/tk/Makefile.version"
14 14
15WRKSRC= ${WRKDIR}/tk${TK_VERSION} 15WRKSRC= ${WRKDIR}/tk${TK_VERSION}
16 16
17USE_GCC_RUNTIME= yes 17USE_GCC_RUNTIME= yes
cvs diff -r1.21 -r1.22 pkgsrc/x11/tk/Makefile.version (expand / switch to unified diff)

--- pkgsrc/x11/tk/Makefile.version 2018/12/09 18:35:44 1.21
+++ pkgsrc/x11/tk/Makefile.version 2020/04/16 17:07:07 1.22
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.version,v 1.21 2018/12/09 18:35:44 adam Exp $ 1# $NetBSD: Makefile.version,v 1.22 2020/04/16 17:07:07 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 x11/tk/Makefile 6# used by x11/tk/Makefile
7 7
8TK_SONUM= 86 8TK_SONUM= 86
9TK_BASEVER= 8.6 9TK_BASEVER= 8.6
10TK_VERSION= 8.6.9 10TK_VERSION= 8.6.10
cvs diff -r1.17 -r1.18 pkgsrc/x11/tk/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/tk/PLIST 2018/02/03 17:53:12 1.17
+++ pkgsrc/x11/tk/PLIST 2020/04/16 17:07:07 1.18
@@ -1,34 +1,41 @@ @@ -1,34 +1,41 @@
1@comment $NetBSD: PLIST,v 1.17 2018/02/03 17:53:12 adam Exp $ 1@comment $NetBSD: PLIST,v 1.18 2020/04/16 17:07:07 adam Exp $
2bin/wish 2bin/wish
3bin/wish${BASEVER} 3bin/wish${BASEVER}
 4${PLIST.aqua}include/X11/DECkeysym.h
 5${PLIST.aqua}include/X11/HPkeysym.h
 6${PLIST.aqua}include/X11/Sunkeysym.h
4${PLIST.aqua}include/X11/X.h 7${PLIST.aqua}include/X11/X.h
 8${PLIST.aqua}include/X11/XF86keysym.h
5${PLIST.aqua}include/X11/Xatom.h 9${PLIST.aqua}include/X11/Xatom.h
6${PLIST.aqua}include/X11/Xfuncproto.h 10${PLIST.aqua}include/X11/Xfuncproto.h
7${PLIST.aqua}include/X11/Xlib.h 11${PLIST.aqua}include/X11/Xlib.h
8${PLIST.aqua}include/X11/Xutil.h 12${PLIST.aqua}include/X11/Xutil.h
 13${PLIST.aqua}include/X11/ap_keysym.h
9${PLIST.aqua}include/X11/cursorfont.h 14${PLIST.aqua}include/X11/cursorfont.h
10${PLIST.aqua}include/X11/keysym.h 15${PLIST.aqua}include/X11/keysym.h
11${PLIST.aqua}include/X11/keysymdef.h 16${PLIST.aqua}include/X11/keysymdef.h
12${PLIST.aqua}include/X11/xbytes.h 17${PLIST.aqua}include/X11/xbytes.h
13include/tk.h 18include/tk.h
14include/tk/generic/default.h 19include/tk/generic/default.h
15include/tk/generic/ks_names.h 20include/tk/generic/ks_names.h
16include/tk/generic/tk.h 21include/tk/generic/tk.h
17include/tk/generic/tk3d.h 22include/tk/generic/tk3d.h
 23include/tk/generic/tkArray.h
18include/tk/generic/tkBusy.h 24include/tk/generic/tkBusy.h
19include/tk/generic/tkButton.h 25include/tk/generic/tkButton.h
20include/tk/generic/tkCanvas.h 26include/tk/generic/tkCanvas.h
21include/tk/generic/tkColor.h 27include/tk/generic/tkColor.h
 28include/tk/generic/tkDList.h
22include/tk/generic/tkDecls.h 29include/tk/generic/tkDecls.h
23include/tk/generic/tkEntry.h 30include/tk/generic/tkEntry.h
24include/tk/generic/tkFileFilter.h 31include/tk/generic/tkFileFilter.h
25include/tk/generic/tkFont.h 32include/tk/generic/tkFont.h
26include/tk/generic/tkImgPhoto.h 33include/tk/generic/tkImgPhoto.h
27include/tk/generic/tkInt.h 34include/tk/generic/tkInt.h
28include/tk/generic/tkIntDecls.h 35include/tk/generic/tkIntDecls.h
29include/tk/generic/tkIntPlatDecls.h 36include/tk/generic/tkIntPlatDecls.h
30include/tk/generic/tkIntXlibDecls.h 37include/tk/generic/tkIntXlibDecls.h
31include/tk/generic/tkMenu.h 38include/tk/generic/tkMenu.h
32include/tk/generic/tkMenubutton.h 39include/tk/generic/tkMenubutton.h
33include/tk/generic/tkPlatDecls.h 40include/tk/generic/tkPlatDecls.h
34include/tk/generic/tkPort.h 41include/tk/generic/tkPort.h
@@ -216,26 +223,29 @@ lib/tk${BASEVER}/ttk/scale.tcl @@ -216,26 +223,29 @@ lib/tk${BASEVER}/ttk/scale.tcl
216lib/tk${BASEVER}/ttk/scrollbar.tcl 223lib/tk${BASEVER}/ttk/scrollbar.tcl
217lib/tk${BASEVER}/ttk/sizegrip.tcl 224lib/tk${BASEVER}/ttk/sizegrip.tcl
218lib/tk${BASEVER}/ttk/spinbox.tcl 225lib/tk${BASEVER}/ttk/spinbox.tcl
219lib/tk${BASEVER}/ttk/treeview.tcl 226lib/tk${BASEVER}/ttk/treeview.tcl
220lib/tk${BASEVER}/ttk/ttk.tcl 227lib/tk${BASEVER}/ttk/ttk.tcl
221lib/tk${BASEVER}/ttk/utils.tcl 228lib/tk${BASEVER}/ttk/utils.tcl
222lib/tk${BASEVER}/ttk/vistaTheme.tcl 229lib/tk${BASEVER}/ttk/vistaTheme.tcl
223lib/tk${BASEVER}/ttk/winTheme.tcl 230lib/tk${BASEVER}/ttk/winTheme.tcl
224lib/tk${BASEVER}/ttk/xpTheme.tcl 231lib/tk${BASEVER}/ttk/xpTheme.tcl
225lib/tk${BASEVER}/unsupported.tcl 232lib/tk${BASEVER}/unsupported.tcl
226lib/tk${BASEVER}/xmfbox.tcl 233lib/tk${BASEVER}/xmfbox.tcl
227lib/tkConfig.sh 234lib/tkConfig.sh
228man/man1/wish.1 235man/man1/wish.1
 236man/man3/FindPhoto.3
 237man/man3/FontId.3
 238man/man3/MeasureChar.3
229man/man3/Tk_3DBorderColor.3 239man/man3/Tk_3DBorderColor.3
230man/man3/Tk_3DBorderGC.3 240man/man3/Tk_3DBorderGC.3
231man/man3/Tk_3DHorizontalBevel.3 241man/man3/Tk_3DHorizontalBevel.3
232man/man3/Tk_3DVerticalBevel.3 242man/man3/Tk_3DVerticalBevel.3
233man/man3/Tk_AddOption.3 243man/man3/Tk_AddOption.3
234man/man3/Tk_Alloc3DBorderFromObj.3 244man/man3/Tk_Alloc3DBorderFromObj.3
235man/man3/Tk_AllocBitmapFromObj.3 245man/man3/Tk_AllocBitmapFromObj.3
236man/man3/Tk_AllocColorFromObj.3 246man/man3/Tk_AllocColorFromObj.3
237man/man3/Tk_AllocCursorFromObj.3 247man/man3/Tk_AllocCursorFromObj.3
238man/man3/Tk_AllocFontFromObj.3 248man/man3/Tk_AllocFontFromObj.3
239man/man3/Tk_AttachHWND.3 249man/man3/Tk_AttachHWND.3
240man/man3/Tk_Attributes.3 250man/man3/Tk_Attributes.3
241man/man3/Tk_BindEvent.3 251man/man3/Tk_BindEvent.3
cvs diff -r1.54 -r1.55 pkgsrc/x11/tk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/tk/distinfo 2019/06/27 09:33:27 1.54
+++ pkgsrc/x11/tk/distinfo 2020/04/16 17:07:07 1.55
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.54 2019/06/27 09:33:27 jperkin Exp $ 1$NetBSD: distinfo,v 1.55 2020/04/16 17:07:07 adam Exp $
2 2
3SHA1 (tk8.6.9.1-src.tar.gz) = 473019c00461fb55724d1923ed6330d01d9483b8 3SHA1 (tk8.6.10-src.tar.gz) = 8f6fb6276e8b82509a2637e7798b7e58da0bd164
4RMD160 (tk8.6.9.1-src.tar.gz) = 34ec51e1dbf02459960f77795009743708490831 4RMD160 (tk8.6.10-src.tar.gz) = 41abb02f092e419a8466a0ce5ee90a49df96704d
5SHA512 (tk8.6.9.1-src.tar.gz) = b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 5SHA512 (tk8.6.10-src.tar.gz) = d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
6Size (tk8.6.9.1-src.tar.gz) = 4364603 bytes 6Size (tk8.6.10-src.tar.gz) = 4444764 bytes
7SHA1 (patch-unix_Makefile.in) = 6238796c15a0df653109b74817c153d226c64c21 7SHA1 (patch-unix_Makefile.in) = 6238796c15a0df653109b74817c153d226c64c21
8SHA1 (patch-unix_configure) = 9186d7dca8a436e8e4ecb90b11c0dca1275646e8 8SHA1 (patch-unix_configure) = 9186d7dca8a436e8e4ecb90b11c0dca1275646e8