[SM-Commit] GIT changes to master grimoire by Ismael Luceno (77146ea77afc5f1eef325ee3165813b03a333470)

Ismael Luceno scm at sourcemage.org
Sun Sep 25 16:43:49 EDT 2011


GIT changes to master grimoire by Ismael Luceno <ismael at sourcemage.org>:

 chat-im/licq/BUILD               |   92 +++++++++++++++++++--------------------
 chat-im/licq/DEPENDS             |    6 +-
 chat-im/licq/DETAILS             |    4 -
 chat-im/licq/HISTORY             |    3 +
 chat-im/licq/INSTALL             |    2 
 chat-im/licq/PREPARE             |    7 --
 chat-im/licq/PRE_BUILD           |   20 ++------
 chat-im/vacuum/DETAILS           |    2 
 chat-im/vacuum/HISTORY           |    3 +
 chat-im/vacuum/PREPARE           |    3 -
 devel/gccxml/HISTORY             |    3 +
 devel/gccxml/PREPARE             |    3 -
 devel/valgrind/DEPENDS           |    2 
 devel/valgrind/DETAILS           |    4 -
 devel/valgrind/DOWNLOAD          |   47 -------------------
 devel/valgrind/HISTORY           |    4 +
 devel/valgrind/PREPARE           |   10 ----
 disk/partimage-ng/DEPENDS        |    6 +-
 disk/partimage-ng/DETAILS        |    2 
 disk/partimage-ng/DOWNLOAD       |    2 
 disk/partimage-ng/HISTORY        |    3 +
 disk/partimage-ng/PREPARE        |    7 --
 e-16/e16/DEPENDS                 |    2 
 e-16/e16/DETAILS                 |    4 -
 e-16/e16/HISTORY                 |    3 +
 e-16/e16/PREPARE                 |   10 ----
 e-17/e17/DETAILS                 |    2 
 e-17/e17/HISTORY                 |    3 +
 e-17/e17/PREPARE                 |    4 -
 e-17/edje/DEPENDS                |    2 
 e-17/edje/DETAILS                |    4 -
 e-17/edje/HISTORY                |    3 +
 e-17/edje/PREPARE                |    8 ---
 e-17/embryo/DEPENDS              |    2 
 e-17/embryo/DETAILS              |    4 -
 e-17/embryo/HISTORY              |    3 +
 e-17/embryo/PREPARE              |    8 ---
 e-17/enki/DETAILS                |    2 
 e-17/enki/HISTORY                |    3 +
 e-17/enki/PREPARE                |    4 -
 e-17/enna/DETAILS                |    2 
 e-17/enna/DOWNLOAD               |    2 
 e-17/enna/HISTORY                |    3 +
 e-17/enna/PREPARE                |    4 -
 e-17/ephoto/DETAILS              |    2 
 e-17/ephoto/HISTORY              |    3 +
 e-17/ephoto/PREPARE              |    4 -
 e-17/erss/DETAILS                |    2 
 e-17/erss/HISTORY                |    3 +
 e-17/erss/PREPARE                |    4 -
 e-17/ewl/DETAILS                 |    2 
 e-17/ewl/HISTORY                 |    3 +
 e-17/ewl/PREPARE                 |    4 -
 e-17/ewler/DETAILS               |    2 
 e-17/ewler/HISTORY               |    3 +
 e-17/ewler/PREPARE               |    4 -
 editors/emacs/BUILD              |    2 
 editors/emacs/DEPENDS            |    2 
 editors/emacs/DETAILS            |    4 -
 editors/emacs/DOWNLOAD           |    2 
 editors/emacs/HISTORY            |    3 +
 editors/emacs/PREPARE            |    7 --
 editors/tidy/DEPENDS             |    2 
 editors/tidy/DETAILS             |   13 +++--
 editors/tidy/HISTORY             |    4 +
 editors/tidy/PREPARE             |    7 --
 editors/tidy/PRE_BUILD           |    2 
 emacs-lisp/clojure-mode/HISTORY  |    3 +
 emacs-lisp/clojure-mode/PREPARE  |    4 -
 emacs-lisp/cluck/HISTORY         |    3 +
 emacs-lisp/cluck/PREPARE         |    4 -
 emacs-lisp/coffee-mode/HISTORY   |    3 +
 emacs-lisp/coffee-mode/PREPARE   |    4 -
 emacs-lisp/egg/HISTORY           |    3 +
 emacs-lisp/egg/PREPARE           |    4 -
 emacs-lisp/haml-mode/HISTORY     |    3 +
 emacs-lisp/haml-mode/PREPARE     |    4 -
 emacs-lisp/identica-mode/HISTORY |    3 +
 emacs-lisp/identica-mode/PREPARE |    4 -
 emacs-lisp/scss-mode/HISTORY     |    3 +
 emacs-lisp/scss-mode/PREPARE     |    4 -
 emacs-lisp/sinatra_el/HISTORY    |    3 +
 emacs-lisp/sinatra_el/PREPARE    |    4 -
 ftp/fatrat/DEPENDS               |    2 
 ftp/fatrat/DETAILS               |    4 -
 ftp/fatrat/HISTORY               |    3 +
 ftp/fatrat/PREPARE               |    8 ---
 graphics-libs/mesalib/CONFIGURE  |   51 +++++++--------------
 graphics-libs/mesalib/DEPENDS    |    2 
 graphics-libs/mesalib/DETAILS    |   37 ++++-----------
 graphics-libs/mesalib/HISTORY    |    3 +
 graphics-libs/mesalib/PREPARE    |   28 -----------
 graphics-libs/poppler/DEPENDS    |    2 
 graphics-libs/poppler/DETAILS    |    6 +-
 graphics-libs/poppler/HISTORY    |    3 +
 graphics-libs/poppler/PREPARE    |    9 ---
 graphics/xaralx/DEPENDS          |    2 
 graphics/xaralx/DETAILS          |    4 -
 graphics/xaralx/HISTORY          |    3 +
 graphics/xaralx/PREPARE          |    7 --
 libs/dietlibc/DETAILS            |    4 -
 libs/dietlibc/HISTORY            |    3 +
 libs/dietlibc/PREPARE            |    8 ---
 libs/libdrm/DETAILS              |    4 -
 libs/libdrm/HISTORY              |    3 +
 libs/libdrm/PREPARE              |    8 ---
 libs/libdrm/PRE_BUILD            |    4 -
 libs/libnfo/DETAILS              |    4 -
 libs/libnfo/DOWNLOAD             |    2 
 libs/libnfo/HISTORY              |    3 +
 libs/libnfo/PREPARE              |    4 -
 libs/talloc/BUILD                |    2 
 libs/talloc/DETAILS              |    4 -
 libs/talloc/HISTORY              |    3 +
 libs/talloc/INSTALL              |    2 
 libs/talloc/PREPARE              |    8 ---
 libs/tevent/DEPENDS              |    1 
 libs/tevent/DETAILS              |    2 
 libs/tevent/HISTORY              |    4 +
 libs/tevent/PREPARE              |    3 -
 mail/mutt/CONFIGURE              |    6 +-
 mail/mutt/DEPENDS                |    8 +--
 mail/mutt/DETAILS                |    4 -
 mail/mutt/DOWNLOAD               |    2 
 mail/mutt/HISTORY                |    4 +
 mail/mutt/PREPARE                |   21 --------
 mail/mutt/PRE_BUILD              |    6 +-
 net/samba4/DEPENDS               |    2 
 net/samba4/DETAILS               |    4 -
 net/samba4/HISTORY               |    3 +
 net/samba4/PREPARE               |    7 --
 utils/renouveau/DETAILS          |    2 
 utils/renouveau/HISTORY          |    3 +
 utils/renouveau/PREPARE          |    4 -
 windowmanagers/fluxbox/BUILD     |    2 
 windowmanagers/fluxbox/DEPENDS   |    2 
 windowmanagers/fluxbox/DETAILS   |    4 -
 windowmanagers/fluxbox/HISTORY   |    3 +
 windowmanagers/fluxbox/PREPARE   |    7 --
 windowmanagers/fvwm/BUILD        |    2 
 windowmanagers/fvwm/DEPENDS      |    2 
 windowmanagers/fvwm/DETAILS      |   28 ++++-------
 windowmanagers/fvwm/HISTORY      |    3 +
 windowmanagers/fvwm/PREPARE      |   10 ----
 x11/transset/DETAILS             |    2 
 x11/transset/HISTORY             |    3 +
 x11/transset/PREPARE             |    4 -
 147 files changed, 392 insertions(+), 463 deletions(-)

New commits:
commit 77146ea77afc5f1eef325ee3165813b03a333470
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    ewler: Use prepare_select_branch

commit 208b33e06e64c2c64625bde22d728c6a44da6155
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    e16: Use prepare_select_branch

commit 803afdf8efe5e6ee4dd8d0c0467ecb158f98a352
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    fvwm: Use prepare_select_branch

commit 0ceeca3a975fa9bdd7e5ba74a174f01e975602a7
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    samba4: Use prepare_select_branch

commit f0fc0ab4be190c24924a227076be7dc509f43957
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    enna: Use prepare_select_branch

commit 83f6cda431df9061ebb4c2fed2d4c1ca2cb7f342
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    ephoto: Use prepare_select_branch

commit de7b3546f3c0613373d4fb3d71a57980aa85e321
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    vacuum: Use prepare_select_branch

commit bd677164e569c66adccde504de0ea5e9fa4a8677
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    e17: Use prepare_select_branch

commit 473f9c49e05231268d004bc685b73dde36061d2a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    edje: Use prepare_select_branch

commit f36bd4172a853d84a825777cd13b7ad67c79d89a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    embryo: Use prepare_select_branch

commit f14e5c3583777a37ab5238940fc562e7164ceb75
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    fatrat: Use prepare_select_branch

commit 5762aa0ee175b5a1bfbc6e7afd1abb2d93e934cf
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    fluxbox: Use prepare_select_branch

commit fa2947715f4060b6092a5f09fa1e58b7456fbdc7
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    xaralx: Use prepare_select_branch

commit b46df8acdcc4c069e3a19a14b63f19be37278a5f
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    enki: Use prepare_select_branch

commit 551b4a484c1d960d41be9306383f4ce9c74f3934
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    erss: Use prepare_select_branch

commit 2be90e371ec2c1d503da45c388ad4a8748abc94b
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    ewl: Use prepare_select_branch

commit 2fdf4a9d53091e9c22b5a772a57e01dee90b59af
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libnfo: Use prepare_select_branch

commit 4cd8aa3b7dfa5803eaba7642bb7086b09e09a660
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    transset: Use prepare_select_branch

commit 7ca88166f5fa8d9cdbbc030b85b17ff1e0ce01b5
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    tevent: Use prepare_select_branch

commit f305ad79e0cc35093f674a810f26e159ee98cdc0
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    tevent: depends on git

commit cff853168734d0f2bbd528f4f2206b777c20a083
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    talloc: Use prepare_select_branch

commit c634342bbb79383aed4992b67e9744177e1ded13
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    valgrind: Use prepare_select_branch

commit 92d3f7aecf0bbf3c60a535a9020cfb790b05e0dc
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    valgrind: Remove DOWNLOAD, sorcery supports Subversion URLs now

commit 2d8fa99cbcc3f05edb9da326150d08a8cef6b735
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    poppler: Use prepare_select_branch

commit 7c688668ff7b02cc953438e4b81ba35c1357337d
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    mesalib: Use prepare_select_branch

commit cd20985aabee8300d0fbb92a896e928b6c9db279
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libdrm: Use prepare_select_branch

commit 174bf87145e9fc399959b386c36127b218d136ba
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    dietlibc: Use prepare_select_branch

commit 3d281b6230b08a774bfdc110094984c20e3ba5a5
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    mutt: Use prepare_select_branch

commit dc6688f04452bba55906cdb33d7be37b33e13478
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    sinatra_el: Use prepare_select_branch

commit 6d241640d39513b1c30148f0f0e91c736aa25e68
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    scss-mode: Use prepare_select_branch

commit f08b3cdc544e232d9ff8c57d373388e2c320e97f
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    identica-mode: Use prepare_select_branch

commit 70f1291b6b7a7f0db7275e72a99e80f2851b8be3
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    haml-mode: Use prepare_select_branch

commit 2ae8120b1479a6da4fade76394101b0a05cd4c15
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    egg: Use prepare_select_branch

commit 63f16747a555d33d141af674dd71c9b27d841bdc
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    coffee-mode: Use prepare_select_branch

commit 77471158bd9c185c0f439ad9243bc0d3aa592dee
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    cluck: Use prepare_select_branch

commit 3f6897efc83126b2ae5ed224e5cede1d99036c00
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    clojure-mode: Use prepare_select_branch

commit 3b77b65387e23891b201730ddbc6389983a76a78
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    tidy: Use prepare_select_branch

commit cd888d7d6c00268acfca199eaceffc4df0d25f55
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    tidy: Word-wrap long description to 80 chars

commit f6f8678dbc17225bc5a12038e427c9fbcdac70f0
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    licq: Use prepare_select_branch

commit eac9e23dce5d3e5b06f96e159b2bcca845abbf4a
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gccxml: Use prepare_select_branch

commit 698cc847568cc4b17f1bba44d7cfd780fef70fba
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    emacs: Use prepare_select_branch

commit e2b635f9c7af2dc8fbdb07fa4632f7f16669ad6e
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    partimage-ng: Use prepare_select_branch

commit 83fdbb6a6d56ff7ab8d8492d47b976a98b455d93
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    renouveau: Use prepare_select_branch

diff --git a/chat-im/licq/BUILD b/chat-im/licq/BUILD
index 606ceb9..508deb3 100755
--- a/chat-im/licq/BUILD
+++ b/chat-im/licq/BUILD
@@ -1,29 +1,29 @@
-  if [ "$LICQ_SVN" == "y" ]; then
+  if [[ "$LICQ_BRANCH" == "scm" ]]; then
 	make -f Makefile.cvs
   fi &&
   default_build &&
 
-  if [ "$CDK" == "y" ]; then
-  cd  $SOURCE_DIRECTORY/plugins/console     &&
-  if [ "$LICQ_SVN" == "y" ]; then
-	  make -f Makefile.cvs
-  fi            &&
-  default_build
+  if [[ "$CDK" == "y" ]]; then
+    cd  $SOURCE_DIRECTORY/plugins/console     &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs
+    fi            &&
+    default_build
   fi            &&
 
-  if  [ "$QTGUI" == "y" ];  then
-	cd  $SOURCE_DIRECTORY/plugins/qt-gui	                      &&
-	if [ "$LICQ_SVN" == "y" ]; then
-		make -f Makefile.cvs
-	fi &&
+  if [[ "$QTGUI" == "y" ]]; then
+    cd  $SOURCE_DIRECTORY/plugins/qt-gui	                      &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs
+    fi &&
     default_build
   fi &&
 
-  if  [ "$QT4GUI" == "y" ];  then
-        cd  $SOURCE_DIRECTORY/plugins/qt4-gui                          &&
-        if [ "$LICQ_SVN" == "y" ]; then
-                make -f Makefile.cvs
-        fi &&
+  if [[ "$QT4GUI" == "y" ]]; then
+    cd  $SOURCE_DIRECTORY/plugins/qt4-gui                          &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs
+    fi &&
     mkdir build &&
     cd    build &&
     QTDIR=/usr &&
@@ -33,39 +33,39 @@
     make
   fi &&
 
-  if [ "$EMAIL" == "y" ]; then
-	cd $SOURCE_DIRECTORY/plugins/email                          &&
-    if [ "$LICQ_SVN" == "y" ]; then
-		make -f Makefile.cvs 
+  if [[ "$EMAIL" == "y" ]]; then
+    cd $SOURCE_DIRECTORY/plugins/email                          &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs 
     fi                                                          &&
-	default_build
+    default_build
   fi &&
 
-     if [ "$MSN" == "y" ] && ! list_find "$OPTS" "--disable-openssl"; then
-          cd $SOURCE_DIRECTORY/plugins/msn           &&
-       if [ "$LICQ_SVN" == "y" ]; then
-	     make -f Makefile.cvs 
-       fi                                            &&   
-	   default_build
-     fi  &&
+  if [[ "$MSN" == "y" ]] && ! list_find "$OPTS" "--disable-openssl"; then
+    cd $SOURCE_DIRECTORY/plugins/msn           &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs 
+    fi                                            &&   
+    default_build
+  fi  &&
 	
-	if [ "$AREP" == "y" ]; then
-		cd $SOURCE_DIRECTORY/plugins/auto-reply                     &&
-		if [ "$LICQ_SVN" == "y" ]; then
-		  make -f Makefile.cvs
-		fi                                                             &&
-		default_build
-	fi &&
+  if [[ "$AREP" == "y" ]]; then
+    cd $SOURCE_DIRECTORY/plugins/auto-reply                     &&
+    if [[ "$LICQ_BRANCH" == "scm" ]; then
+      make -f Makefile.cvs
+    fi                                                          &&
+    default_build
+  fi &&
 
-	if [ "$RMS" == "y" ]; then
-	  cd $SOURCE_DIRECTORY/plugins/rms                            &&
-      if [ "$LICQ_SVN" == "y" ]; then
-		  make -f Makefile.cvs
-      fi &&
-	  default_build
-	fi &&
+  if [[ "$RMS" == "y" ]]; then
+    cd $SOURCE_DIRECTORY/plugins/rms                            &&
+    if [[ "$LICQ_BRANCH" == "scm" ]]; then
+      make -f Makefile.cvs
+    fi &&
+    default_build
+  fi &&
 
-  if [ "$XOSD" == "y" ]; then
-	cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
-	default_build
+  if [[ "$XOSD" == "y" ]]; then
+    cd $SOURCE_DIRECTORY/plugins/osd-${SOURCE7_VERSION} &&
+    default_build
   fi
diff --git a/chat-im/licq/DEPENDS b/chat-im/licq/DEPENDS
index 34c025d..51b1e7b 100755
--- a/chat-im/licq/DEPENDS
+++ b/chat-im/licq/DEPENDS
@@ -1,6 +1,6 @@
-if [ "$LICQ_SVN" == "y" ]; then
-	depends SVN      &&
-	depends automake
+if [[ "$LICQ_BRANCH" == "scm" ]]; then
+  depends SVN      &&
+  depends automake
 fi &&
 if [ "$XOSD" == "y" ]; then
     depends xosd
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index aca5f6e..eaf9501 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -1,6 +1,6 @@
            SPELL=licq
-if [ "$LICQ_SVN" == "y" ]; then
-  if [ "$LICQ_SVN_AUTOUPDATE" == "y" ]; then
+if [[ "$LICQ_BRANCH" == "scm" ]]; then
+  if [[ "$LICQ_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index fa04029..97341c7 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, INSTALL, PREPARE, PRE_BUILD: Use prepare_select_branch
+
 2010-05-16 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.3.9
 
diff --git a/chat-im/licq/INSTALL b/chat-im/licq/INSTALL
index e2c1955..f1baaab 100755
--- a/chat-im/licq/INSTALL
+++ b/chat-im/licq/INSTALL
@@ -1,4 +1,4 @@
-if [ "$LICQ_SVN" == "y" ]; then
+if [[ "$LICQ_BRANCH" == "scm" ]]; then
 	mkdir -p /usr/share/licq/qt-gui      &&
 	cp -R $SOURCE_DIRECTORY/licq-data-svn/qt-gui/* \
 			/usr/share/licq/qt-gui                &&
diff --git a/chat-im/licq/PREPARE b/chat-im/licq/PREPARE
index 55bb3e6..2d11211 100755
--- a/chat-im/licq/PREPARE
+++ b/chat-im/licq/PREPARE
@@ -1,8 +1,5 @@
-config_query LICQ_SVN "Build SVN version?" ${LICQ_CVS:-n}  &&
-if [ "$LICQ_SVN" == "y" ]; then
-  config_query  LICQ_SVN_AUTOUPDATE   \
-                "Update to the latest SVN automatically on every cast?"  ${LICQ_CVS_AUTOUPDATE:-n}
-fi &&
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
 persistent_remove LICQ_CVS LICQ_CVS_AUTOUPDATE   &&
 config_query XOSD "Build xosd plugin (depends on xosd)?" n  &&
 config_query QTGUI "Build QT-X11 plugin (depends on qt-x11)?" n  &&
diff --git a/chat-im/licq/PRE_BUILD b/chat-im/licq/PRE_BUILD
index 8ee1cd1..064933f 100755
--- a/chat-im/licq/PRE_BUILD
+++ b/chat-im/licq/PRE_BUILD
@@ -1,38 +1,32 @@
 mk_source_dir $SOURCE_DIRECTORY  &&
 unpack_file '' &&
-if [[ "$LICQ_SVN" == "y" ]]; then
+if [[ "$LICQ_BRANCH" == "scm" ]]; then
 	cd $SOURCE_DIRECTORY  &&
 	patch -p1 < $SCRIPT_DIRECTORY/licq-fake-offline.patch
-fi &&
-if [ "$LICQ_SVN" == "y" ]; then
-	cd $SOURCE_DIRECTORY			 &&
+
 	unpack_file 2 &&
-	if [ "$AREP" == "y" ]; then
-		cd $SOURCE_DIRECTORY			 &&
+	if [[ "$AREP" == "y" ]]; then
 		unpack_file 3                    &&
 		mv ${SOURCE_DIRECTORY}/${SPELL}-auto-reply-svn \
 			${SOURCE_DIRECTORY}/plugins/auto-reply
 	fi &&
-	if [ "$CDK" == "y" ]; then
-		cd $SOURCE_DIRECTORY			 &&
+	if [[ "$CDK" == "y" ]]; then
 		unpack_file 4                    &&
 		mv ${SOURCE_DIRECTORY}/${SPELL}-console-svn \
 			${SOURCE_DIRECTORY}/plugins/console
 	fi &&
-	if [ "$RMS" == "y" ]; then
-		cd $SOURCE_DIRECTORY			 &&
+	if [[ "$RMS" == "y" ]]; then
 		unpack_file 5                    &&
 		mv ${SOURCE_DIRECTORY}/${SPELL}-rms-svn \
 			${SOURCE_DIRECTORY}/plugins/rms
 	fi &&
-	if [ "$EMAIL" == "y" ]; then
-		cd $SOURCE_DIRECTORY			 &&
+	if [[ "$EMAIL" == "y" ]]; then
 		unpack_file 6                    &&
 		mv ${SOURCE_DIRECTORY}/${SPELL}-email-svn \
 			${SOURCE_DIRECTORY}/plugins/email
 	fi
 fi
-if [ "$XOSD" == "y" ]; then
+if [[ "$XOSD" == "y" ]]; then
 	cd $SOURCE_DIRECTORY/plugins	 &&
 	unpack_file 7
 fi
diff --git a/chat-im/vacuum/DETAILS b/chat-im/vacuum/DETAILS
index 05355d0..e3d21a3 100755
--- a/chat-im/vacuum/DETAILS
+++ b/chat-im/vacuum/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vacuum
-if test "$VACUUM_SVN_AUTOUPDATE" = "y"; then
+if test "$VACUUM_AUTOUPDATE" = "y"; then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/chat-im/vacuum/HISTORY b/chat-im/vacuum/HISTORY
index 3e439b1..eaee916 100644
--- a/chat-im/vacuum/HISTORY
+++ b/chat-im/vacuum/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2011-08-18 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD, DEPENDS, DETAILS, PREPARE: spell created
 
diff --git a/chat-im/vacuum/PREPARE b/chat-im/vacuum/PREPARE
index 17332c3..f8b7d7e 100755
--- a/chat-im/vacuum/PREPARE
+++ b/chat-im/vacuum/PREPARE
@@ -1 +1,2 @@
-config_query VACUUM_SVN_AUTOUPDATE "Update to the latest SVN on every cast?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/devel/gccxml/HISTORY b/devel/gccxml/HISTORY
index 078501e..2fdc225 100644
--- a/devel/gccxml/HISTORY
+++ b/devel/gccxml/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2010-05-07 Ismael Luceno <ismael at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS: spell created
 
diff --git a/devel/gccxml/PREPARE b/devel/gccxml/PREPARE
index 94dfeb6..f8b7d7e 100755
--- a/devel/gccxml/PREPARE
+++ b/devel/gccxml/PREPARE
@@ -1 +1,2 @@
-config_query GCCXML_AUTOUPDATE "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/devel/valgrind/DEPENDS b/devel/valgrind/DEPENDS
index 5ecc1a8..9c30f00 100755
--- a/devel/valgrind/DEPENDS
+++ b/devel/valgrind/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $VALGRIND_SVN == y ]]
+if [[ $VALGRIND_BRANCH == scm ]]
 then
   depends  automake    &&
   depends  subversion
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index b95a709..fbc41ac 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -1,7 +1,7 @@
            SPELL=valgrind
-if [[ $VALGRIND_SVN == y ]]
+if [[ $VALGRIND_BRANCH == scm ]]
 then
-  if [[ $VALGRIND_SVN_AUTOUPDATE == y ]]
+  if [[ $VALGRIND_AUTOUPDATE == y ]]
   then
          VERSION=$(date +%Y%m%d)
   else
diff --git a/devel/valgrind/DOWNLOAD b/devel/valgrind/DOWNLOAD
deleted file mode 100755
index 3c0332a..0000000
--- a/devel/valgrind/DOWNLOAD
+++ /dev/null
@@ -1,47 +0,0 @@
-function url_r_svn_crack() {
-
-  URL=`url_strip_prefix "$1" svn`
-  R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
-  local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
-  R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
-  local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
-  R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
-
-}
-if [[ $VALGRIND_SVN == y ]]
-then
-url_r_svn_crack ${SOURCE_URL}                                                 &&
-message "${MESSAGE_COLOR}Starting SVN checkout of"                            \
-        "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"           &&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
-  message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" &&
-  tar -jxf $SOURCE_CACHE/${SOURCE}                                            &&
-  cd $R_SVN_MODULE                                                            &&
-  message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"             &&
-  svn                                                                         \
-      --non-interactive                                                       \
-      update                                                                  \
-      -r${R_SVN_TAG}                                                          &&
-  cd ..                                                                       &&
-  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
-  message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"   &&
-  svn                                                                         \
-      --non-interactive                                                       \
-      checkout                                                                \
-      -r${R_SVN_TAG}                                                          \
-      svn://${R_SVN_ROOT}                                                     \
-      ${R_SVN_MODULE}                                                         &&
-  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi                                                                            &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"               &&
-tar -jcf                                                                      \
-    ${SOURCE}                                                                 \
-    ${R_SVN_MODULE}                                                           &&
-cp  ${SOURCE} ${SOURCE_CACHE}/${SOURCE}                                       &&
-rm  ${SOURCE}                                                                 &&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-else
-acquire_src ''
-fi
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 3cf21fb..1de76a9 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,7 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DOWNLOAD: Remove, sorcery supports Subversion URLs now
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-08 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 3.6.1
 
diff --git a/devel/valgrind/PREPARE b/devel/valgrind/PREPARE
index d55f6d3..98d27e4 100755
--- a/devel/valgrind/PREPARE
+++ b/devel/valgrind/PREPARE
@@ -1,8 +1,2 @@
-config_query  VALGRIND_SVN  "Use SVN version?"  n
-
-if [[ $VALGRIND_SVN == y ]]
-then
-  config_query  VALGRIND_SVN_AUTOUPDATE  \
-                "Update to the latest SVN on every cast?"  \
-                n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index 8d86696..53c8be5 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -1,6 +1,6 @@
-if [[ $PART_VCS == y ]];then
-  depends bzr
-fi &&
+#if [[ $PARTIMAGE_NG_BRANCH == scm ]];then
+  depends bzr &&
+#fi &&
 depends cmake           &&
 depends -sub CXX gcc             &&
 depends parted          &&
diff --git a/disk/partimage-ng/DETAILS b/disk/partimage-ng/DETAILS
index c06d73a..5956188 100755
--- a/disk/partimage-ng/DETAILS
+++ b/disk/partimage-ng/DETAILS
@@ -1,5 +1,5 @@
            SPELL=partimage-ng
-if [[ "${PARTIMAGE_NG_SCM_AUTOUPDATE}" == y ]]; then
+if [[ "${PARTIMAGE_NG_AUTOUPDATE}" == y ]]; then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=trunk
diff --git a/disk/partimage-ng/DOWNLOAD b/disk/partimage-ng/DOWNLOAD
index 2bb4b9c..2d31665 100755
--- a/disk/partimage-ng/DOWNLOAD
+++ b/disk/partimage-ng/DOWNLOAD
@@ -1,6 +1,6 @@
 . $GRIMOIRE/FUNCTIONS &&
 
-#if [[ $PART_VCS == y ]];then
+#if [[ $PARTIMAGE_NG_BRANCH == scm ]];then
   bzr_download
 #else
 #  default_download
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index cf29b2a..44e8cfe 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/disk/partimage-ng/PREPARE b/disk/partimage-ng/PREPARE
index 04038aa..f8b7d7e 100755
--- a/disk/partimage-ng/PREPARE
+++ b/disk/partimage-ng/PREPARE
@@ -1,5 +1,2 @@
-#config_query  PARTIMAGE_NG_SCM "Use the trunk version?" n
-
-#if [ "$PARTIMAGE_NG_SCM" == "y" ]; then
-  config_query PARTIMAGE_NG_SCM_AUTOUPDATE "Update to the latest trunk automatically on every cast?" n
-#fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-16/e16/DEPENDS b/e-16/e16/DEPENDS
index fd373f7..3236f50 100755
--- a/e-16/e16/DEPENDS
+++ b/e-16/e16/DEPENDS
@@ -1,6 +1,6 @@
 depends  imlib2  &&
 
-if  [  "$E16_CVS"  ==  "y"  ];  then
+if [[ "$E16_BRANCH" == "scm" ]]; then
   depends  CVS
 fi  &&
 
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 1064999..0498cce 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -1,6 +1,6 @@
            SPELL=e16
-if  [  "$E16_CVS"  ==  "y"  ];  then
-  if  [  "$E16_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if [[ "$E16_BRANCH" == "scm" ]]; then
+  if [[ "$E16_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=cvs
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 2202e51..859497e 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-08-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.9
 
diff --git a/e-16/e16/PREPARE b/e-16/e16/PREPARE
index 4219b8b..98d27e4 100755
--- a/e-16/e16/PREPARE
+++ b/e-16/e16/PREPARE
@@ -1,8 +1,2 @@
-config_query  E16_CVS                                                      \
-              "Do you want to use the DR16 development version from CVS?"  \
-              n                                                            &&
-
-if  [  "$E16_CVS"  ==  "y"  ];  then
-  config_query  E16_CVS_AUTOUPDATE                              \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/e17/DETAILS b/e-17/e17/DETAILS
index 9f8c1d2..06ab780 100755
--- a/e-17/e17/DETAILS
+++ b/e-17/e17/DETAILS
@@ -1,5 +1,5 @@
            SPELL=e17
-if  [  "$ENLIGHTENMENT17_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [[ "$E17_AUTOUPDATE"  ==  "y" ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index 9402ff2..a366450 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-09-06 Ladislav Hagara <hgr at vabo.cz>
 	* BUILD: added --disable-illume and --disable-illume2
 
diff --git a/e-17/e17/PREPARE b/e-17/e17/PREPARE
index 384e8d0..f8b7d7e 100755
--- a/e-17/e17/PREPARE
+++ b/e-17/e17/PREPARE
@@ -1,2 +1,2 @@
-config_query  ENLIGHTENMENT17_CVS_AUTOUPDATE                     \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/edje/DEPENDS b/e-17/edje/DEPENDS
index e237d90..66fca47 100755
--- a/e-17/edje/DEPENDS
+++ b/e-17/edje/DEPENDS
@@ -6,6 +6,6 @@ depends  ecore   &&
 depends  imlib2  &&
 depends  lua     &&
 
-if  [  "$EDJE_CVS"  ==  "y"  ];  then
+if [[ "$EDJE_BRANCH" == "scm" ]]; then
   depends  subversion
 fi
diff --git a/e-17/edje/DETAILS b/e-17/edje/DETAILS
index b203fd9..6414880 100755
--- a/e-17/edje/DETAILS
+++ b/e-17/edje/DETAILS
@@ -1,6 +1,6 @@
            SPELL=edje
-if  [  "$EDJE_CVS"  ==  "y"  ];  then
-  if  [  "$EDJE_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if [[ "$EDJE_BRANCH" == "scm" ]]; then
+  if [[ "$EDJE_AUTOUPDATE" == "y" ]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
diff --git a/e-17/edje/HISTORY b/e-17/edje/HISTORY
index 81dcde0..084dc2b 100644
--- a/e-17/edje/HISTORY
+++ b/e-17/edje/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-01-29 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* DETAILS: updating version and url for 1.0.0 
 
diff --git a/e-17/edje/PREPARE b/e-17/edje/PREPARE
index 32cb587..98d27e4 100755
--- a/e-17/edje/PREPARE
+++ b/e-17/edje/PREPARE
@@ -1,6 +1,2 @@
-config_query  EDJE_CVS  "Build SCM (subversion) version?"  y  &&
-
-if  [  "$EDJE_CVS"  ==  "y"  ];  then
-  config_query  EDJE_CVS_AUTOUPDATE                                \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/embryo/DEPENDS b/e-17/embryo/DEPENDS
index 554add3..04d20cd 100755
--- a/e-17/embryo/DEPENDS
+++ b/e-17/embryo/DEPENDS
@@ -1,6 +1,6 @@
 depends  automake  &&
 depends  libtool   &&
 
-if  [  "$EMBRYO_CVS"  ==  "y"  ];  then
+if [[ "$EMBRYO_BRANCH" == "scm" ]]; then
   depends  subversion
 fi
diff --git a/e-17/embryo/DETAILS b/e-17/embryo/DETAILS
index c3ac57e..6294b97 100755
--- a/e-17/embryo/DETAILS
+++ b/e-17/embryo/DETAILS
@@ -1,6 +1,6 @@
            SPELL=embryo
-if  [  "$EMBRYO_CVS"  ==  "y"  ];  then
-  if  [  "$EMBRYO_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [[ "$EMBRYO_BRANCH"  ==  "scm" ]];  then
+  if  [[ "$EMBRYO_AUTOUPDATE"  ==  "y" ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
diff --git a/e-17/embryo/HISTORY b/e-17/embryo/HISTORY
index 1bd12c2..a151917 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-01-29 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* DETAILS: updating version and url for 1.0.0 
 
diff --git a/e-17/embryo/PREPARE b/e-17/embryo/PREPARE
index f1ffd7c..98d27e4 100755
--- a/e-17/embryo/PREPARE
+++ b/e-17/embryo/PREPARE
@@ -1,6 +1,2 @@
-config_query  EMBRYO_CVS  "Build SCM (subversion) version?"  y  &&
-
-if  [  "$EMBRYO_CVS"  ==  "y"  ];  then
-  config_query  EMBRYO_CVS_AUTOUPDATE                              \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/enki/DETAILS b/e-17/enki/DETAILS
index 1c01f42..00d2fe0 100755
--- a/e-17/enki/DETAILS
+++ b/e-17/enki/DETAILS
@@ -1,5 +1,5 @@
            SPELL=enki
-if  [  "$ENKI_SVN_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$ENKI_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/enki/HISTORY b/e-17/enki/HISTORY
index 5056ad8..401f59f 100644
--- a/e-17/enki/HISTORY
+++ b/e-17/enki/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-07-26 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD: we need .svn directory #15777
 
diff --git a/e-17/enki/PREPARE b/e-17/enki/PREPARE
index 3ec078d..f8b7d7e 100755
--- a/e-17/enki/PREPARE
+++ b/e-17/enki/PREPARE
@@ -1,2 +1,2 @@
-config_query  ENKI_SVN_AUTOUPDATE                     \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/enna/DETAILS b/e-17/enna/DETAILS
index 9bb10b2..ff2a4fd 100755
--- a/e-17/enna/DETAILS
+++ b/e-17/enna/DETAILS
@@ -1,5 +1,5 @@
            SPELL=enna
-if  [  "$ENNA_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$ENNA_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=mercurial
diff --git a/e-17/enna/DOWNLOAD b/e-17/enna/DOWNLOAD
index 3e17e37..d32e3ae 100755
--- a/e-17/enna/DOWNLOAD
+++ b/e-17/enna/DOWNLOAD
@@ -1,7 +1,7 @@
 #once the hg download handler hits stable sorcery this DOWNLOAD script would
 #only need to be removed, SOURCE_URL is compatible with the planned hg handler
 
-if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
+if [[ "${ENNA_BRANCH}" != "scm" ]]; then
   default_download
 else
   . $GRIMOIRE/hg_download.function
diff --git a/e-17/enna/HISTORY b/e-17/enna/HISTORY
index f90945c..964ee41 100644
--- a/e-17/enna/HISTORY
+++ b/e-17/enna/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch
+
 2011-07-25 Bor Kraljič <pyrobor at ver.si>
 	* DOWNLOAD: source $GRIMOIRE/hg_download.function before using hg_download
 
diff --git a/e-17/enna/PREPARE b/e-17/enna/PREPARE
index d2086ed..f8b7d7e 100755
--- a/e-17/enna/PREPARE
+++ b/e-17/enna/PREPARE
@@ -1,2 +1,2 @@
-config_query  ENNA_CVS_AUTOUPDATE                             \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/ephoto/DETAILS b/e-17/ephoto/DETAILS
index 3f1a52e..e7d8001 100755
--- a/e-17/ephoto/DETAILS
+++ b/e-17/ephoto/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ephoto
       PATCHLEVEL=1
-if  [  "$EPHOTO_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$EPHOTO_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/ephoto/HISTORY b/e-17/ephoto/HISTORY
index 4fc1452..fbaf2c0 100644
--- a/e-17/ephoto/HISTORY
+++ b/e-17/ephoto/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-07-22 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: eio added
 
diff --git a/e-17/ephoto/PREPARE b/e-17/ephoto/PREPARE
index 7a31dcf..f8b7d7e 100755
--- a/e-17/ephoto/PREPARE
+++ b/e-17/ephoto/PREPARE
@@ -1,2 +1,2 @@
-config_query  EPHOTO_CVS_AUTOUPDATE                           \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/erss/DETAILS b/e-17/erss/DETAILS
index 0540b6b..9cb73f3 100755
--- a/e-17/erss/DETAILS
+++ b/e-17/erss/DETAILS
@@ -1,5 +1,5 @@
            SPELL=erss
-if  [  "$ERSS_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$ERSS_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/erss/HISTORY b/e-17/erss/HISTORY
index 80286e7..49d07c1 100644
--- a/e-17/erss/HISTORY
+++ b/e-17/erss/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-10-30 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed SOURCE_URL
 
diff --git a/e-17/erss/PREPARE b/e-17/erss/PREPARE
index acea5a6..f8b7d7e 100755
--- a/e-17/erss/PREPARE
+++ b/e-17/erss/PREPARE
@@ -1,2 +1,2 @@
-config_query  ERSS_CVS_AUTOUPDATE                                \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/ewl/DETAILS b/e-17/ewl/DETAILS
index 41228bb..b109267 100755
--- a/e-17/ewl/DETAILS
+++ b/e-17/ewl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ewl
-if  [  "$EWL_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$EWL_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/ewl/HISTORY b/e-17/ewl/HISTORY
index 68939bc..1eee648 100644
--- a/e-17/ewl/HISTORY
+++ b/e-17/ewl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-10-30 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed SOURCE_URL
 
diff --git a/e-17/ewl/PREPARE b/e-17/ewl/PREPARE
index ebbdb32..f8b7d7e 100755
--- a/e-17/ewl/PREPARE
+++ b/e-17/ewl/PREPARE
@@ -1,2 +1,2 @@
-config_query  EWL_CVS_AUTOUPDATE                                 \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/ewler/DETAILS b/e-17/ewler/DETAILS
index 257955b..90a6100 100755
--- a/e-17/ewler/DETAILS
+++ b/e-17/ewler/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ewler
-if  [  "$EWLER_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [[  "$EWLER_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/e-17/ewler/HISTORY b/e-17/ewler/HISTORY
index 040437a..e7f53b7 100644
--- a/e-17/ewler/HISTORY
+++ b/e-17/ewler/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-10-30 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed SOURCE_URL
 
diff --git a/e-17/ewler/PREPARE b/e-17/ewler/PREPARE
index 4553af1..f8b7d7e 100755
--- a/e-17/ewler/PREPARE
+++ b/e-17/ewler/PREPARE
@@ -1,2 +1,2 @@
-config_query  EWLER_CVS_AUTOUPDATE                               \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index 322fe52..eca6106 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -9,7 +9,7 @@ export  LDFLAGS="${LDFLAGS/-z combreloc/}"  &&
 #
 export LDFLAGS="${LDFLAGS//-Wl,-O1/}"  &&
 
-if [ "$VCS" == "y" ]; then
+if [[ "$EMACS_BRANCH" == "scm" ]]; then
   # Crashes with -O3
   export  CFLAGS="${CFLAGS//-O3/-O2}"      &&
 
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index d413125..82595d4 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -38,6 +38,6 @@ optional_depends "gtk+2"                               \
                  ""                                    \
                  "for GTK+2 look"                      &&
 
-if [ "$VCS" == "y" ]; then
+if [[ "$EMACS_BRANCH" == "scm" ]]; then
   depends bzr
 fi
diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 464f19d..bf67fa0 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -1,6 +1,6 @@
            SPELL=emacs
-if  [ "$VCS"  ==  "y" ];  then
-    if [ "$VCS_AUTOUPDATE" == "y" ]; then
+if  [[ "$EMACS_BRANCH"  ==  "scm" ]];  then
+    if [[ "$EMACS_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
     else
          VERSION=trunk
diff --git a/editors/emacs/DOWNLOAD b/editors/emacs/DOWNLOAD
index 9875a33..e2d74a1 100755
--- a/editors/emacs/DOWNLOAD
+++ b/editors/emacs/DOWNLOAD
@@ -1,6 +1,6 @@
 . $GRIMOIRE/FUNCTIONS &&
 
-if [ "$VCS" == "y" ]
+if [[ "$EMACS_BRANCH" == "scm" ]]
 then
   bzr_download
 else
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 31c5043..397ad26 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch
+
 2011-05-17 Peng Chang (Charles) <chp at sourcemage.org>
 	* DETAILS: updated spell to 23.3
 
diff --git a/editors/emacs/PREPARE b/editors/emacs/PREPARE
index 7d4a8a3..98d27e4 100755
--- a/editors/emacs/PREPARE
+++ b/editors/emacs/PREPARE
@@ -1,5 +1,2 @@
-config_query  VCS  "Use the trunk version?"  n
-
-if [ "$VCS" == "y" ]; then
-  config_query VCS_AUTOUPDATE "Update to the latest trunk automatically on every cast?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/editors/tidy/DEPENDS b/editors/tidy/DEPENDS
index 3cdf603..8b7b4ba 100755
--- a/editors/tidy/DEPENDS
+++ b/editors/tidy/DEPENDS
@@ -1,4 +1,4 @@
-if [  "${TIDY_CVS}" == "y"  ]
+if [[ "${TIDY_BRANCH}" == "scm" ]]
 then depends CVS
 fi
 
diff --git a/editors/tidy/DETAILS b/editors/tidy/DETAILS
index fba63d5..181fa72 100755
--- a/editors/tidy/DETAILS
+++ b/editors/tidy/DETAILS
@@ -1,11 +1,9 @@
            SPELL=tidy
-if [  "${TIDY_CVS}" == "y"  ] ; then
-
-  if [ "${TIDY_CVS_AUTOUPDATE}" == "y" ]
+if [[ "${TIDY_BRANCH}" == "scm" ]]; then
+  if [[ "${TIDY_AUTOUPDATE}" == "y" ]]
   then   VERSION=$(date +%Y%m%d)
   else   VERSION=cvs
   fi
-
           SOURCE=$SPELL-cvsroot.tar.bz2
    SOURCE_URL[0]=cvs://:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy:tidy
    SOURCE_IGNORE=volatile
@@ -40,5 +38,10 @@ fi
         KEYWORDS="html editors"
            SHORT="Tidy cleans up bad HTML"
 cat << EOF
-Tidy is able to fix up a wide range of problems and to bring to your attention things that you need to work on yourself. Each item found is listed with the line number and column so that you can see where the problem lies in your markup. Tidy won't generate a cleaned up version when there are problems that it can't be sure of how to handle. These are logged as "errors" rather than "warnings".
+Tidy is able to fix up a wide range of problems and to bring to your attention
+things that you need to work on yourself. Each item found is listed with the
+line number and column so that you can see where the problem lies in your
+markup. Tidy won't generate a cleaned up version when there are problems that
+it can't be sure of how to handle. These are logged as "errors" rather than
+"warnings".
 EOF
diff --git a/editors/tidy/HISTORY b/editors/tidy/HISTORY
index 3909e05..7bcbe53 100644
--- a/editors/tidy/HISTORY
+++ b/editors/tidy/HISTORY
@@ -1,3 +1,7 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: Word-wrap long description to 80 chars
+	* DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed MAINTAINER.
 
diff --git a/editors/tidy/PREPARE b/editors/tidy/PREPARE
index 13fb0c5..98d27e4 100755
--- a/editors/tidy/PREPARE
+++ b/editors/tidy/PREPARE
@@ -1,5 +1,2 @@
-config_query TIDY_CVS "Use CVS version?" n
-if [ "${TIDY_CVS}" == "y" ]; then
-  config_query  TIDY_CVS_AUTOUPDATE                      \
-  "Update to the latest CVS automatically on every cast?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/editors/tidy/PRE_BUILD b/editors/tidy/PRE_BUILD
index 11e2f96..3553d49 100755
--- a/editors/tidy/PRE_BUILD
+++ b/editors/tidy/PRE_BUILD
@@ -7,7 +7,7 @@ then unpack_file 2
 fi
 
 
-if [ "$TIDY_CVS" == "y" ]; then
+if [[ "$TIDY_BRANCH" == "scm" ]]; then
   cd "$SOURCE_DIRECTORY"                                 &&
   NOCONFIGURE=ON source ./build/gnuauto/setup.sh
 fi                                                       &&
diff --git a/emacs-lisp/clojure-mode/HISTORY b/emacs-lisp/clojure-mode/HISTORY
index 1a89dc3..c17eca9 100644
--- a/emacs-lisp/clojure-mode/HISTORY
+++ b/emacs-lisp/clojure-mode/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-02 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/clojure-mode/PREPARE b/emacs-lisp/clojure-mode/PREPARE
index a1c3834..f8b7d7e 100755
--- a/emacs-lisp/clojure-mode/PREPARE
+++ b/emacs-lisp/clojure-mode/PREPARE
@@ -1,2 +1,2 @@
-config_query CLOJURE_MODE_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/cluck/HISTORY b/emacs-lisp/cluck/HISTORY
index a0c6f47..ff0ee4f 100644
--- a/emacs-lisp/cluck/HISTORY
+++ b/emacs-lisp/cluck/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2010-12-08 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
 
diff --git a/emacs-lisp/cluck/PREPARE b/emacs-lisp/cluck/PREPARE
index 833f792..f8b7d7e 100755
--- a/emacs-lisp/cluck/PREPARE
+++ b/emacs-lisp/cluck/PREPARE
@@ -1,2 +1,2 @@
-config_query CLUCK_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/coffee-mode/HISTORY b/emacs-lisp/coffee-mode/HISTORY
index 1a89dc3..c17eca9 100644
--- a/emacs-lisp/coffee-mode/HISTORY
+++ b/emacs-lisp/coffee-mode/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-02 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/coffee-mode/PREPARE b/emacs-lisp/coffee-mode/PREPARE
index b6a330e..f8b7d7e 100755
--- a/emacs-lisp/coffee-mode/PREPARE
+++ b/emacs-lisp/coffee-mode/PREPARE
@@ -1,2 +1,2 @@
-config_query COFFEE_MODE_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/egg/HISTORY b/emacs-lisp/egg/HISTORY
index a0c6f47..ff0ee4f 100644
--- a/emacs-lisp/egg/HISTORY
+++ b/emacs-lisp/egg/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2010-12-08 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
 
diff --git a/emacs-lisp/egg/PREPARE b/emacs-lisp/egg/PREPARE
index 872ed55..f8b7d7e 100755
--- a/emacs-lisp/egg/PREPARE
+++ b/emacs-lisp/egg/PREPARE
@@ -1,2 +1,2 @@
-config_query EGG_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/haml-mode/HISTORY b/emacs-lisp/haml-mode/HISTORY
index 52a9ded..0262cbb 100644
--- a/emacs-lisp/haml-mode/HISTORY
+++ b/emacs-lisp/haml-mode/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-01 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/haml-mode/PREPARE b/emacs-lisp/haml-mode/PREPARE
index 5f9a8cf..f8b7d7e 100755
--- a/emacs-lisp/haml-mode/PREPARE
+++ b/emacs-lisp/haml-mode/PREPARE
@@ -1,2 +1,2 @@
-config_query HAML_MODE_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/identica-mode/HISTORY b/emacs-lisp/identica-mode/HISTORY
index df1994c..98947ec 100644
--- a/emacs-lisp/identica-mode/HISTORY
+++ b/emacs-lisp/identica-mode/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-09 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/identica-mode/PREPARE b/emacs-lisp/identica-mode/PREPARE
index db761a1..f8b7d7e 100755
--- a/emacs-lisp/identica-mode/PREPARE
+++ b/emacs-lisp/identica-mode/PREPARE
@@ -1,2 +1,2 @@
-config_query IDENTICA_MODE_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/scss-mode/HISTORY b/emacs-lisp/scss-mode/HISTORY
index 1a89dc3..c17eca9 100644
--- a/emacs-lisp/scss-mode/HISTORY
+++ b/emacs-lisp/scss-mode/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-02 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/scss-mode/PREPARE b/emacs-lisp/scss-mode/PREPARE
index 3a18c49..f8b7d7e 100755
--- a/emacs-lisp/scss-mode/PREPARE
+++ b/emacs-lisp/scss-mode/PREPARE
@@ -1,2 +1,2 @@
-config_query SCSS_MODE_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/emacs-lisp/sinatra_el/HISTORY b/emacs-lisp/sinatra_el/HISTORY
index 52a9ded..0262cbb 100644
--- a/emacs-lisp/sinatra_el/HISTORY
+++ b/emacs-lisp/sinatra_el/HISTORY
@@ -1,2 +1,5 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* PREPARE: Use prepare_select_branch
+
 2011-01-01 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: spell created
diff --git a/emacs-lisp/sinatra_el/PREPARE b/emacs-lisp/sinatra_el/PREPARE
index 10e8756..f8b7d7e 100755
--- a/emacs-lisp/sinatra_el/PREPARE
+++ b/emacs-lisp/sinatra_el/PREPARE
@@ -1,2 +1,2 @@
-config_query SINATRA_EL_AUTOUPDATE \
-  "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/ftp/fatrat/DEPENDS b/ftp/fatrat/DEPENDS
index 29a3605..e78a9c7 100755
--- a/ftp/fatrat/DEPENDS
+++ b/ftp/fatrat/DEPENDS
@@ -1,7 +1,7 @@
 depends qt4 &&
 depends asio &&
 
-if [[ $FATRAT_SCM == y ]]; then
+if [[ $FATRAT_BRANCH == scm ]]; then
 
 optional_depends curl                  \
                  "-DWITH_CURL=ON"      \
diff --git a/ftp/fatrat/DETAILS b/ftp/fatrat/DETAILS
index 64c0470..eed0a4d 100755
--- a/ftp/fatrat/DETAILS
+++ b/ftp/fatrat/DETAILS
@@ -1,8 +1,8 @@
            SPELL=fatrat
 
-if [[ $FATRAT_SCM == y ]]; then
+if [[ $FATRAT_BRANCH == scm ]]; then
 
-  if [[ $FATRAT_SCM_AUTOUPDATE == y ]]; then
+  if [[ $FATRAT_AUTOUPDATE == y ]]; then
     VERSION=$(date +%Y%m%d)
   else
     VERSION=git
diff --git a/ftp/fatrat/HISTORY b/ftp/fatrat/HISTORY
index 78c66eb..241c0a4 100644
--- a/ftp/fatrat/HISTORY
+++ b/ftp/fatrat/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2008-09-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1, bz2 -> gz
 
diff --git a/ftp/fatrat/PREPARE b/ftp/fatrat/PREPARE
index 8a5b623..98d27e4 100755
--- a/ftp/fatrat/PREPARE
+++ b/ftp/fatrat/PREPARE
@@ -1,6 +1,2 @@
-config_query FATRAT_SCM "Build latest version of $SPELL from GIT development tree?" n  &&
-
-if [[ $FATRAT_SCM == y ]]; then
-  config_query FATRAT_SCM_AUTOUPDATE \
-               "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index ba43967..3cff28c 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -33,35 +33,20 @@ config_query_list MESALIB_BUILD                                          \
                   osmesa                                                 &&
 
 if [[ $MESALIB_BUILD == dri ]]; then
-  if [[ "$MESALIB_VER" == "stable" ]]; then
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
-                      sis swrast tdfx unichrome"
-  else
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
-                      sis swrast tdfx unichrome"
-  fi &&
+  AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
+                    sis swrast tdfx unichrome"
 
-config_query_multi MESALIB_DRIVERS                                       \
+  config_query_multi MESALIB_DRIVERS                                       \
                    "What drivers would you like to build?"               \
-                   all $AVAILABLE_DRIVERS
+                   all $AVAILABLE_DRIVERS &&
 
   if list_find "$MESALIB_DRIVERS" all; then
     MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
-  fi
-
-if [[ "$MESALIB_VER" == "stable" ]] || \
-   [[ "$MESALIB_VER" == "feature" ]]; then
-
-config_query_multi MESALIB_GALLIUM                                       \
-                   "What Gallium3D drivers woulld you like to build?"    \
-                   none llvm svga i915 i965 radeon r600 nouveau swrast
+  fi &&
 
-else
-config_query_multi MESALIB_GALLIUM                                       \
+  config_query_multi MESALIB_GALLIUM                                       \
                    "What Gallium3D drivers woulld you like to build?"    \
                    none llvm svga i915 i965 radeon r600 nouveau swrast
-
-fi
 fi &&
 
 if [[ $MESALIB_BUILD == xlib ]]; then MESALIB_DRIVERS="swrast"
@@ -82,19 +67,17 @@ config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
 # config_query_option MESALIB_OPTS "enable GLUT library" y \
 #                     "--enable-glut" "--disable-glut"
 
-if [[ "$MESALIB_VER" == "developement" ]] || \
-   [[ "$MESALIB_VER" == "git" ]]; then
-
-config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \
-                    "--enable-gles1" "--disable-gles1" &&
+case "$MESALIB_BRANCH" in
+  scm|development)
+    config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \
+                        "--enable-gles1" "--disable-gles1" &&
+    config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \
+                        "--enable-gles2" "--disable-gles2" &&
 
-config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \
-                    "--enable-gles2" "--disable-gles2" &&
+   if list_find "--enable-gles1" $MESALIB_OPTS || \
+      list_find "--enable-gles2" $MESALIB_OPTS; then
 
-if ( list_find "--enable-gles1" $MESALIB_OPTS ) || \
-   ( list_find "--enable-gles2" $MESALIB_OPTS ); then
-
-config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?" n \
-                    "--enable-gles-overlay" "--disable-gles-overlay"
-fi
+     config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?" n \
+                         "--enable-gles-overlay" "--disable-gles-overlay"
+  fi
 fi
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 6c61a57..cfd8091 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -47,6 +47,6 @@ if ( list_find "r200" $MESALIB_DRIVERS ) || \
   sub_depends libdrm RADEON
 fi &&
 
-if [[ $MESALIB_VER == "git" ]]; then
+if [[ $MESALIB_BRANCH == "scm" ]]; then
   depends  git
 fi
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 84f3beb..227cf9d 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -1,41 +1,25 @@
            SPELL=mesalib
-
-###
-# MESALIB_GIT => MESALIB_VER
-
-if [[ $MESALIB_GIT == "y" ]]; then
-  MESALIB_VER="git"
-fi
-
-if [[ $MESALIB_GIT == "n" ]]; then
-  MESALIB_VER="stable"
-fi
-###
-
-if [[ -z $MESALIB_VER ]]; then
-  MESALIB_VER="stable"
-fi
-
-case $MESALIB_VER in 
-      stable)
+case "$MESALIB_BRANCH" in 
+  stable)
          VERSION=7.9.2
   ;;
-     feature)
+  feature)
          VERSION=7.10.3
   ;;
-developement)
+  developement)
          VERSION=7.10.3
   ;;
-         git)
-       if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
+  scm)
+    if [[ "$MESALIB_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
-       else
+    else
          VERSION=git
-       fi
+    fi
+
   ;;
 esac
 
-if [[ "$MESALIB_VER" == "git" ]]; then
+if [[ "$MESALIB_BRANCH" == "scm" ]]; then
           SOURCE=$SPELL-git.tar.bz2
   FORCE_DOWNLOAD="on"
    SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
@@ -47,7 +31,6 @@ else
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 fi
-
       LICENSE[0]=GPL
         WEB_SITE=http://www.mesa3d.org/
         KEYWORDS="graphics libs"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 1e53079..00d5ff1 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* CONFIGURE, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-06-24 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: correctly compare versions
 
diff --git a/graphics-libs/mesalib/PREPARE b/graphics-libs/mesalib/PREPARE
index efdb8ea..954086c 100755
--- a/graphics-libs/mesalib/PREPARE
+++ b/graphics-libs/mesalib/PREPARE
@@ -1,26 +1,2 @@
-###
-# MESALIB_GIT => MESALIB_VER
-
-if [[ $MESALIB_GIT == "y" ]]; then
-  persistent_add MESALIB_VER    &&
-  MESALIB_VER="git"             &&
-  persistent_remove MESALIB_GIT
-fi
-
-if [[ $MESALIB_GIT == "n" ]]; then
-  persistent_add MESALIB_VER    &&
-  MESALIB_VER="stable"          &&
-  persistent_remove MESALIB_GIT
-fi
-###
-
-config_query_list MESALIB_VER "Which version would you like to build?" \
-                  stable       \
-                  feature      \
-                  developement \
-                  git          &&
-
-if [[ "$MESALIB_VER" == "git" ]]; then
-  config_query MESALIB_GIT_AUTOUPDATE                                  \
-               "Queue for update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable feature development scm
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 97e66b4..c148a1c 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
 depends fontconfig &&
 depends poppler-data &&
 
-if [[ $POPPLER_VER == vcs ]]; then
+if [[ $POPPLER_BRANCH == scm ]]; then
   depends git
 fi &&
 
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index fde0bea..7ecea4f 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -1,6 +1,6 @@
            SPELL=poppler
-if [[ $POPPLER_VER == vcs ]]; then
-  if [[ $POPPLER_CVS_AUTOUPDATE == y ]]; then
+if [[ $POPPLER_BRANCH == scm ]]; then
+  if [[ $POPPLER_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_URL[0]=git://git.freedesktop.org/git/poppler/poppler:poppler-git
    SOURCE_IGNORE=volatile
 else
- if [[ $POPPLER_VER == devel ]]; then
+ if [[ $POPPLER_BRANCH == devel ]]; then
          VERSION=0.16.7
      SOURCE_HASH=sha512:a0f16f392f9f5703eef00b6c11e78e8cf21bf596c27d621fe824efe75cc0cf0637c4175469cb9214d5ba7de666c3131a5ef6040ba8ea9185e6120f92a59aaccc
  else
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 5ed1662..3fdbdd8 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/graphics-libs/poppler/PREPARE b/graphics-libs/poppler/PREPARE
index 0c0339f..40600f7 100755
--- a/graphics-libs/poppler/PREPARE
+++ b/graphics-libs/poppler/PREPARE
@@ -1,7 +1,2 @@
-#config_query POPPLER_CVS "Build git version?" n &&
-config_query_list POPPLER_VER "which version to build?" stable devel vcs &&
-
-if [[ $POPPLER_VER == vcs ]]; then
-  config_query POPPLER_CVS_AUTOUPDATE \
-               "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/graphics/xaralx/DEPENDS b/graphics/xaralx/DEPENDS
index 3d31f70..fa5899e 100755
--- a/graphics/xaralx/DEPENDS
+++ b/graphics/xaralx/DEPENDS
@@ -8,6 +8,6 @@ depends zip       &&
 depends perl      &&
 depends freetype2 &&
 depends libxml2   &&
-if [ "$XARALX_SVN" = "y" ]; then
+if [ "$XARALX_BRANCH" = "scm" ]; then
   depends subversion
 fi
diff --git a/graphics/xaralx/DETAILS b/graphics/xaralx/DETAILS
index 7af2ea2..d2e01db 100755
--- a/graphics/xaralx/DETAILS
+++ b/graphics/xaralx/DETAILS
@@ -1,7 +1,7 @@
            SPELL=xaralx
           SPELLX=XaraLX
-if [[ $XARALX_SVN == y ]]; then
-    if [[ $XARALX_SVN_AUTOUPDATE == y ]]; then
+if [[ $XARALX_BRANCH == scm ]]; then
+    if [[ $XARALX_AUTOUPDATE == y ]]; then
         VERSION=$(date +%Y%m%d)
     else
         VERSION=svn
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index 9f6e303..dc17e5d 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/graphics/xaralx/PREPARE b/graphics/xaralx/PREPARE
index 85d7561..98d27e4 100755
--- a/graphics/xaralx/PREPARE
+++ b/graphics/xaralx/PREPARE
@@ -1,5 +1,2 @@
-config_query XARALX_SVN "Build SVN version?" n &&
-
-if [[ $XARALX_SVN == y ]]; then
-    config_query XARALX_SVN_AUTOUPDATE "Update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/dietlibc/DETAILS b/libs/dietlibc/DETAILS
index cd17f1d..572735b 100755
--- a/libs/dietlibc/DETAILS
+++ b/libs/dietlibc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dietlibc
-if [[ $DIETLIBC_CVS == y ]]; then
-  if [[ $DIETLIBC_CVS_AUTOUPDATE == y ]]; then
+if [[ $DIETLIBC_BRANCH == scm ]]; then
+  if [[ $DIETLIBC_AUTOUPDATE == y ]]; then
           VERSION=$(date +%Y%m%d)
   else
           VERSION=cvs
diff --git a/libs/dietlibc/HISTORY b/libs/dietlibc/HISTORY
index 48c9a9a..2f92581 100644
--- a/libs/dietlibc/HISTORY
+++ b/libs/dietlibc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2009-06-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.32; added more bashism; quoting paths
 
diff --git a/libs/dietlibc/PREPARE b/libs/dietlibc/PREPARE
index 5f78795..98d27e4 100755
--- a/libs/dietlibc/PREPARE
+++ b/libs/dietlibc/PREPARE
@@ -1,6 +1,2 @@
-config_query  DIETLIBC_CVS  "Build the cvs version?"  n
-if [[ $DIETLIBC_CVS == y ]]; then
-  config_query  DIETLIBC_CVS_AUTOUPDATE                                    \
-                "Update to the latest CVS automatically on every cast?" \
-                n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 0c8f655..9b41559 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libdrm
-if [[ $LIBDRM_VCS == y ]]; then
-  if [[ $LIBDRM_VCS_AUTOUPDATE == y ]]; then
+if [[ $LIBDRM_BRANCH == scm ]]; then
+  if [[ $LIBDRM_AUTOUPDATE == y ]]; then
          VERSION="$(date +%Y%m%d)"
   else
          VERSION=git
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 51e31d1..1c99c94 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
 2011-08-09 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* DEPENDS: Added libpciaccess
 
diff --git a/libs/libdrm/PREPARE b/libs/libdrm/PREPARE
index c5f06cc..98d27e4 100755
--- a/libs/libdrm/PREPARE
+++ b/libs/libdrm/PREPARE
@@ -1,6 +1,2 @@
-config_query  LIBDRM_VCS  "Build latest version from development tree?"  n  &&
-
-if  [[ $LIBDRM_VCS == y ]]; then
-  config_query  LIBDRM_VCS_AUTOUPDATE  \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/libdrm/PRE_BUILD b/libs/libdrm/PRE_BUILD
index c1418ac..e338b51 100755
--- a/libs/libdrm/PRE_BUILD
+++ b/libs/libdrm/PRE_BUILD
@@ -1,7 +1,7 @@
 default_pre_build        &&
 cd  "$SOURCE_DIRECTORY"  &&
 
-if [[ $LIBDRM_VCS == y ]]; then
-autoreconf -v --install
+if [[ $LIBDRM_BRANCH == scm ]]; then
+  autoreconf -v --install
 #  ./autogen.sh
 fi
diff --git a/libs/libnfo/DETAILS b/libs/libnfo/DETAILS
index 68c224f..175ac8b 100755
--- a/libs/libnfo/DETAILS
+++ b/libs/libnfo/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libnfo
-if  [  "$LIBPLAYER_SCM_AUTOUPDATE"  ==  "n"  ];  then
+if  [  "$LIBPLAYER_AUTOUPDATE"  ==  "n"  ];  then
          VERSION=mercurial
 else
          VERSION=$(date +%Y%m%d)
@@ -18,6 +18,6 @@ cat << EOF
 GeeXboX libNFO is a small library aiming at parsing and writing NFO files.
 NFO files are used to store metadata information on many multimedia files.
 It is used by both Enna and XBMC Media Center.
-See http://xbmc.org/wiki/?title=Import_-_Export_Library for a format definition.
 
+See http://xbmc.org/wiki/?title=Import_-_Export_Library for a format definition.
 EOF
diff --git a/libs/libnfo/DOWNLOAD b/libs/libnfo/DOWNLOAD
index 3e17e37..bce41f9 100755
--- a/libs/libnfo/DOWNLOAD
+++ b/libs/libnfo/DOWNLOAD
@@ -1,7 +1,7 @@
 #once the hg download handler hits stable sorcery this DOWNLOAD script would
 #only need to be removed, SOURCE_URL is compatible with the planned hg handler
 
-if [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
+if [[ "${LIBNFO_BRANCH}" != "scm" ]]; then
   default_download
 else
   . $GRIMOIRE/hg_download.function
diff --git a/libs/libnfo/HISTORY b/libs/libnfo/HISTORY
index b9ae7e1..350e83d 100644
--- a/libs/libnfo/HISTORY
+++ b/libs/libnfo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch
+
 2011-07-25 Bor Kraljič <pyrobor at ver.si>
 	* DOWNLOAD: source $GRIMOIRE/hg_download.function before using hg_download
 
diff --git a/libs/libnfo/PREPARE b/libs/libnfo/PREPARE
index 3d9b31e..f8b7d7e 100755
--- a/libs/libnfo/PREPARE
+++ b/libs/libnfo/PREPARE
@@ -1,2 +1,2 @@
-config_query  LIBPLAYER_SCM_AUTOUPDATE                             \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/libs/talloc/BUILD b/libs/talloc/BUILD
index 02ac063..2b54fe4 100755
--- a/libs/talloc/BUILD
+++ b/libs/talloc/BUILD
@@ -1,7 +1,7 @@
 OPTS="$TALLOC_OPTS $OPTS" &&
 
 cd  $SOURCE_DIRECTORY &&
-if [[ "$TALLOC_SCM" == "y" ]]
+if [[ "$TALLOC_BRANCH" == "scm" ]]
 then
   cd lib/$SPELL
 fi &&
diff --git a/libs/talloc/DETAILS b/libs/talloc/DETAILS
index 3e2c6c9..a6638a3 100755
--- a/libs/talloc/DETAILS
+++ b/libs/talloc/DETAILS
@@ -1,7 +1,7 @@
            SPELL=talloc
-if [[ $TALLOC_SCM == y ]]
+if [[ $TALLOC_BRANCH == scm ]]
 then
-  if [[ "$TALLOC_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+  if [[ "$TALLOC_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index de28a2c..b7d7ae8 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DETAILS, INSTALL, PREPARE: Use prepare_select_branch
+
 2011-08-17 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.0.6
 	* PRE_BUILD: do not run autogen.sh for tarballs
diff --git a/libs/talloc/INSTALL b/libs/talloc/INSTALL
index 918c90c..8b0d323 100755
--- a/libs/talloc/INSTALL
+++ b/libs/talloc/INSTALL
@@ -1,5 +1,5 @@
 cd  $SOURCE_DIRECTORY &&
-if [[ "$TALLOC_SCM" == "y" ]]
+if [[ "$TALLOC_BRANCH" == "scm" ]]
 then
   cd lib/$SPELL
 fi &&
diff --git a/libs/talloc/PREPARE b/libs/talloc/PREPARE
index 0a7f54c..98d27e4 100755
--- a/libs/talloc/PREPARE
+++ b/libs/talloc/PREPARE
@@ -1,6 +1,2 @@
-config_query TALLOC_SCM "Build the git version?" n
-
-if [[ "$TALLOC_SCM" == "y" ]]
-then
-  config_query  TALLOC_SCM_AUTOUPDATE "Automatically add to queue every day?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/tevent/DEPENDS b/libs/tevent/DEPENDS
index db7cf51..5378411 100755
--- a/libs/tevent/DEPENDS
+++ b/libs/tevent/DEPENDS
@@ -1 +1,2 @@
+depends  git &&
 depends  talloc
diff --git a/libs/tevent/DETAILS b/libs/tevent/DETAILS
index 24bd66d..0bd3edf 100755
--- a/libs/tevent/DETAILS
+++ b/libs/tevent/DETAILS
@@ -1,5 +1,5 @@
            SPELL=tevent
-if [[ "$TEVENT_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+if [[ "$TEVENT_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=git
diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY
index 987be64..64c1675 100644
--- a/libs/tevent/HISTORY
+++ b/libs/tevent/HISTORY
@@ -1,3 +1,7 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS: depends on git
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2009-04-19 Eric Sandall <sandalle at sourcemage.org>
 	* PRE_BUILD: Don't apply tevent-util.patch
 	* tevent-util.patch: Remove, this is an internal header only
diff --git a/libs/tevent/PREPARE b/libs/tevent/PREPARE
index c7ead96..f8b7d7e 100755
--- a/libs/tevent/PREPARE
+++ b/libs/tevent/PREPARE
@@ -1 +1,2 @@
-config_query  TEVENT_SCM_AUTOUPDATE  "Automatically add to queue every day?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index 5fdfda3..f887980 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -10,7 +10,7 @@ do
     PATCH_BRANCHES=""
     PATCH_NEEDS=""
     . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DETAILS" &&
-    if ! list_find "${PATCH_BRANCHES}" "${BRANCH}"; then
+    if ! list_find "${PATCH_BRANCHES}" "${MUTT_BRANCH}"; then
       continue
     fi &&
     for NEED in ${PATCH_NEEDS}
@@ -34,7 +34,7 @@ if spell_ok "linuxdoc-tools"; then
 else
   UPDATE_DOC_DEFAULT="n"
 fi &&
-if [[ "${BRANCH}" == "scm" ]]; then
+if [[ "${MUTT_BRANCH}" == "scm" ]]; then
   config_query UPDATE_DOC                                              \
     "Build documentation? (requires linuxdoc-tools)"                   \
     "${UPDATE_DOC_DEFAULT}"
@@ -60,7 +60,7 @@ for PATCH in ${REAL_PATCHES}; do
   fi
 done &&
 
-if [[ "${BRANCH}" != "stable" ]]; then 
+if [[ "${MUTT_BRANCH}" != "stable" ]]; then 
   config_query_option MUTT_OPTS "Enable the header cache?"           \
                                 "n"                                  \
                                 "--enable-hcache"                    \
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index cc84ab0..e0433b0 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -6,7 +6,7 @@ optional_depends   "MAIL-TRANSPORT-AGENT"                       \
                    ""                                           \
                    "to send mail"                               &&
                     
-if [[ "$BRANCH" == "scm" ]]; then 
+if [[ "$MUTT_BRANCH" == "scm" ]]; then 
 	depends mercurial
 fi &&
 
@@ -32,7 +32,7 @@ optional_depends   "ispell"                                     \
                    ""                                           \
                    "for spell checking"                         &&
 
-if [[ "$BRANCH" != "stable" ]]; then
+if [[ "$MUTT_BRANCH" != "stable" ]]; then
   # Do NOT add --with-ssl here, that only works if POP/IMAP are used.  This is
   # mostly just here to prompt for openssl if they don't have it and want
   # S/MIME.
@@ -69,7 +69,7 @@ if list_find "${MUTT_OPTS}" "--enable-pop" || list_find "${MUTT_OPTS}" "--enable
                    ""                                           \
                    "to enable SSL support for POP/IMAP"         &&
 
-  if [[ "$BRANCH" != "stable" ]]; then
+  if [[ "$MUTT_BRANCH" != "stable" ]]; then
     optional_depends "gnutls"                                   \
                      "--with-gnutls"                            \
                      ""                                         \
@@ -89,7 +89,7 @@ if list_find "${MUTT_OPTS}" "--enable-imap"; then
                    "to enable GSSAPI authentication for IMAP"
 fi &&
 
-if [[ ! -z "$REAL_PATCHES" ]] || [[ "$BRANCH" == "scm" ]]; then
+if [[ ! -z "$REAL_PATCHES" ]] || [[ "$MUTT_BRANCH" == "scm" ]]; then
   depends "automake"
 fi &&
 
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 9482f54..7657908 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mutt
  PATCH_DIRECTORY=$SCRIPT_DIRECTORY/patches
 
-   case $BRANCH in
+   case $MUTT_BRANCH in
      scm)
-       if [[ $MUTT_SCM_AUTOUPDATE == "y" ]]; then
+       if [[ $MUTT_AUTOUPDATE == "y" ]]; then
          VERSION=mercurial_$(date +%Y%m%d)
        else
          VERSION=mercurial
diff --git a/mail/mutt/DOWNLOAD b/mail/mutt/DOWNLOAD
index 3a41172..c277ba6 100755
--- a/mail/mutt/DOWNLOAD
+++ b/mail/mutt/DOWNLOAD
@@ -13,7 +13,7 @@ function my_url_hg_http_crack() {
 
 }
 
-if [[ "$BRANCH" != "scm" ]]; then
+if [[ "$MUTT_BRANCH" != "scm" ]]; then
   default_download &&
   return $?
 fi &&
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index b122bdf..5177be6 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,7 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* CONFIGURE, DEPENDS, DETAILS, DOWNLOAD, PREPARE, PRE_BUILD:
+	  Use prepare_select_branch
+
 2010-04-08 Sukneet Basuta <sukneet at sourcemage.org>
 	* CONFIGURE: added SMTP configure query
 	* DEPENDS: fixed cyrus-sasl configure opt
diff --git a/mail/mutt/PREPARE b/mail/mutt/PREPARE
index 5cae79a..bb775dd 100755
--- a/mail/mutt/PREPARE
+++ b/mail/mutt/PREPARE
@@ -32,27 +32,10 @@ if [[ $OLD_PATCHES ]]; then
   fi
 fi
 
-# temporary, to migrate old autoupdate pref
-if [[ "${MUTT_CVS_AUTOUPDATE}" == "y" ]]; then
-  persistent_add MUTT_SCM_AUTOUPDATE &&
-  MUTT_SCM_AUTOUPDATE="y" &&
-  persistent_remove MUTT_CVS_AUTOUPDATE
-fi &&
-
-# temporary, to migrate old branch pref
-if [[ "${BRANCH}" == "cvs" ]]; then
-  BRANCH="scm"
-fi &&
-
 message "The mutt spell provides three different versions of mutt; stable," &&
 message "which apart from security fixes has not been developed in a long" &&
 message "time, devel, the current development releases and scm, which pulls" &&
 message "a snapshot from the mutt source repository." &&
 
-config_query_list BRANCH "Build which version?" stable devel scm &&
-
-if [[ "${BRANCH}" == "scm" ]]; then
-  config_query MUTT_SCM_AUTOUPDATE \
-    "Update to the latest scm checkout automatically on every cast?" \
-    n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/mail/mutt/PRE_BUILD b/mail/mutt/PRE_BUILD
index fb394e0..608321a 100755
--- a/mail/mutt/PRE_BUILD
+++ b/mail/mutt/PRE_BUILD
@@ -1,8 +1,8 @@
 function mutt_default_patch() {
   . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DETAILS" &&
   bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.bz2" > "${PATCH_SOURCE}" &&
-  if [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${BRANCH}.smgl.diff.bz2" ]]; then
-    bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${BRANCH}.smgl.diff.bz2" > "${PATCH_SOURCE}.smgl.diff"
+  if [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${MUTT_BRANCH}.smgl.diff.bz2" ]]; then
+    bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${MUTT_BRANCH}.smgl.diff.bz2" > "${PATCH_SOURCE}.smgl.diff"
   elif [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" ]]; then
     bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" > "${PATCH_SOURCE}.smgl.diff"
   fi &&
@@ -31,6 +31,6 @@ if [[ ! -z "$REAL_PATCHES" ]] || [[ ! -x ./configure ]]; then
   ./prepare
 fi  &&
 
-if gcc -dumpversion | grep -q "^4"  &&  test "$BRANCH" = "stable"; then
+if gcc -dumpversion | grep -q "^4"  && [[ "$MUTT_BRANCH" == "stable" ]]; then
   sedit "22i#include <mapping.h>"  keymap.h
 fi
diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index 7400e9c..9a23884 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -4,7 +4,7 @@ depends  popt       "--without-included-popt"  &&
 depends  python                                &&
 depends  tevent                                &&
 
-if [[  "$SAMBA4_SCM"  ==  "y"  ]];  then
+if [[  "$SAMBA4_BRANCH"  ==  "scm"  ]];  then
   depends  git
 fi  &&
 
diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index 61a70c6..cc92c3b 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=samba4
-if [[ "$SAMBA4_SCM"  ==  "y"  ]];  then
-  if [[ "$SAMBA4_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+if [[ "$SAMBA4_BRANCH"  ==  "scm"  ]];  then
+  if [[ "$SAMBA4_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 67c8216..4da1f11 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2009-05-26 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.0.0alpha7
 
diff --git a/net/samba4/PREPARE b/net/samba4/PREPARE
index 153aaaa..98d27e4 100755
--- a/net/samba4/PREPARE
+++ b/net/samba4/PREPARE
@@ -1,5 +1,2 @@
-config_query  SAMBA4_SCM  "Checkout latest code for $SPELL?"  y  &&
-
-if  [[  "$SAMBA4_SCM"  ==  "y"  ]];  then
-  config_query  SAMBA_SCM_AUTOUPDATE  "Automatically add to queue every day?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/utils/renouveau/DETAILS b/utils/renouveau/DETAILS
index fcd122e..66362cc 100755
--- a/utils/renouveau/DETAILS
+++ b/utils/renouveau/DETAILS
@@ -1,5 +1,5 @@
            SPELL=renouveau
-  if  [[  "$RENOUVEAU_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+  if  [[  "$RENOUVEAU_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=cvs
diff --git a/utils/renouveau/HISTORY b/utils/renouveau/HISTORY
index 341d7a1..a2ce740 100644
--- a/utils/renouveau/HISTORY
+++ b/utils/renouveau/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2008-10-21 Eric Sandall <sandalle at sourcemage.org>
 	* PREPARE, DETAILS, DEPENDS, BUILD, INSTALL: Created
 
diff --git a/utils/renouveau/PREPARE b/utils/renouveau/PREPARE
index 666a9e7..f8b7d7e 100755
--- a/utils/renouveau/PREPARE
+++ b/utils/renouveau/PREPARE
@@ -1,2 +1,2 @@
-config_query  RENOUVEAU_SCM_AUTOUPDATE                         \
-              "Automatically update $SPELL on system-update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index 2e16e4b..3d8e291 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -1,4 +1,4 @@
-if [[ $FLUXBOX_GIT == y ]]; then
+if [[ $FLUXBOX_BRANCH == scm ]]; then
   ./autogen.sh
 fi &&
 
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index 8d90499..36f6530 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -3,7 +3,7 @@ depends libx11 &&
 depends libsm &&
 depends fontconfig &&
 
-if [[ $FLUXBOX_GIT == y ]]; then
+if [[ $FLUXBOX_BRANCH == scm ]]; then
   depends git
 fi &&
 
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index e1bd97a..a8f8a3b 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=fluxbox
-if [[ $FLUXBOX_GIT == y ]]; then
-  if [[ $FLUXBOX_GIT_AUTOUPDATE == y ]]; then
+if [[ $FLUXBOX_BRANCH == scm ]]; then
+  if [[ $FLUXBOX_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 1af22f6..27c246a 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-20 Arjan Bouter <abouter at sourcemage.org>
 	* CONFIGURE: remove obsolete --disable-ordered-pseudo from FLUXBOX_OPTS
 
diff --git a/windowmanagers/fluxbox/PREPARE b/windowmanagers/fluxbox/PREPARE
index ccb5188..98d27e4 100755
--- a/windowmanagers/fluxbox/PREPARE
+++ b/windowmanagers/fluxbox/PREPARE
@@ -1,5 +1,2 @@
-config_query FLUXBOX_GIT "Build the GIT version?" n
-
-if [[ $FLUXBOX_GIT == y ]]; then
-  config_query FLUXBOX_GIT_AUTOUPDATE "Update git repo on every update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/windowmanagers/fvwm/BUILD b/windowmanagers/fvwm/BUILD
index 308b20e..f6d2bdc 100755
--- a/windowmanagers/fvwm/BUILD
+++ b/windowmanagers/fvwm/BUILD
@@ -1,4 +1,4 @@
-if [[ "${FVWM_RELEASE}" == "cvs" ]]; then
+if [[ "${FVWM_BRANCH}" == "scm" ]]; then
     aclocal                &&
     autoheader             &&
     automake --add-missing &&
diff --git a/windowmanagers/fvwm/DEPENDS b/windowmanagers/fvwm/DEPENDS
index aee80f0..689d721 100755
--- a/windowmanagers/fvwm/DEPENDS
+++ b/windowmanagers/fvwm/DEPENDS
@@ -81,7 +81,7 @@ optional_depends libpng \
                      "--without-png-library" \
                      "png image support"
 
-if [ "${FVWM_RELEASE}" = "cvs" ]; then
+if [ "${FVWM_BRANCH}" = "scm" ]; then
     depends CVS      &&
     depends automake &&
     depends autoconf
diff --git a/windowmanagers/fvwm/DETAILS b/windowmanagers/fvwm/DETAILS
index cb1ec73..59b5b07 100755
--- a/windowmanagers/fvwm/DETAILS
+++ b/windowmanagers/fvwm/DETAILS
@@ -1,32 +1,26 @@
            SPELL=fvwm
-if [[ "${FVWM_RELEASE}" == "cvs" ]] ; then
-
-    if [[ "${FVWM_CVS_AUTOUPDATE}" == "y" ]] ; then
+if [[ "${FVWM_BRANCH}" == "scm" ]] ; then
+  if [[ "${FVWM_AUTOUPDATE}" == "y" ]] ; then
          VERSION=$(date +%Y%m%d)
-
-    else
+  else
          VERSION=cvs
-    fi
-
+  fi
+          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
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
-
-elif [[ "${FVWM_RELEASE}" == "unstable" ]] ; then 
+else
+  if [[ "${FVWM_BRANCH}" == "unstable" ]] ; then 
          VERSION=2.7.0
      SOURCE_HASH=sha512:45ca6ff8c4303e11a916aeeedbef070066e216804be165a6fc36129314927818efe720024b69eb248a0a7884ca869cf47854a4ecfad7bdfaeb9b392c0bd2d6a1
-else
+  else
          VERSION=2.6.2
      SOURCE_HASH=sha512:25cce9d4081be91f97b60e5bb15cda856adb9081b19e8d9746e5618ecb2579b80656cca3e3eb0ea07ce2401e4c9386cae4ad62029f4df84968933d4203cf6c7b
-fi
-
-if [[ "${FVWM_RELEASE}" != "cvs" ]] ; then
+  fi
           SOURCE=fvwm-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fvwm-${VERSION}
    SOURCE_URL[0]=ftp://ftp.fvwm.org/pub/fvwm/version-2/${SOURCE}
-else
-          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
 fi
         WEB_SITE=http://www.fvwm.org
          ENTERED=20040524
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 6b1c798..451f1a2 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-08-30 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: versions 2.6.2 and 2.7.0
 	* DEPENDS: added perl, depend on imlib when gtk is enabled,
diff --git a/windowmanagers/fvwm/PREPARE b/windowmanagers/fvwm/PREPARE
index 7fffbee..c2ec981 100755
--- a/windowmanagers/fvwm/PREPARE
+++ b/windowmanagers/fvwm/PREPARE
@@ -1,8 +1,2 @@
-if [[ "$RELEASE" ]]; then
-  FVWM_RELEASE="$RELEASE"  &&
-  persistent_remove RELEASE
-fi  &&
-config_query_list FVWM_RELEASE "Which release would you like to build?" stable unstable cvs &&
-if [[ "${FVWM_RELEASE}" == "cvs" ]]
-then config_query FVWM_CVS_AUTOUPDATE "Update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable unstable scm
diff --git a/x11/transset/DETAILS b/x11/transset/DETAILS
index 702ae94..827a767 100755
--- a/x11/transset/DETAILS
+++ b/x11/transset/DETAILS
@@ -1,5 +1,5 @@
            SPELL=transset
-if  [  "$TRANSSET_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if  [  "$TRANSSET_AUTOUPDATE"  ==  "y"  ];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=cvs
diff --git a/x11/transset/HISTORY b/x11/transset/HISTORY
index a1d8aac..263cfac 100644
--- a/x11/transset/HISTORY
+++ b/x11/transset/HISTORY
@@ -1,3 +1,6 @@
+2011-09-22 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch XDAMAGE to the one and only libxdamage
 
diff --git a/x11/transset/PREPARE b/x11/transset/PREPARE
index cb75d03..f8b7d7e 100755
--- a/x11/transset/PREPARE
+++ b/x11/transset/PREPARE
@@ -1,2 +1,2 @@
-config_query  TRANSSET_CVS_AUTOUPDATE                            \
-              "Automatically update on every system update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch


More information about the SM-Commit mailing list