Re: git: 769eb6c549e7 - main - Mk/Uses/tcl.mk: Fix typo

From: Pietro Cerutti <gahr_at_FreeBSD.org>
Date: Mon, 30 Sep 2024 12:44:54 UTC
On Sep 30 2024, 12:40 +0000, Po-Chuan Hsieh <sunpoet@FreeBSD.org> wrote:
>The branch main has been updated by sunpoet:
>
>URL: https://cgit.FreeBSD.org/ports/commit/?id=769eb6c549e7504e1a3bb83f4fbde350b33ee202
>
>commit 769eb6c549e7504e1a3bb83f4fbde350b33ee202
>Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
>AuthorDate: 2024-09-30 12:39:58 +0000
>Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
>CommitDate: 2024-09-30 12:39:58 +0000
>
>    Mk/Uses/tcl.mk: Fix typo

Sorry, thanks!

>    [00:00:01] Gathering ports metadata
>    [00:00:11] Warning: (graphics/py-pillow): make: "/usr/ports/Mk/Uses/tcl.mk" line 168: Unknown modifier "s/9/9./"
>    [00:00:11] Warning: (graphics/py-pillow): make: "/usr/ports/Mk/Uses/tcl.mk" line 168: Undefined variable "${_TCLTK_WANTED_VERSION:S/8/8./:s/9/9./}"
>    [00:00:11] Warning: (graphics/py-pillow): make: Fatal errors encountered -- cannot continue
>    [00:00:11] Warning: (graphics/py-pillow): Error: Error looking up dependencies for graphics/py-pillow
>    [00:00:12] Error: /usr/local/share/poudriere/bulk.sh:gather_port_vars:183:Fatal errors encountered gathering ports metadata
>
>    Approved by:    portmgr (blanket)
>---
> Mk/Uses/tcl.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
>index fe0375921e5d..dd9b7d842d83 100644
>--- a/Mk/Uses/tcl.mk
>+++ b/Mk/Uses/tcl.mk
>@@ -165,7 +165,7 @@ TCL_LIBDIR:=	${LOCALBASE}/lib/tcl${TCL_VER}
> TCL_INCLUDEDIR:=${LOCALBASE}/include/tcl${TCL_VER}
>
> .  if ${_TCLTK_PORT} == "tk"
>-TK_VER:=	${_TCLTK_WANTED_VERSION:S/8/8./:s/9/9./}
>+TK_VER:=	${_TCLTK_WANTED_VERSION:S/8/8./:S/9/9./}
> TK_SHLIB_VER:=	${_TCLTK_WANTED_VERSION}
> WISH:=		${LOCALBASE}/bin/wish${TCL_VER}
> TK_LIBDIR:=	${LOCALBASE}/lib/tk${TK_VER}

-- 
Pietro Cerutti
I have pledged to give 10% of income to effective charities
and invite you to join me - https://givingwhatwecan.org