Page MenuHomeFreeBSD

D8943.id23332.diff
No OneTemporary

D8943.id23332.diff

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -333,11 +333,22 @@
.endif
.if !defined(PKG_VERSION)
-.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MALPHA*}
-TIMENOW= %Y%m%d%H%M%S
-EXTRA_REVISION= .s${TIMENOW:gmtime}
-.endif
-.if ${_BRANCH:M*-p*}
+_STRTIMENOW= %Y%m%d%H%M%S
+_TIMENOW= ${_STRTIMENOW:gmtime}
+.if ${_BRANCH:MCURRENT*}
+_REVISION:= ${_REVISION:R}
+EXTRA_REVISION= .s${_TIMENOW}
+.elif ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE}
+EXTRA_REVISION= s${_TIMENOW}
+.elif ${_BRANCH:MALPHA*}
+EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+$)/\1/}
+.elif ${_BRANCH:MRC*}
+EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+$)/\1/}
+.elif ${_BRANCH:MPRERELEASE}
+EXTRA_REVISION= .p${_TIMENOW}
+.elif ${_BRANCH:MRC*}
+EXTRA_REVISION= .r${_BRANCH:C/RC([0-9]+$)/\1/}
+.elif ${_BRANCH:M*-p*}
EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/}
.endif
PKG_VERSION= ${_REVISION}${EXTRA_REVISION}

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 11:16 AM (10 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35137141
Default Alt Text
D8943.id23332.diff (980 B)

Event Timeline