git: da8cc827ae8f - main - pkgbase: collapse -PRERELEASE into STABLE/CURRENT case for version suffix

[Kyle Evans]

The branch main has been updated by kevans:

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

commit da8cc827ae8fb7063f7f97c2a0447930c4e934a3
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-14 18:19:51 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-17 20:08:13 +0000

    pkgbase: collapse -PRERELEASE into STABLE/CURRENT case for version suffix
    
    -PRERELEASE exists as a given stable/X branch while the next minor version
    release is in progress. From a functional standpoint, it should be treated
    as -STABLE since it'll typically be a superset of what's included in the
    concurrent releng branch.
    
    Reviewed by:    gjb
    Differential Revision:  https://reviews.freebsd.org/D28166
---
 Makefile.inc1 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 27229cb06711..f77fe5cfa25c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -557,7 +557,7 @@ VERSION=	FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDA
 .endif
 
 .if !defined(PKG_VERSION)
-.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*}
+.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MPRERELEASE*}
 TIMENOW=	%Y%m%d%H%M%S
 EXTRA_REVISION=	.s${TIMENOW:gmtime}
 .elif ${_BRANCH:MALPHA*}
@@ -566,8 +566,6 @@ EXTRA_REVISION= _${_BRANCH:C/-ALPHA/.a/}
 EXTRA_REVISION= _${_BRANCH:C/-BETA/.b/}
 .elif ${_BRANCH:MRC*}
 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