D20734.id82259.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D20734.id82259.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -557,21 +557,25 @@
	.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)