Make several spells to use get_scm_version

8 files changed, 20 insertions, 21 deletions

diff --git a/windowmanagers/blackbox/DETAILS b/windowmanagers/blackbox/DETAILS
index c2455b353d..e647c91b22 100755
--- a/windowmanagers/blackbox/DETAILS
+++ b/windowmanagers/blackbox/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL=blackbox
 if [[ $BLACKBOX_BRANCH == scm ]]; then
- if [[ $BLACKBOX_AUTOUPDATE == y ]] ; then
-         VERSION=$(date +%Y%m%d)
- else
-         VERSION=cvs
- fi
+         VERSION=$(get_scm_version)
           SOURCE=${SPELL}-cvs-snapshot.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
    SOURCE_URL[0]=http://blackboxwm.sourceforge.net/$SOURCE
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index 57990dc87b..2f248c6355 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2013-08-19 Remko van der Vossen <wich@sourcemagr.org>
 	* DEPENDS: replace xorg-libs with individual libraries
 	* DETAILS: use new style source forge url
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 2c8685c331..f42efa8ed0 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL=fluxbox
 if [[ $FLUXBOX_BRANCH == scm ]]; then
-  if [[ $FLUXBOX_AUTOUPDATE == y ]]; then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=git
-  fi
+         VERSION=$(get_scm_version)
           SOURCE=$SPELL-git.tar.bz2
    SOURCE_URL[0]=git://git.fluxbox.org/fluxbox.git:fluxbox
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index cd32350eb7..2ae7b0b474 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2013-02-13 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.3.5
 
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index c45004ca75..f6589adb48 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -1,10 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL=fvwm
 if [[ "${FVWM_BRANCH}" == "scm" ]] ; then
-  if [[ "${FVWM_AUTOUPDATE}" == "y" ]] ; then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=cvs
-  fi
+         VERSION=$(get_scm_version)
           SOURCE=fvwm-cvs.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/fvwm-cvs
    SOURCE_URL[0]=cvs://:pserver:anonymous:guest@cvs.fvwm.org:/home/cvs/fvwm:fvwm
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index e288daace0..38bef69bf3 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2013-02-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 2.6.5
 
diff --git a/windowmanagers/wmii/DETAILS b/windowmanagers/wmii/DETAILS
index 0fb0599c42..b5ef103339 100755
--- a/windowmanagers/wmii/DETAILS
+++ b/windowmanagers/wmii/DETAILS
@@ -1,11 +1,7 @@
+. "$GRIMOIRE/FUNCTIONS"
            SPELL="wmii"
 if [[ ${WMII_BRANCH} == scm ]]; then
-    if [[ ${WMII_AUTOUPDATE} == "y" ]]
-    then
-         VERSION=$(date +%Y%m%d)
-    else
-         VERSION=scm
-    fi
+         VERSION=$(get_scm_version)
           SOURCE=${SPELL}-scm.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SOURCE%.tar.bz2}
    SOURCE_URL[0]=hg_http://hg.suckless.org/wmii:${SOURCE%.tar.bz2}
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index e23efb6b2f..39fd3616ad 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2014-07-03 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Use get_scm_version
+
 2011-09-14 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS, DOWNLOAD, PREPARE, DETAILS: Use prepare_select_branch