git: aef769614f92 - main - pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases

[Emmanuel Vadot]

The branch main has been updated by manu:

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

commit aef769614f921660cb0262412426034cf5395ae5
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-01-14 12:56:38 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-01-14 13:00:04 +0000

    pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases
    
    The current postfix conversions are:
    
        CURRENT / STABLE -> .sYYYYMMDDhhmmss
        ALPHAx -> .ax, so 11.3-ALPHA1 becomes 11.3.a1
        BETAx -> .bx, so 12.1-BETA2 becomes 12.1.b2
        RCx -> .rcx, so 13.0-RC3 becomes 13.0.rc3
        PRERELEASE -> .p, so 11.3-PRERELEASE becomes 11.3.p
        RELEASE -> (nothing), so 12.1-RELEASE becomes 12.1
    
    Submitted by: rene (original version)
    Differential Revision: https://reviews.freebsd.org/D20734
---
 Makefile.inc1 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5a9eff870dd5..2242ca3be5b4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -557,21 +557,25 @@ VERSION=	FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA
 .endif
 
 .if !defined(PKG_VERSION)
-.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*}
-TIMENOW=	%Y%m%d%H%M%S
-EXTRA_REVISION=	.s${TIMENOW:gmtime}
+_STRTIMENOW=	%Y%m%d%H%M%S
+_TIMENOW=	${_STRTIMENOW:gmtime}
+.if ${_BRANCH:MCURRENT*}
+_REVISION:=	${_REVISION:R}
+EXTRA_REVISION=	.s${_TIMENOW}
+.elif ${_BRANCH:MSTABLE*}
+EXTRA_REVISION=	s${_TIMENOW}
+.elif ${_BRANCH:MPRERELEASE*}
+EXTRA_REVISION=	.p
 .elif ${_BRANCH:MALPHA*}
-EXTRA_REVISION= _${_BRANCH:C/-ALPHA/.a/}
+EXTRA_REVISION=	.a${_BRANCH:C/ALPHA([0-9]+).*/\1/}
 .elif ${_BRANCH:MBETA*}
-EXTRA_REVISION= _${_BRANCH:C/-BETA/.b/}
+EXTRA_REVISION=	.b${_BRANCH:C/BETA([0-9]+).*/\1/}
 .elif ${_BRANCH:MRC*}
-EXTRA_REVISION= _${_BRANCH:C/-RC/.r/}
-.elif ${_BRANCH:MPRERELEASE*}
-EXTRA_REVISION= _${_BRANCH:C/-PRERELEASE/.p/}
+EXTRA_REVISION=	.rc${_BRANCH:C/RC([0-9]+).*/\1/}
 .elif ${_BRANCH:M*-p*}
 EXTRA_REVISION=	_${_BRANCH:C/.*-p([0-9]+$)/\1/}
 .endif
-PKG_VERSION:=	${_REVISION}${EXTRA_REVISION}
+PKG_VERSION:=	${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
 .endif
 .endif	# !defined(PKG_VERSION)