git: 03cab14ea3a8 - main - Revert "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=03cab14ea3a8e0444cec2ec3844e0648bd60bb58

commit 03cab14ea3a8e0444cec2ec3844e0648bd60bb58
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-01-14 13:15:05 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-01-14 13:15:05 +0000

    Revert "pkgbase: differentiate package versions for ALPHA/BETA/PRERELEASE/RC phases"
    
    This reverts commit aef769614f921660cb0262412426034cf5395ae5.
    
    While the package names are a bit prettier this confuse pkg about upgrading :
    $ pkg version -t 13.0.s2021011313063 13.0.a1
    >
    $ pkg version -t 13.0.s2021011313063 13.0_ALPHA1
    <
    
    Note that the current scheme isn't good when bumping from ALPHA to BETA or
    even BETA to RC:
    $ pkg version -t 13.0_ALPHA1 13.0_BETA1
    =
    $ pkg version -t 13.0_BETA1 13.0_RC1
    =
    
    But more thoughts have to be put into this renaming.
---
 Makefile.inc1 | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

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