diff options
author | adam <adam@pkgsrc.org> | 2018-12-09 18:33:55 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2018-12-09 18:33:55 +0000 |
commit | e797dc592ec0eacda5cb10fdfae6cf3786032673 (patch) | |
tree | 9c72d506f2d8edc354bae8c9eedee2e2b61d5fcc | |
parent | 65121907e0068064a39b19368d4520e041b5650f (diff) | |
download | pkgsrc-e797dc592ec0eacda5cb10fdfae6cf3786032673.tar.gz |
tcl: updated to 8.6.9
8.6.9:
* (enhance) stop blocking conversion of object to/from class
* (enhance) NR-enable [package require]
* (bug)[9fd5c6] crash in object deletion, test oo-11.5
* (bug)[3c32a3] crash deleting object with class mixed in
* (platform) stop using -lieee, removed from glibc-2.27
***POTENTIAL INCOMPATIBILITY for math programs that embed Tcl***
* (bug)[8e6a9a] bad binary [string match], test string-11.55
* (bug)[1873ea] repair multi-thread std channel init
* (bug)[db36fa] broken bytecode for index values
* (bug) broken compiled [string replace], test string-14.19
* (bug) [string trim*] engine crashed on invalid UTF
* (bug) missing trace in compiled [array set], test var-20.11
* (bug)[46a241] crash in unset array with search, var-13.[23]
* (bug)[27b682] race made [file delete] raise "no such file"
* (bug)[925643] 32/64 cleanup of filesystem DIR operations
* (bug) leaks in TclSetEnv and env cache
* (bug)[3592747] [yieldto] dying namespace, tailcall-14.1
* (bug)[270f78] race in [file mkdir]
* (bug)[3f7af0] [file delete] raised "permission denied"
* (bug)[d051b7] overflow crash in [format]
* revised quoting of [exec] args in generated command line
***POTENTIAL INCOMPATIBILITY***
* HTTP Keep-Alive with pipelined requests
=> http 2.9.0
* (new)[TIP 505] [lreplace] accepts all out of range indices
* (bug) Prevent crash from NULL keyName
=> registry 1.3.3
* (enhance) advance dde version
=> dde 1.4.1
* tzdata updated to Olson's tzdata2018g
* Update tcltest package for Travis support
=> tcltest 2.5.0
* (bug)[35a8f1] overlong string length of some lists
* (bug)[00d04c] Repair [binary encode base64]
-rw-r--r-- | lang/tcl/Makefile | 3 | ||||
-rw-r--r-- | lang/tcl/Makefile.version | 12 | ||||
-rw-r--r-- | lang/tcl/PLIST | 10 | ||||
-rw-r--r-- | lang/tcl/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/tcl/distinfo | 30 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_itcl4.1.2_configure (renamed from lang/tcl/patches/patch-pkgs_itcl4.1.1_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in (renamed from lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in) | 6 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure (renamed from lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure (renamed from lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_tdbcmysql1.1.0_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure (renamed from lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-pkgs_thread2.8.4_configure (renamed from lang/tcl/patches/patch-pkgs_thread2.8.2_configure) | 32 | ||||
-rw-r--r-- | lang/tcl/patches/patch-unix_Makefile.in | 14 | ||||
-rw-r--r-- | lang/tcl/patches/patch-unix_configure | 20 |
15 files changed, 83 insertions, 242 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 4059bacb65b..b2686f5c60d 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.102 2018/07/20 03:34:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.103 2018/12/09 18:33:55 adam Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} -PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version index 279fbfb3ec1..9aa64bdaccb 100644 --- a/lang/tcl/Makefile.version +++ b/lang/tcl/Makefile.version @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.version,v 1.23 2018/02/03 17:51:19 adam Exp $ +# $NetBSD: Makefile.version,v 1.24 2018/12/09 18:33:55 adam Exp $ # used by cad/xcircuit/Makefile # used by devel/tcl-tclcl/Makefile # used by lang/tcl/Makefile @@ -7,10 +7,10 @@ TCL_SONUM= 86 TCL_BASEVER= 8.6 -TCL_VERSION= 8.6.8 +TCL_VERSION= 8.6.9 # Update bundled versions in lang/tcl/buildlink3.mk -ITCL_VERSION= 4.1.1 -SQLITE3_VERSION=3.21.0 -TDBC_VERSION= 1.0.6 -THREAD_VERSION= 2.8.2 +ITCL_VERSION= 4.1.2 +SQLITE3_VERSION=3.25.3 +TDBC_VERSION= 1.1.0 +THREAD_VERSION= 2.8.4 diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST index 18a4cd42e3e..3bca2951632 100644 --- a/lang/tcl/PLIST +++ b/lang/tcl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2018/02/03 17:51:19 adam Exp $ +@comment $NetBSD: PLIST,v 1.25 2018/12/09 18:33:55 adam Exp $ bin/sqlite3_analyzer bin/tclsh bin/tclsh${BASEVER} @@ -292,15 +292,15 @@ lib/tcl${BASEVER}/shell1.1/pkgIndex.tcl lib/tcl${BASEVER}/shell1.1/shell.tcl lib/tcl${BASEVER}/tclAppInit.c lib/tcl${BASEVER}/tclIndex -lib/tcl${BASEVER}/tcltest2.4/pkgIndex.tcl -lib/tcl${BASEVER}/tcltest2.4/tcltest.tcl +lib/tcl${BASEVER}/tcltest2.5/pkgIndex.tcl +lib/tcl${BASEVER}/tcltest2.5/tcltest.tcl lib/tcl${BASEVER}/tm.tcl lib/tcl${BASEVER}/word.tcl lib/tcl8/8.4/platform-1.0.14.tm lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.5/msgcat-1.6.1.tm -lib/tcl8/8.5/tcltest-2.4.1.tm -lib/tcl8/8.6/http-2.8.12.tm +lib/tcl8/8.5/tcltest-2.5.0.tm +lib/tcl8/8.6/http-2.9.0.tm lib/tcl8/8.6/tdbc/sqlite3-${TDBC_VERSION}.tm lib/tclConfig.sh lib/tclooConfig.sh diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index dd6b75a980a..08a0e3337d1 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2018/02/03 17:51:19 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2018/12/09 18:33:55 adam Exp $ BUILDLINK_TREE+= tcl @@ -22,8 +22,8 @@ _TOOLS_USE_PKGSRC.tclsh= yes TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh # Bundled library -ITCL_VERSION= 4.1.1 -TDBC_VERSION= 1.0.6 +ITCL_VERSION= 4.1.2 +TDBC_VERSION= 1.1.0 .include "../../devel/zlib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index b79654af754..be9804912d4 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,24 +1,24 @@ -$NetBSD: distinfo,v 1.76 2018/02/03 17:51:19 adam Exp $ +$NetBSD: distinfo,v 1.77 2018/12/09 18:33:55 adam Exp $ -SHA1 (tcl8.6.8-src.tar.gz) = 0d014d97ca38534d4be1dfc6c563a7a3a6aa737f -RMD160 (tcl8.6.8-src.tar.gz) = 53723adf560606dc0403af568b6fc0d27a4fd93d -SHA512 (tcl8.6.8-src.tar.gz) = 14fb8fd880ecedda61119556f404fa1da34146f82dbf771be2ab322c6c575a898e194016dc3300f6764008d8f3bf59b07e31723bf8a3aafdcee6b4ef7667b18e -Size (tcl8.6.8-src.tar.gz) = 9793786 bytes +SHA1 (tcl8.6.9-src.tar.gz) = 861c5c8bbce9eda892c5e63b6035e09fad90a25f +RMD160 (tcl8.6.9-src.tar.gz) = 73d064888101ab3a4a832bd9b242937e5f26315c +SHA512 (tcl8.6.9-src.tar.gz) = 707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112 +Size (tcl8.6.9-src.tar.gz) = 10000896 bytes SHA1 (patch-generic_tclInt.h) = fde6a5458a138b6d61fdbab1269b1c5111a28b22 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6 -SHA1 (patch-pkgs_itcl4.1.1_configure) = 6c028591222d64c428503cfebcd31a12cd27dd5b -SHA1 (patch-pkgs_sqlite3.21.0_Makefile.in) = 4b3aee3a46d076cfce2ec09b04bafe9fa7fe55f5 -SHA1 (patch-pkgs_sqlite3.21.0_configure) = f4e679405cb21b06d4c5b32696e065f1b149f84b -SHA1 (patch-pkgs_tdbc1.0.6_configure) = 5631f7e295ed3fedee42c97e9c6a7d7a65a8abfc -SHA1 (patch-pkgs_tdbcmysql1.0.6_configure) = efc7538436ac5641fc3efeeb9e956a628010dcfa -SHA1 (patch-pkgs_tdbcodbc1.0.6_configure) = d6611925fd8297a8fb768ccd9cdf1b3c6f9b4b63 -SHA1 (patch-pkgs_tdbcpostgres1.0.6_configure) = d4dece122331aa8ca293888abef85767cf71d0e1 -SHA1 (patch-pkgs_thread2.8.2_configure) = 22b494adca5a8ea1f70d9b02baddfdd554d71064 +SHA1 (patch-pkgs_itcl4.1.2_configure) = 508efecf058cfd10cc1c815fa948616ee248d6ef +SHA1 (patch-pkgs_sqlite3.25.3_Makefile.in) = 985bef7d2d6d8b96a9dd8072a3194620dc32b495 +SHA1 (patch-pkgs_sqlite3.25.3_configure) = 98dd6187eb3317d1c486f439fe889160a13415ef +SHA1 (patch-pkgs_tdbc1.1.0_configure) = ba65923172774dcd80151aa507a5633c8b7df3ba +SHA1 (patch-pkgs_tdbcmysql1.1.0_configure) = 6cc5957be85cfca9df7b75dc7a932256d283d3dc +SHA1 (patch-pkgs_tdbcodbc1.1.0_configure) = a082e2b0cd424bc19a3253a8ead2cd0ead9fb568 +SHA1 (patch-pkgs_tdbcpostgres1.1.0_configure) = 6693bad209d40d8909eb35a08f93a6bbcb63d2c1 +SHA1 (patch-pkgs_thread2.8.4_configure) = 5a02414b95cd7a41ff3d6be181e9cf1fe573cf13 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2 -SHA1 (patch-unix_Makefile.in) = 6a8df92fb7dc97142ad60c72eece1062f5de1096 -SHA1 (patch-unix_configure) = 16d5030085a66b69e61ab3d55e1fd97e9a8c1836 +SHA1 (patch-unix_Makefile.in) = a67bf7793579c80d363a62ef2efa6ed4ee1e2cbd +SHA1 (patch-unix_configure) = f5b281877a6a40db1c1850be98819ff6612b16ce SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31 SHA1 (patch-unix_tclUnixCompat.c) = 7ffa40a1a56345f5b86cd896e8e3b0d5748d8c5e SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f diff --git a/lang/tcl/patches/patch-pkgs_itcl4.1.1_configure b/lang/tcl/patches/patch-pkgs_itcl4.1.2_configure index cc2e5104920..4af555f50ba 100644 --- a/lang/tcl/patches/patch-pkgs_itcl4.1.1_configure +++ b/lang/tcl/patches/patch-pkgs_itcl4.1.2_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_itcl4.1.1_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_itcl4.1.2_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/itcl4.1.1/configure.orig 2017-12-15 18:00:37.000000000 +0000 -+++ pkgs/itcl4.1.1/configure -@@ -7428,7 +7428,7 @@ fi +--- pkgs/itcl4.1.2/configure.orig 2018-11-01 15:59:41.000000000 +0000 ++++ pkgs/itcl4.1.2/configure +@@ -6935,7 +6935,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7439,13 +7439,11 @@ fi +@@ -6946,13 +6946,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7462,7 +7460,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7484,10 +7482,6 @@ fi +@@ -6991,10 +6989,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8098,7 +8092,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in b/lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in index 3ae500bae37..579ee4a8e9c 100644 --- a/lang/tcl/patches/patch-pkgs_sqlite3.21.0_Makefile.in +++ b/lang/tcl/patches/patch-pkgs_sqlite3.25.3_Makefile.in @@ -1,9 +1,9 @@ -$NetBSD: patch-pkgs_sqlite3.21.0_Makefile.in,v 1.1 2018/02/03 17:51:19 adam Exp $ +$NetBSD: patch-pkgs_sqlite3.25.3_Makefile.in,v 1.1 2018/12/09 18:33:55 adam Exp $ Fix building with system sqlite3. ---- pkgs/sqlite3.21.0/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000 -+++ pkgs/sqlite3.21.0/Makefile.in +--- pkgs/sqlite3.25.3/Makefile.in.orig 2016-01-07 15:38:22.000000000 +0000 ++++ pkgs/sqlite3.25.3/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@ diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure b/lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure index 98e7abc47e2..149a5ab58b1 100644 --- a/lang/tcl/patches/patch-pkgs_sqlite3.21.0_configure +++ b/lang/tcl/patches/patch-pkgs_sqlite3.25.3_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_sqlite3.21.0_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_sqlite3.25.3_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/sqlite3.21.0/configure.orig 2017-12-21 13:58:19.000000000 +0000 -+++ pkgs/sqlite3.21.0/configure -@@ -7399,7 +7399,7 @@ fi +--- pkgs/sqlite3.25.3/configure.orig 2018-11-12 18:03:27.000000000 +0000 ++++ pkgs/sqlite3.25.3/configure +@@ -6974,7 +6974,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7410,13 +7410,11 @@ fi +@@ -6985,13 +6985,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7433,7 +7431,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7455,10 +7453,6 @@ fi +@@ -7030,10 +7028,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8069,7 +8063,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure b/lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure index bbb3af62d04..7c35e3ced02 100644 --- a/lang/tcl/patches/patch-pkgs_tdbc1.0.6_configure +++ b/lang/tcl/patches/patch-pkgs_tdbc1.1.0_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_tdbc1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_tdbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/tdbc1.0.6/configure.orig 2017-12-19 14:13:49.000000000 +0000 -+++ pkgs/tdbc1.0.6/configure -@@ -7544,7 +7544,7 @@ fi +--- pkgs/tdbc1.1.0/configure.orig 2018-11-01 16:02:33.000000000 +0000 ++++ pkgs/tdbc1.1.0/configure +@@ -7049,7 +7049,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7555,13 +7555,11 @@ fi +@@ -7060,13 +7060,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7578,7 +7576,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7600,10 +7598,6 @@ fi +@@ -7105,10 +7103,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8214,7 +8208,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.0_configure index 8e21c4297e1..4ebdd771d9c 100644 --- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.6_configure +++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.1.0_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_tdbcmysql1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_tdbcmysql1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/tdbcmysql1.0.6/configure.orig 2017-12-19 14:16:04.000000000 +0000 -+++ pkgs/tdbcmysql1.0.6/configure -@@ -7890,7 +7890,7 @@ fi +--- pkgs/tdbcmysql1.1.0/configure.orig 2018-11-01 16:08:41.000000000 +0000 ++++ pkgs/tdbcmysql1.1.0/configure +@@ -7393,7 +7393,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7901,13 +7901,11 @@ fi +@@ -7404,13 +7404,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7924,7 +7922,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7946,10 +7944,6 @@ fi +@@ -7449,10 +7447,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8560,7 +8554,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure index 7d68479f0b1..772c0505723 100644 --- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.6_configure +++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.1.0_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_tdbcodbc1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_tdbcodbc1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/tdbcodbc1.0.6/configure.orig 2017-12-19 14:16:21.000000000 +0000 -+++ pkgs/tdbcodbc1.0.6/configure -@@ -7900,7 +7900,7 @@ fi +--- pkgs/tdbcodbc1.1.0/configure.orig 2018-11-01 16:09:19.000000000 +0000 ++++ pkgs/tdbcodbc1.1.0/configure +@@ -7393,7 +7393,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7911,13 +7911,11 @@ fi +@@ -7404,13 +7404,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7934,7 +7932,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7956,10 +7954,6 @@ fi +@@ -7449,10 +7447,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8570,7 +8564,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure index ac9528714f9..047ceeef2c2 100644 --- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.6_configure +++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.1.0_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_tdbcpostgres1.0.6_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_tdbcpostgres1.1.0_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/tdbcpostgres1.0.6/configure.orig 2017-12-21 18:16:25.000000000 +0000 -+++ pkgs/tdbcpostgres1.0.6/configure -@@ -7890,7 +7890,7 @@ fi +--- pkgs/tdbcpostgres1.1.0/configure.orig 2018-11-01 16:09:49.000000000 +0000 ++++ pkgs/tdbcpostgres1.1.0/configure +@@ -7393,7 +7393,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7901,13 +7901,11 @@ fi +@@ -7404,13 +7404,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7924,7 +7922,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7946,10 +7944,6 @@ fi +@@ -7449,10 +7447,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8560,7 +8554,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-pkgs_thread2.8.2_configure b/lang/tcl/patches/patch-pkgs_thread2.8.4_configure index 71f9e96fefd..5a32abe605c 100644 --- a/lang/tcl/patches/patch-pkgs_thread2.8.2_configure +++ b/lang/tcl/patches/patch-pkgs_thread2.8.4_configure @@ -1,13 +1,11 @@ -$NetBSD: patch-pkgs_thread2.8.2_configure,v 1.1 2018/02/03 17:51:19 adam Exp $ - -Add support for DragonFly. +$NetBSD: patch-pkgs_thread2.8.4_configure,v 1.1 2018/12/09 18:33:55 adam Exp $ Honor LDFLAGS on NetBSD. https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ---- pkgs/thread2.8.2/configure.orig 2017-12-14 13:34:48.000000000 +0000 -+++ pkgs/thread2.8.2/configure -@@ -7504,7 +7504,7 @@ fi +--- pkgs/thread2.8.4/configure.orig 2018-11-01 16:11:06.000000000 +0000 ++++ pkgs/thread2.8.4/configure +@@ -6984,7 +6984,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' @@ -16,7 +14,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : -@@ -7515,13 +7515,11 @@ fi +@@ -6995,13 +6995,11 @@ fi fi # OpenBSD doesn't do version numbers with dots. @@ -31,16 +29,7 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e SHLIB_SUFFIX=".so" LDFLAGS="$LDFLAGS -export-dynamic" if test $doRpath = yes; then : -@@ -7538,7 +7536,7 @@ fi - - fi - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -@@ -7560,10 +7558,6 @@ fi +@@ -7040,10 +7038,6 @@ fi case $system in FreeBSD-3.*) # Version numbers are dot-stripped by system policy. @@ -51,12 +40,3 @@ https://core.tcl.tk/tcl/tktview/fed5069f8a8e59e97af0a784b534919f5b789b1e ;; esac ;; -@@ -8174,7 +8168,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - windows) ;; diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in index d2ccc82ab87..277c2945f57 100644 --- a/lang/tcl/patches/patch-unix_Makefile.in +++ b/lang/tcl/patches/patch-unix_Makefile.in @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_Makefile.in,v 1.14 2018/02/03 17:51:19 adam Exp $ +$NetBSD: patch-unix_Makefile.in,v 1.15 2018/12/09 18:33:55 adam Exp $ Honour LDFLAGS. @@ -106,8 +106,8 @@ Honour LDFLAGS. echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -842,6 +858,8 @@ install-libraries: libraries done; - @echo "Installing package http 2.8.12 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm; + @echo "Installing package http 2.9.0 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http/http.tcl; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/http/pkgIndex.tcl; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @@ -119,10 +119,10 @@ Honour LDFLAGS. @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/msgcat.tcl; + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat1.6/pkgIndex.tcl; - @echo "Installing package tcltest 2.4.1 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/tcltest.tcl; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.4/pkgIndex.tcl; + @echo "Installing package tcltest 2.5.0 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.0.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/tcltest.tcl; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest2.5/pkgIndex.tcl; @echo "Installing package platform 1.0.14 as a Tcl Module"; @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure index c4f33371d02..eaea6cb7a84 100644 --- a/lang/tcl/patches/patch-unix_configure +++ b/lang/tcl/patches/patch-unix_configure @@ -1,4 +1,4 @@ -$NetBSD: patch-unix_configure,v 1.10 2017/08/25 11:05:33 adam Exp $ +$NetBSD: patch-unix_configure,v 1.11 2018/12/09 18:33:55 adam Exp $ --- unix/configure.orig 2017-08-09 14:45:58.000000000 +0000 +++ unix/configure @@ -44,15 +44,6 @@ $NetBSD: patch-unix_configure,v 1.10 2017/08/25 11:05:33 adam Exp $ if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -7575,7 +7575,7 @@ fi - fi - - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" @@ -7609,7 +7609,6 @@ fi esac ;; @@ -61,15 +52,6 @@ $NetBSD: patch-unix_configure,v 1.10 2017/08/25 11:05:33 adam Exp $ SHLIB_CFLAGS="-fno-common" # To avoid discrepancies between what headers configure sees during # preprocessing tests and compiling tests, move any -isysroot and -@@ -8783,7 +8782,7 @@ fi - BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; - IRIX*) ;; -- NetBSD-*|FreeBSD-*|OpenBSD-*) ;; -+ NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;; - Darwin-*) ;; - SCO_SV-3.2*) ;; - *) SHLIB_CFLAGS="-fPIC" ;; @@ -8825,7 +8824,11 @@ fi else |