git: c2b3fcdc7cf8 - main - Tools/scripts/bump-revision.sh: insert PORTREVISION after DISTVERSIONSUFFIX

The branch main has been updated by bapt:

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

commit c2b3fcdc7cf8269823ed5acc6906d78fe123910f
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-09-07 08:13:26 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-09-07 08:18:17 +0000

    Tools/scripts/bump-revision.sh: insert PORTREVISION after DISTVERSIONSUFFIX
    
    When a port has a DISTVERSIONSUFFIX, PORTREVISION was inserted right
    after DISTVERSION, before DISTVERSIONSUFFIX, which breaks the variable
    order required by portlint.  Insert PORTREVISION after the last version
    line (DISTVERSIONSUFFIX if present, otherwise DISTVERSION/PORTVERSION).
    
    PR:             259289
---
 Tools/scripts/bump-revision.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Tools/scripts/bump-revision.sh b/Tools/scripts/bump-revision.sh
index 727a4578fab8..5c1307f70fbb 100755
--- a/Tools/scripts/bump-revision.sh
+++ b/Tools/scripts/bump-revision.sh
@@ -79,7 +79,15 @@ do
         1)
             # If the exit code is 1 then PORTREVISION wasn't found, so we need to add one with value of 1
             printc "INFO: $1 PORTREVISION not found, adding PORTREVISION= 1" "green"
-            rm -f $tempfile && awk '/^(PORT|DIST)VERSION\??=\t/{ print; print "PORTREVISION=\t1"; next } { print }' "$1/Makefile" > $tempfile \
+            rm -f $tempfile && awk '
+                /^(PORT|DIST)VERSION(PREFIX|SUFFIX)?\??=\t/ { last=NR }
+                { lines[NR]=$0 }
+                END {
+                    for (i=1; i<=NR; i++) {
+                        print lines[i]
+                        if (i==last) print "PORTREVISION=\t1"
+                    }
+                }' "$1/Makefile" > $tempfile \
             && cat $tempfile > "$1/Makefile"
             # If there is not PORTREVISION line, maybe it is a slave port, try
             # to add it before a CATEGORIES, PKGNAMESUFFIX or PKGNAMEPREFIX line: