From: Antoine Jacoutot <ajacoutot@bsdfrog.org>
Subject: Re: x11/cde: Use MODTCL_TCLSH_ADJ; drop a patch.
To: Stuart Cassoff <exokoide@yahoo.ca>
Cc: OpenBSD Ports <ports@openbsd.org>
Date: Thu, 20 Nov 2025 08:46:05 +0100

On Thu, Nov 20, 2025 at 07:24:43AM +0000, Stuart Cassoff wrote:
> diff -urNp /usr/ports/x11/cde/Makefile ./Makefile
> --- /usr/ports/x11/cde/Makefile Mon Oct 27 08:09:14 2025
> +++ ./Makefile  Thu Nov 20 02:07:00 2025
> @@ -88,8 +88,8 @@ post-patch:
>         ${SUBST_CMD} ${WRKSRC}/configure.ac
> 
>  pre-configure:
> -       ${SUBST_CMD} ${WRKSRC}/programs/dtdocbook/tcl/docbook.tcl \
> -               ${WRKSRC}/programs/dtlogin/Makefile.am
> +       @${MODTCL_TCLSH_ADJ} ${WRKSRC}/programs/dtdocbook/tcl/docbook.tcl
> +       @${SUBST_CMD} ${WRKSRC}/programs/dtlogin/Makefile.am
> 
>  pre-install:
>         mkdir -p ${PREFIX}/share/terminfo
> diff -urNp /usr/ports/x11/cde/patches/patch-programs_dtdocbook_tcl_docbook_tcl ./patches/patch-programs_dtdocbook_tcl_docbook_tcl
> --- /usr/ports/x11/cde/patches/patch-programs_dtdocbook_tcl_docbook_tcl Thu Jul 31 11:53:21 2025
> +++ ./patches/patch-programs_dtdocbook_tcl_docbook_tcl  Wed Dec 31 19:00:00 1969
> @@ -1,9 +0,0 @@
> -Index: programs/dtdocbook/tcl/docbook.tcl
> ---- programs/dtdocbook/tcl/docbook.tcl.orig
> -+++ programs/dtdocbook/tcl/docbook.tcl
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/tclsh
> -+#!${MODTCL_BIN}
> - # set the global variables
> - set nextId        0  ;# gets incremented before each use
> -

Nice, OK aja

-- 
Antoine