CVS commit: pkgsrc/lang/tcl

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Dec 27 11:08:31 UTC 2024

Modified Files:
        pkgsrc/lang/tcl: Makefile

Log Message:
lang/tcl: Fix interpreter for bin/sqlite3_analyzer.

This is not a #! interpreter directly -- for some reason it uses:

        #! /bin/sh
        # single-line sh comment, multi-line tcl comment \
        exec tclsh "$0" ${1+"$@"}

So we have to do some more work than REPLACE_INTERPRETER to fix the
path to tclsh.

PR pkg/58447: sqlite3_analyzer, bundled in lang/tcl, is broken


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/lang/tcl/Makefile

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.129 pkgsrc/lang/tcl/Makefile:1.130
--- pkgsrc/lang/tcl/Makefile:1.129      Thu Nov 14 22:20:32 2024
+++ pkgsrc/lang/tcl/Makefile    Fri Dec 27 11:08:30 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.129 2024/11/14 22:20:32 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2024/12/27 11:08:30 riastradh Exp $
 
 DISTNAME=      tcl${TCL_VERSION}-src
 PKGNAME=       tcl-${TCL_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -48,6 +48,17 @@ SUBST_FILES.tcl-config=      unix/tclConfig.s
 SUBST_SED.tcl-config+= -e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tcl-config+= -e "s|${WRKSRC}|${PREFIX}/include/tcl|"
 
+# Fix the exec path in bin/sqlite3_analyzer:
+#
+#      #! /bin/sh
+#      # single-line sh comment, multi-line tcl comment \
+#      exec tclsh "$0" ${1+"$@"}
+#
+SUBST_CLASSES+=                tclsh
+SUBST_STAGE.tclsh=     post-build
+SUBST_FILES.tclsh+=    pkgs/sqlite*/compat/sqlite3/spaceanal.tcl
+SUBST_SED.tclsh+=      -e '\|^\#! */bin/sh|,+2s|^exec tclsh |exec ${PREFIX}/bin/tclsh |'
+
 PLIST_SUBST+=          SONUM=${TCL_SONUM}
 PLIST_SUBST+=          BASEVER=${TCL_BASEVER}
 PLIST_SUBST+=          ITCL_VERSION=${ITCL_VERSION}