git: b2cf9fac8a5c - main - python.mk: move ABI flag removal modifier out of ${_VC}

The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b2cf9fac8a5c6bd2c4ae878cf9c57bc72fe9f8f9

commit b2cf9fac8a5c6bd2c4ae878cf9c57bc72fe9f8f9
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-06-19 19:52:56 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-06-19 19:52:56 +0000

    python.mk: move ABI flag removal modifier out of ${_VC}
    
    Ugly hack needed by older bmake versions, ie not -CURRENT:
    
    : bmake: "/usr/ports/Mk/Uses/python.mk" line 471: Unknown modifier "/"
    : bmake: "/usr/ports/Mk/Uses/python.mk" line 471: Malformed conditional (!empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
    
    Fixes: ccaff6c14f2078ddc0edcbf26d7ee7e48b80c2a8
    Reported by: cmt
    PR: 274671
    Event: Kitchener-Waterloo Hackathon 202506
---
 Mk/Uses/python.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index d2b0462b974f..9af168fcdae9 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -463,12 +463,12 @@ IGNORE=	uses unknown USES=python arguments: ${_PYTHON_ARGS}
 .  endif
 
 # Pattern to convert python versions (X.Y or X.YY) to comparable format X.YY
-_VC=		C/^([1-9]\.)([0-9])$$/\10\2/:S/t$///
+_VC=		C/^([1-9]\.)([0-9])$$/\10\2/
 
 .undef _PYTHON_VERSION_NONSUPPORTED
-.  if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
+.  if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MINIMUM} at least
-.  elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
+.  elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
 .  endif
 
@@ -479,9 +479,9 @@ _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
 __VER=		${ver}
 .      if !defined(_PYTHON_VERSION) && \
 	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
-		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+		${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
-		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+		${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
 _PYTHON_VERSION=	${ver}
 .      endif
 .    endfor
@@ -496,9 +496,9 @@ IGNORE=		needs an unsupported version of Python
 .    for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
 .      if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
-		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+		${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
-		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+		${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
 .        if empty(_VALID_PYTHON_VERSIONS:M${ver})
 _VALID_PYTHON_VERSIONS+=	${ver}
 .        endif