Page MenuHomeFreeBSD
Files F137989552

D28167.id82438.diff
No OneTemporary
Actions

D28167.id82438.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -557,19 +557,21 @@
.endif
.if !defined(PKG_VERSION)
-.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MPRERELEASE*}
-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*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*}
+_REVISION:= ${_REVISION:R}
+EXTRA_REVISION= .snap${_TIMENOW}
.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/}
+EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}
.elif ${_BRANCH:M*-p*}
-EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/}
+EXTRA_REVISION= p${_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)

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 10:38 PM (21 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26306283
Default Alt Text
D28167.id82438.diff (1 KB)

Event Timeline