diff --git a/audio-creation/audacity/PREPARE b/audio-creation/audacity/PREPARE
index 8b96dd3..9b808a1 100755
--- a/audio-creation/audacity/PREPARE
+++ b/audio-creation/audacity/PREPARE
@@ -1,6 +1,3 @@
-config_query_list AUDACITY_REL "Which release?" current beta cvs
-if [ "$AUDACITY_REL" == "cvs" ]; then
- config_query AUD_CVS_AUTOUPDATE \
- "Update to the latest CVS automatically on every cast?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch current beta scm &&
config_query AUDACITY_UNI "Enable unicode support?" n
diff --git a/audio-drivers/jack/DEPENDS b/audio-drivers/jack/DEPENDS
index 88204f3..947dee1 100755
--- a/audio-drivers/jack/DEPENDS
+++ b/audio-drivers/jack/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $JACK_VCS == y ]]
+if [[ $JACK_BRANCH == scm ]]
then
depends subversion &&
depends libtool &&
diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index 8b467d1..7a6714e 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -1,7 +1,7 @@
SPELL=jack
-if [[ $JACK_VCS == y ]]
+if [[ $JACK_BRANCH == scm ]]
then
- if [[ $JACK_VCS_AUTOUPDATE == y ]]
+ if [[ $JACK_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 7471282..d7d249c 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2008-12-06 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.116.1.
diff --git a/audio-drivers/jack/PREPARE b/audio-drivers/jack/PREPARE
index e272094..98d27e4 100755
--- a/audio-drivers/jack/PREPARE
+++ b/audio-drivers/jack/PREPARE
@@ -1,7 +1,2 @@
-config_query JACK_VCS "Build latest version from development tree?" n &&
-
-if [[ $JACK_VCS == y ]]
-then
- config_query JACK_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index f1eb6c0..6c4f58f 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -3,7 +3,7 @@ depends expat &&
depends -sub CXX gcc &&
depends python &&
-if [[ $JACK2_VCS == y ]]; then
+if [[ $JACK2_BRANCH == scm ]]; then
depends subversion
fi &&
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index adad650..4a0265c 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -1,6 +1,6 @@
SPELL=jack2
-if [[ $JACK2_VCS == y ]]; then
- if [[ $JACK2_VCS_AUTOUPDATE == y ]]; then
+if [[ $JACK2_BRANCH == scm ]]; then
+ if [[ $JACK2_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 9ce243a..5632568 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-09-10 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 1.9.7
* DEPENDS: enable firewire and ALSA support explicitly
diff --git a/audio-drivers/jack2/PREPARE b/audio-drivers/jack2/PREPARE
index 40c9f28..98d27e4 100755
--- a/audio-drivers/jack2/PREPARE
+++ b/audio-drivers/jack2/PREPARE
@@ -1,6 +1,2 @@
-config_query JACK2_VCS "Build latest version from development tree?" n &&
-
-if [[ $JACK2_VCS == y ]]; then
- config_query JACK2_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index 25fd629..b6be679 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -1,6 +1,6 @@
SPELL=libffado
-if [[ "$FFADO_VCS" == y ]]; then
- if [[ "$FFADO_VCS_AUTOUPDATE" == y ]]; then
+if [[ "$LIBFFADO_BRANCH" == scm ]]; then
+ if [[ "$LIBFFADO_AUTOUPDATE" == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
@@ -22,5 +22,7 @@ fi
LICENSE[0]=GPL
SHORT="FireWire audio driver"
cat << EOF
-The FFADO project aims to provide a generic, open-source solution for the
support of FireWire based audio devices for the Linux platform. It is the
successor of the FreeBoB project.
+The FFADO project aims to provide a generic, open-source solution for the
+support of FireWire based audio devices for the Linux platform. It is the
+successor of the FreeBoB project.
EOF
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index c3d63c2..4873ac4 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,7 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+ * DETAILS: Word-wrap long description to 80 characters
+
2011-09-10 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to release version 2.0.1 (works with juju stack).
diff --git a/audio-drivers/libffado/PREPARE b/audio-drivers/libffado/PREPARE
index aee38b2..98d27e4 100755
--- a/audio-drivers/libffado/PREPARE
+++ b/audio-drivers/libffado/PREPARE
@@ -1,5 +1,2 @@
-config_query FFADO_VCS "Build development version?" n
-if [[ $FFADO_VCS = y ]]; then
-config_query FFADO_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/portaudio19/DEPENDS
b/audio-drivers/portaudio19/DEPENDS
index 70763c6..09f217a 100755
--- a/audio-drivers/portaudio19/DEPENDS
+++ b/audio-drivers/portaudio19/DEPENDS
@@ -1,6 +1,5 @@
-if [[ $PORTAUDIO19_VERSION == svn ]]; then
+if [[ $PORTAUDIO19_BRANCH == scm ]]; then
depends subversion
fi &&
optional_depends alsa-lib "--with-alsa" "--without-alsa" "for alsa sound
support"
optional_depends JACK-DRIVER "--with-jack" "--without-jack" "for jack
support"
-
diff --git a/audio-drivers/portaudio19/DETAILS
b/audio-drivers/portaudio19/DETAILS
index 54c7b15..839cec0 100755
--- a/audio-drivers/portaudio19/DETAILS
+++ b/audio-drivers/portaudio19/DETAILS
@@ -1,7 +1,7 @@
SPELL=portaudio19
-case ${PORTAUDIO19_VERSION} in
- svn)
-if [[ "$PORTAUDIO19_CVS_AUTOUPDATE" == "y" ]]; then
+case ${PORTAUDIO19_BRANCH} in
+ scm)
+if [[ "$PORTAUDIO19_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
diff --git a/audio-drivers/portaudio19/DOWNLOAD
b/audio-drivers/portaudio19/DOWNLOAD
deleted file mode 100755
index 39bb73c..0000000
--- a/audio-drivers/portaudio19/DOWNLOAD
+++ /dev/null
@@ -1,18 +0,0 @@
-if [[ $PORTAUDIO19_VERSION == svn ]] ; then
-if [ -f $SOURCE_CACHE/$SOURCE ] ; then
- rm $SOURCE_CACHE/$SOURCE
-fi
-
-message "${MESSAGE_COLOR}Starting SVN checkout of
${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
-
-svn co https://www.portaudio.com/repos/portaudio/branches/v19-devel . &&
-mv v19-devel $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-else
-default_download
-fi
diff --git a/audio-drivers/portaudio19/HISTORY
b/audio-drivers/portaudio19/HISTORY
index 2a4182e..da654e7 100644
--- a/audio-drivers/portaudio19/HISTORY
+++ b/audio-drivers/portaudio19/HISTORY
@@ -1,3 +1,7 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: Removed, now sorcery supports Subversion URLs
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2009-01-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: stable_v19_20071207
diff --git a/audio-drivers/portaudio19/PREPARE
b/audio-drivers/portaudio19/PREPARE
index d57fc5c..6c4e533 100755
--- a/audio-drivers/portaudio19/PREPARE
+++ b/audio-drivers/portaudio19/PREPARE
@@ -1,4 +1,2 @@
-config_query_list PORTAUDIO19_VERSION "Which v19 version ?" stable snapshot
-if [[ $PORTAUDIO19_VERSION == svn ]]; then
-config_query PORTAUDIO19_CVS_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable snapshot scm
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index 6d95a99..f5c35ab 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -8,7 +8,7 @@ if [ "$XMMS" = "y" ]; then
depends id3lib
fi
-if [ "$FAAD_CVS" = "y" ]; then
+if [ "$FAAD2_BRANCH" = "scm" ]; then
depends CVS
fi
diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index 2b0c5c0..f0b6864 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -1,6 +1,6 @@
SPELL=faad2
-if [ "$FAAD_CVS" = "y" ]; then
- if [ "$FAAD_CVS_AUTOUPDATE" = "y" ]; then
+if [ "$FAAD2_BRANCH" = "scm" ]; then
+ if [ "$FAAD2_AUTOUPDATE" = "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index e7dd003..e80a965 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 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/audio-libs/faad2/PREPARE b/audio-libs/faad2/PREPARE
index 433d8ff..98d27e4 100755
--- a/audio-libs/faad2/PREPARE
+++ b/audio-libs/faad2/PREPARE
@@ -1,4 +1,2 @@
-config_query FAAD_CVS "Build CVS version?" n
-if [ "$FAAD_CVS" == "y" ]; then
- config_query FAAD_CVS_AUTOUPDATE "Update to the latest CVS on every cast?"
n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 5902cc6..8b51f51 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -4,7 +4,7 @@ depends libxext &&
depends -sub CXX gcc &&
depends qt4 &&
-if [[ $QJCTL_VCS == y ]]
+if [[ $QJACKCTL_BRANCH == scm ]]
then
depends autoconf &&
depends CVS
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 5fcd51e..137c595 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,7 +1,7 @@
SPELL=qjackctl
-if [[ $QJCTL_VCS == y ]]
+if [[ $QJACKCTL_BRANCH == scm ]]
then
- if [[ $QJCTL_VCS_AUTOUPDATE == y ]]
+ if [[ $QJACKCTL_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index d5af4d8..b390281 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 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/audio-soft/qjackctl/PREPARE b/audio-soft/qjackctl/PREPARE
index d008945..98d27e4 100755
--- a/audio-soft/qjackctl/PREPARE
+++ b/audio-soft/qjackctl/PREPARE
@@ -1,7 +1,2 @@
-config_query QJCTL_VCS "Build latest version from development tree?" n &&
-
-if [[ $QJCTL_VCS == y ]]
-then
- config_query QJCTL_VCS_AUTOUPDATE \
- "Update automatically on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/devel/gcl/DETAILS b/devel/gcl/DETAILS
index 25a8b40..b247906 100755
--- a/devel/gcl/DETAILS
+++ b/devel/gcl/DETAILS
@@ -1,6 +1,6 @@
SPELL=gcl
-if [ "$CVS" == "y" ]; then
- if [ "$CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$GCL_BRANCH" == "scm" ]]; then
+ if [[ "$GCL_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
diff --git a/devel/gcl/HISTORY b/devel/gcl/HISTORY
index 5a82780..67c88b1 100644
--- a/devel/gcl/HISTORY
+++ b/devel/gcl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2010-09-27 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: fix dependency on emacsen
diff --git a/devel/gcl/PREPARE b/devel/gcl/PREPARE
index 5aadf26..91a5ee1 100755
--- a/devel/gcl/PREPARE
+++ b/devel/gcl/PREPARE
@@ -1,5 +1,4 @@
echo "If you can build the stable version, please let us know!"
-config_query CVS "Use the CVS version?" y
-if [ "$CVS" == "y" ]; then
- config_query CVS_AUTOUPDATE "Update to the latest CVS automatically on
every cast?" n
-fi
+
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index eca6106..6cc5d4d 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -17,6 +17,7 @@ if [[ "$EMACS_BRANCH" == "scm" ]]; then
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+ ./autogen.sh &&
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 397ad26..62a724c 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-28 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: scm branch requires to run autogen.sh
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use
prepare_select_branch
diff --git a/graphics/blender_cvs/DETAILS b/graphics/blender_cvs/DETAILS
index 7147395..5be6856 100755
--- a/graphics/blender_cvs/DETAILS
+++ b/graphics/blender_cvs/DETAILS
@@ -1,5 +1,5 @@
SPELL=blender_cvs
-if [[ "$BLENDER_CVS_CVS_AUTOUPDATE" == "y" ]]; then
+if [[ "$BLENDER_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/graphics/blender_cvs/HISTORY b/graphics/blender_cvs/HISTORY
index eb1d66f..7a4cbab 100644
--- a/graphics/blender_cvs/HISTORY
+++ b/graphics/blender_cvs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG
diff --git a/graphics/blender_cvs/PREPARE b/graphics/blender_cvs/PREPARE
index 91e94f0..f8b7d7e 100755
--- a/graphics/blender_cvs/PREPARE
+++ b/graphics/blender_cvs/PREPARE
@@ -1 +1,2 @@
-config_query BLENDER_CVS_CVS_AUTOUPDATE "Auto-update $SPELL on every
system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/http/elinks/BUILD b/http/elinks/BUILD
index 3575780..4954d41 100755
--- a/http/elinks/BUILD
+++ b/http/elinks/BUILD
@@ -1,4 +1,4 @@
-if [[ $ELINKS_VCS == y ]]; then
+if [[ $ELINKS_BRANCH == scm ]]; then
./autogen.sh
fi &&