git: a1e3fb8fa0a4 - main - Fix _REVISION to be always major.minor

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=a1e3fb8fa0a4652bc345bd284c32d6630a8dbe08

commit a1e3fb8fa0a4652bc345bd284c32d6630a8dbe08
Author:     Eugene M. Kim <astralblue@gmail.com>
AuthorDate: 2022-03-11 04:32:00 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-02-06 21:02:32 +0000

    Fix _REVISION to be always major.minor
    
    Introduced in commit 613fe53, _REVISION was redefined to be just the
    major version (14) instead of major.minor (14.0) iff:
    
      - PKG_VERSION was not overridden (default), and
      - Branch was -CURRENT, -STABLE, or -PRERELEASE.
    
    This introduced side effects in other parts of the code which expected
    _REVISION to be major.minor:
    
      - make-pkg-package.sh target triple became amd64-portbld-freebsd14
        (should be amd64-portbld-freebsd14.0);
      - Versioned cross dev symlink name became amd64-freebsd14-<tool>
        (should be amd64-freebsd14.0-<tool>)
    
    Also, compounded with commit ea9a92d (which was introduced afterward
    and removed minor version from _REVISION incorrectly using :S with a
    regex) this also caused pkgbase repo to use a wrong PKG_ABI with a minor
    version (FreeBSD:14.0:amd64) when a custom PKG_VERSION was specified.
    (Note, without a custom PKG_VERSION the bug was not triggered because in
    that case _REVISION was already major-only.)
    
    This commit fixes both problems by introducing and using MAJOR_REVISION
    instead of redefining _REVISION.  Existing uses of _REVISION now see
    major.minor again, except PKG_ABI (ex: FreeBSD:14:amd64, as described
    above) and PKG_VERSION (ex: 14.snap20220311121531) need only the major
    version and now use MAJOR_REVISION instead.
    
    PR: 262600, 262601
    Reviewed by: imp, emaste
    Pull Request: https://github.com/freebsd/freebsd-src/pull/592
---
 Makefile.inc1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 7c82c2bfa763..d18a9795e7bf 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -536,12 +536,12 @@ SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 VERSION=	FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .export VERSION
 .endif
+MAJOR_REVISION=	${_REVISION:R}
 
 .if !defined(PKG_VERSION)
 _STRTIMENOW=	%Y%m%d%H%M%S
 _TIMENOW=	${_STRTIMENOW:gmtime}
 .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*}
-_REVISION:=	${_REVISION:R}
 EXTRA_REVISION=	.snap${_TIMENOW}
 .elif ${_BRANCH:MALPHA*}
 EXTRA_REVISION=	.a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW}
@@ -552,7 +552,7 @@ EXTRA_REVISION=	.rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW}
 .elif ${_BRANCH:M*-p*}
 EXTRA_REVISION=	p${_BRANCH:C/.*-p([0-9]+$)/\1/}
 .endif
-PKG_VERSION:=	${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
+PKG_VERSION:=	${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
 .endif
 .endif	# !defined(PKG_VERSION)
 
@@ -1901,7 +1901,7 @@ _pkgbootstrap: .PHONY
 # Determine PKG_ABI from newvers.sh if not already set.
 #
 .if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages))
-PKG_ABI=${_TYPE}:${_REVISION:S/\..*$//}:${TARGET_ARCH}
+PKG_ABI=${_TYPE}:${MAJOR_REVISION}:${TARGET_ARCH}
 .endif
 PKG_BIN_VERSION!=${PKG_CMD} --version </dev/null 2>/dev/null |\
     awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}'