diff --git a/dev-lang/tcl/patches/tcl-8.5.9.patch b/dev-lang/tcl/patches/tcl-8.5.9.patch deleted file mode 100644 index 39c18f3f0..000000000 --- a/dev-lang/tcl/patches/tcl-8.5.9.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up tcl8.5.9/tests/env.test.orig tcl8.5.9/tests/env.test ---- tcl8.5.9/tests/env.test.orig 2011-05-14 16:24:47.871366656 -0600 -+++ tcl8.5.9/tests/env.test 2011-05-14 16:26:18.149946368 -0600 -@@ -80,7 +80,7 @@ set printenvScript [makeFile { - TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY - SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH - DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING -- __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM -+ __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH - } { - lrem names $name - } -@@ -112,7 +112,7 @@ foreach name [array names env] { - TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH - SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH - DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING -- SECURITYSESSIONID LANG WINDIR TERM -+ SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH - }} { - unset env($name) - } -diff -up tcl8.5.9/unix/tcl.m4.orig tcl8.5.9/unix/tcl.m4 ---- tcl8.5.9/unix/tcl.m4.orig 2010-09-08 11:40:48.016515072 -0600 -+++ tcl8.5.9/unix/tcl.m4 2011-05-14 16:20:36.560201728 -0600 -@@ -669,9 +669,16 @@ AC_DEFUN([SC_ENABLE_THREADS], [ - # The space is needed - THREADS_LIBS=" -pthread" - else -+ AC_CHECK_LIB(root, pthread_mutex_init, -+ tcl_ok=yes, tcl_ok=no) -+ if test "$tcl_ok" = "yes"; then -+ # The space is needed -+ THREAD_LIBS=" " -+ else - TCL_THREADS=0 - AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) - fi -+ fi - fi - fi - fi -@@ -1276,6 +1283,7 @@ dnl AC_CHECK_TOOL(AR, ar) - SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-lroot" -+ LD_LIBRARY_PATH_VAR="LIBRARY_PATH" - AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"]) - ;; - HP-UX-*.11.*) diff --git a/dev-lang/tcl/patches/tcl-8.6.10.patchset b/dev-lang/tcl/patches/tcl-8.6.10.patchset new file mode 100644 index 000000000..bfa304f70 --- /dev/null +++ b/dev-lang/tcl/patches/tcl-8.6.10.patchset @@ -0,0 +1,61 @@ +From 21d2bc6a3e89602abe0d6aa20e285c35cdeacd56 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 11 Apr 2020 14:33:00 -0400 +Subject: [PATCH] import patch from previous version + +--- + tests/env.test | 2 +- + unix/tcl.m4 | 10 +++++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/tests/env.test b/tests/env.test +index e6ce44d..ddee2aa 100644 +--- a/tests/env.test ++++ b/tests/env.test +@@ -101,7 +101,7 @@ variable keep { + TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY + SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING +- __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM ++ __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH + CommonProgramFiles ProgramFiles CommonProgramW6432 ProgramW6432 + } + +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index 0e146e4..297f1ce 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -656,7 +656,13 @@ AC_DEFUN([SC_ENABLE_THREADS], [ + # The space is needed + THREADS_LIBS=" -lpthread" + else +- AC_CHECK_LIB(pthreads, pthread_mutex_init, ++ AC_CHECK_LIB(root, pthread_mutex_init, ++ tcl_ok=yes, tcl_ok=no) ++ if test "$tcl_ok" = "yes"; then ++ # The space is needed ++ THREAD_LIBS=" " ++ else ++ AC_CHECK_LIB(pthreads, pthread_mutex_init, + tcl_ok=yes, tcl_ok=no) + if test "$tcl_ok" = "yes"; then + # The space is needed +@@ -675,6 +681,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [ + AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) + fi + fi ++ fi + fi + fi + +@@ -1269,6 +1276,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-lroot" ++ LD_LIBRARY_PATH_VAR="LIBRARY_PATH" + AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"]) + ;; + HP-UX-*.11.*) +-- +2.24.1 + diff --git a/dev-lang/tcl/patches/tcl8.5.4-haiku.diff b/dev-lang/tcl/patches/tcl8.5.4-haiku.diff deleted file mode 100644 index 6f283792c..000000000 --- a/dev-lang/tcl/patches/tcl8.5.4-haiku.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN tcl8.5.4/generic/tclPosixStr.c tcl8.5.4-haiku/generic/tclPosixStr.c ---- tcl8.5.4/generic/tclPosixStr.c 2005-11-07 07:16:03.000000000 -0800 -+++ tcl8.5.4-haiku/generic/tclPosixStr.c 2008-08-31 11:59:41.000000000 -0700 -@@ -941,7 +941,9 @@ - case SIGALRM: return "SIGALRM"; - #endif - #ifdef SIGBUS -- case SIGBUS: return "SIGBUS"; -+# if !defined(SIGSEGV) || (SIGBUS != SIGSEGV) -+ case SIGBUS: return "SIGBUS"; -+# endif - #endif - #ifdef SIGCHLD - case SIGCHLD: return "SIGCHLD"; -@@ -1071,8 +1073,11 @@ - #ifdef SIGALRM - case SIGALRM: return "alarm clock"; - #endif -+ - #ifdef SIGBUS -- case SIGBUS: return "bus error"; -+# if !defined(SIGSEGV) || (SIGBUS != SIGSEGV) -+ case SIGBUS: return "bus error"; -+# endif - #endif - #ifdef SIGCHLD - case SIGCHLD: return "child status changed"; -diff -urN tcl8.5.4/unix/tcl.m4 tcl8.5.4-haiku/unix/tcl.m4 ---- tcl8.5.4/unix/tcl.m4 2008-08-14 10:31:38.000000000 -0700 -+++ tcl8.5.4-haiku/unix/tcl.m4 2008-08-31 11:46:07.000000000 -0700 -@@ -1286,6 +1286,16 @@ - CC_SEARCH_FLAGS="" - LD_SEARCH_FLAGS="" - ;; -+ Haiku*) -+ SHLIB_CFLAGS="-fPIC" -+ SHLIB_LD='${CC} -nostart' -+ SHLIB_LD_LIBS='${LIBS}' -+ SHLIB_SUFFIX=".so" -+ DL_OBJS="tclLoadDl.o" -+ DL_LIBS="-ldl" -+ AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"]) -+ LIBS="$LIBS -lnetwork" BeOS*) -+ ;; - HP-UX-*.11.*) - # Use updated header definitions where possible - AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?]) diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.6.10.recipe similarity index 50% rename from dev-lang/tcl/tcl-8.5.9.recipe rename to dev-lang/tcl/tcl-8.6.10.recipe index 9ea00c2af..49086ac37 100644 --- a/dev-lang/tcl/tcl-8.5.9.recipe +++ b/dev-lang/tcl/tcl-8.6.10.recipe @@ -6,35 +6,37 @@ and desktop applications, networking, administration, testing and many more. \ Open source and business-friendly, Tcl is a mature yet evolving language that \ is truly cross platform, easily deployed and highly extensible." HOMEPAGE="http://www.tcl.tk" -COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation and other parties" +COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, and other parties" LICENSE="BSD (2-clause)" REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz" -CHECKSUM_SHA256="3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d" -SOURCE_DIR="tcl8.5.9" -PATCHES="tcl-8.5.9.patch" +SOURCE_URI="http://sourceforge.net/projects/tcl/files/Tcl/$portVersion/tcl$portVersion-src.tar.gz" +CHECKSUM_SHA256="5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed" +SOURCE_DIR="tcl$portVersion" +PATCHES="tcl-$portVersion.patchset" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" - tcl = $portVersion compat >= 8.5 - cmd:tclsh = $portVersion compat >= 8.5 - cmd:tclsh8.5 = $portVersion compat >= 8.5 - lib:libtcl8.5 = $portVersion compat >= 8.5 + tcl = $portVersion compat >= 8.6 + cmd:tclsh = $portVersion compat >= 8.6 + cmd:tclsh8.6 = $portVersion compat >= 8.6 + lib:libtcl8.6 = $portVersion compat >= 8.6 " REQUIRES=" haiku + lib:libsqlite3 " PROVIDES_devel=" tcl_devel = $portVersion - devel:libtclstub8.5 = $portVersion + devel:libtclstub8.6 = $portVersion " REQUIRES_devel=" tcl == $portVersion " BUILD_REQUIRES=" + devel:libsqlite3 " BUILD_PREREQUIRES=" haiku_devel @@ -47,25 +49,36 @@ BUILD_PREREQUIRES=" cmd:sed " +defineDebugInfoPackage tcl \ + "$libDir"/libtcl8.6.so + BUILD() { cd unix autoconf -f runConfigure ./configure \ - --enable-threads --enable-man-symlinks + --enable-man-symlinks \ + --with-system-sqlite make } INSTALL() { cd unix - make install + make install install-private-headers - ln -s tclsh8.5 "${binDir}/tclsh" + ln -s tclsh8.6 "${binDir}/tclsh" - prepareInstalledDevelLibs libtclstub8.5 + sed -i -e "s#${sourceDir}/unix#${developLibDir}#" \ + -e "s#${sourceDir}#${includeDir}#" \ + ${libDir}/tclConfig.sh + + rm $binDir/sqlite3_analyzer + + prepareInstalledDevelLibs libtclstub8.6 + fixPkgconfig + mv $libDir/tclConfig.sh $developLibDir packageEntries devel $developDir - packageEntries devel ${libDir}/tclConfig.sh } TEST()