CVS commit: [pkgsrc-2025Q1] pkgsrc/lang/tcl

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Apr 15 18:19:07 UTC 2025

Modified Files:
        pkgsrc/lang/tcl [pkgsrc-2025Q1]: Makefile distinfo
        pkgsrc/lang/tcl/patches [pkgsrc-2025Q1]: patch-unix_configure

Log Message:
Pullup ticket #6959 - requested by he
lang/tcl: build fix

Revisions pulled up:
- lang/tcl/Makefile                                             1.132
- lang/tcl/distinfo                                             1.89
- lang/tcl/patches/patch-unix_configure                         1.18

---
   Module Name: pkgsrc
   Committed By:        he
   Date:                Mon Apr 14 16:40:19 UTC 2025

   Modified Files:
        pkgsrc/lang/tcl: Makefile distinfo
        pkgsrc/lang/tcl/patches: patch-unix_configure

   Log Message:
   lang/tcl: Adhere to new separator in TCL_PACKAGE_PATH from tcl 8.6.15.

   As the change log for 8.6.15 says:
   * TCL_PACKAGE_PATH in tclConfig.sh change from TCL list to ":"
           (UNIX) or ";" (Windows) separated items (nijtmans)
           *** POTENTIAL INCOMPATIBILITY ***

   And, indeed, yes, we were hit; tcl-scotty stopped working with the
   update from 8.6.14 to 8.6.16, indicating that it could not find
   the "tnm 2.1.11" extension.  TCL_PACKAGE_PATH is set in the tcl
   package's unix/configure by one of our patches, and a space needed
   to be a colon.

   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.131.2.1 pkgsrc/lang/tcl/Makefile
cvs rdiff -u -r1.87 -r1.87.2.1 pkgsrc/lang/tcl/distinfo
cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/lang/tcl/patches/patch-unix_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/tcl/Makefile
diff -u pkgsrc/lang/tcl/Makefile:1.131 pkgsrc/lang/tcl/Makefile:1.131.2.1
--- pkgsrc/lang/tcl/Makefile:1.131      Sat Jan 25 21:29:25 2025
+++ pkgsrc/lang/tcl/Makefile    Tue Apr 15 18:19:07 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.131 2025/01/25 21:29:25 adam Exp $
+# $NetBSD: Makefile,v 1.131.2.1 2025/04/15 18:19:07 bsiegert Exp $
 
 DISTNAME=      tcl${TCL_VERSION}-src
 PKGNAME=       tcl-${TCL_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 

Index: pkgsrc/lang/tcl/distinfo
diff -u pkgsrc/lang/tcl/distinfo:1.87 pkgsrc/lang/tcl/distinfo:1.87.2.1
--- pkgsrc/lang/tcl/distinfo:1.87       Sat Jan 25 21:29:25 2025
+++ pkgsrc/lang/tcl/distinfo    Tue Apr 15 18:19:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2025/01/25 21:29:25 adam Exp $
+$NetBSD: distinfo,v 1.87.2.1 2025/04/15 18:19:07 bsiegert Exp $
 
 BLAKE2s (tcl8.6.16-src.tar.gz) = ccc62d3aa48e249864864b5d89061575bca88257cc30b3916d02cb7e455b65af
 SHA512 (tcl8.6.16-src.tar.gz) = 434c92f8181fb8dca6bc065b0f1f5078779086f19adf008818c90a3108596c63465ef43e9f3c1cfb3d4151a9de244d0bf0e6ee5b40e714b1ddca4a78eb43050b
@@ -18,7 +18,7 @@ SHA1 (patch-pkgs_thread2.8.11_configure)
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
 SHA1 (patch-unix_Makefile.in) = e6ecbc7db3934ef4d7f0f24dd52c88ca0873289e
-SHA1 (patch-unix_configure) = 085be79d73fa74e70838516bd646d3e1151e652c
+SHA1 (patch-unix_configure) = b7af46a7870b6acad4ba79a5bc75fbd45edef949
 SHA1 (patch-unix_tclConfig.sh.in) = 341ac4f1bbfb29551dea87ade98b3b7b59652a31
 SHA1 (patch-unix_tclUnixCompat.c) = c5c124b5ccd240cbd34a83fd165c3dea208381cd
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f

Index: pkgsrc/lang/tcl/patches/patch-unix_configure
diff -u pkgsrc/lang/tcl/patches/patch-unix_configure:1.16 pkgsrc/lang/tcl/patches/patch-unix_configure:1.16.2.1
--- pkgsrc/lang/tcl/patches/patch-unix_configure:1.16   Sat Jan 25 21:29:26 2025
+++ pkgsrc/lang/tcl/patches/patch-unix_configure        Tue Apr 15 18:19:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure,v 1.16 2025/01/25 21:29:26 adam Exp $
+$NetBSD: patch-unix_configure,v 1.16.2.1 2025/04/15 18:19:07 bsiegert Exp $
 
 --- unix/configure.orig        2024-12-02 12:57:40.000000000 +0000
 +++ unix/configure
@@ -111,7 +111,7 @@ $NetBSD: patch-unix_configure,v 1.16 202
 -    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}:${prefix}/lib"
  else
 -    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
-+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib/tcl ${prefix}/lib"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib/tcl:${prefix}/lib"
  fi
  
  #--------------------------------------------------------------------