Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (3e351a0723a6b4875778e3042ee34e2e6ba66b7c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (3e351a0723a6b4875778e3042ee34e2e6ba66b7c)
  • Date: Tue, 20 Sep 2011 02:14:51 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3
audio-drivers/pulseaudio/BUILD | 2
audio-drivers/pulseaudio/CONFIGURE | 8 +
audio-drivers/pulseaudio/DEPENDS | 117
+++++++++++++++----------
audio-drivers/pulseaudio/HISTORY | 9 +
audio-libs/celt/BUILD | 2
audio-libs/celt/DEPENDS | 2
audio-libs/celt/DETAILS | 4
audio-libs/celt/HISTORY | 3
audio-libs/celt/PREPARE | 8 -
chat-im/choqok/DETAILS | 4
chat-im/choqok/HISTORY | 3
chat-im/choqok/PREPARE | 7 -
chat-irc/irssi/DETAILS | 3
chat-irc/irssi/HISTORY | 3
database/sqlite/DETAILS | 6 -
database/sqlite/HISTORY | 3
dev/null |binary
devel/codeblocks/DETAILS | 4
devel/codeblocks/HISTORY | 3
devel/codeblocks/PREPARE | 6 -
devel/codeblocks/PRE_BUILD | 2
devel/ldasm/BUILD | 4
devel/ldasm/DEPENDS | 3
devel/ldasm/DETAILS | 19 ++++
devel/ldasm/HISTORY | 4
devel/ldasm/INSTALL | 1
disk/cdrdao/BUILD | 7 -
disk/cdrdao/DEPENDS | 4
disk/cdrdao/DETAILS | 4
disk/cdrdao/HISTORY | 3
disk/cdrdao/PREPARE | 9 -
disk/cdrdao/PRE_BUILD | 2
disk/fuse/BUILD | 2
disk/fuse/DEPENDS | 2
disk/fuse/DETAILS | 10 +-
disk/fuse/HISTORY | 6 +
disk/fuse/PREPARE | 9 -
disk/fuse/PRE_BUILD | 4
e-17/eet/DEPENDS | 2
e-17/eet/DETAILS | 4
e-17/eet/HISTORY | 3
e-17/eet/PREPARE | 8 -
e-17/eet/PRE_BUILD | 2
e-17/eina/DETAILS | 4
e-17/eina/HISTORY | 3
e-17/eina/PREPARE | 8 -
e-17/eina/PRE_BUILD | 2
e-17/evas/DEPENDS | 2
e-17/evas/DETAILS | 4
e-17/evas/HISTORY | 3
e-17/evas/PREPARE | 8 -
e-17/evas/PRE_BUILD | 2
e-17/evfs/DETAILS | 2
e-17/evfs/HISTORY | 3
e-17/evfs/PREPARE | 4
e-17/eyelight/DETAILS | 2
e-17/eyelight/HISTORY | 3
e-17/eyelight/PREPARE | 4
e-17/shellementary/DETAILS | 2
e-17/shellementary/HISTORY | 3
e-17/shellementary/PREPARE | 4
ftp/rsync/DETAILS | 4
ftp/rsync/HISTORY | 3
ftp/rsync/PREPARE | 8 -
gnome2-libs/clutter/DETAILS | 2
gnome2-libs/clutter/HISTORY | 3
gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig | 0
gnome2-libs/clutter/clutter-1.6.20.tar.bz2.sig |binary
graphics/exiv2/DETAILS | 4
graphics/exiv2/HISTORY | 4
graphics/exiv2/UP_TRIGGERS | 2
libs/glibc/DEPENDS | 2
libs/glibc/DETAILS | 12 +-
libs/glibc/HISTORY | 3
libs/glibc/PREPARE | 6 -
shell-term-fm/bash-completion/HISTORY | 3
shell-term-fm/bash-completion/smgl_completion | 4
smgl/castfs/DEPENDS | 2
smgl/castfs/DETAILS | 4
smgl/castfs/HISTORY | 3
smgl/castfs/PREPARE | 9 -
smgl/quill/DEPENDS | 2
smgl/quill/DETAILS | 4
smgl/quill/HISTORY | 3
smgl/quill/PREPARE | 9 -
video/mplayer/DEPENDS | 11 +-
video/mplayer/DETAILS | 4
video/mplayer/DOWNLOAD | 47 ----------
video/mplayer/HISTORY | 4
video/mplayer/PREPARE | 8 -
windowmanagers/blackbox/HISTORY | 4
windowmanagers/blackbox/PRE_BUILD | 7 +
x11/freenx/DEPENDS | 2
x11/freenx/DETAILS | 4
x11/freenx/HISTORY | 3
x11/freenx/PREPARE | 8 -
x11/freenx/PRE_BUILD | 2
xorg-driver/xf86-video-openchrome/DEPENDS | 2
xorg-driver/xf86-video-openchrome/DETAILS | 4
xorg-driver/xf86-video-openchrome/HISTORY | 3
xorg-driver/xf86-video-openchrome/PREPARE | 8 -
xorg-driver/xf86-video-openchrome/PRE_BUILD | 2
103 files changed, 323 insertions(+), 273 deletions(-)

New commits:
commit 3b5ba113aa239e6d51cf578121d63fbcc10e2bca
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sqlite: => 3.7.8

commit bfb56df4d25a4f80eef03d11cac4248dcd0fb6c2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

bash-completion: added support for gaze tablet to smgl_completion

commit 7297f782974b1e6a5f8c794fd5f0c94b4dc66219
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

glibc: Use prepare_select_branch

commit 8376344cc1a7033d935de99b83d49966f7f3c547
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

quill: Use prepare_select_branch

commit 4ca8a2e2e40480c7ab852850bbf2b310e278db4e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

castfs: Use prepare_select_branch

commit ff408df0a7dd6bfdecd5213177dded9066504065
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mplayer: Use prepare_select_branch

commit 0dbe1d8504a89d3e7e0e6ae6c982d6fe1e55b70d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mplayer: Remove DOWNLOAD, sorcery supports Subversion URLs now

commit 4c93c083a99618954ec13a2922078b4d61bfffaf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

codeblocks: Use prepare_select_branch

commit 26ebd13f472ba33c0a3abf0b85ccb9328f68246f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

choqok: Use prepare_select_branch

commit 296d9d70d36c0a5d890f5d84a08601b1f14b9ddd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rsync: Use prepare_select_branch

commit e446b12de848850f6a2265cb3a3943f5aa5d4d6d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cdrdao: Use prepare_select_branch

commit b89dd38e28965d030377be9823f00b83c4251583
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

irssi: Fix SOURCE for scm branch

commit 16aca06f0ddba0371eaf123d04a0a56acb922319
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fuse: Use prepare_select_branch

commit 0740edc86c8dfa90bb7b042cee8b30dfb2dced93
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

celt: Use prepare_select_branch

commit 21b494cdcb5139037638bc02ba1b0a0eea56afc8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xf86-video-openchrome: Use prepare_select_branch

commit 8fc23b9ccfedaee4a9272cc09cb5cf24fba60c00
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

freenx: Use prepare_select_branch

commit c31d0297f834edfd3877577bda2050e3895c9609
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

blackbox: applied fixes from Jeremy Kajikawa and an opensuse to get
blackbox to build again.

commit 44448c1e1af39fa5a7e0d19b0ae09a505d4735d8
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

pulseaudio: corrected OSS options, added ipv6 option, disabled polkit as
configure no longer supports it, re-ordered dependency list for easy
updating, added missing deps and database selection.

commit c0c01392c094e07ddb9b31b1648386567cf84d4d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

exiv2: => 0.22

commit 9b35221ceb5b6e18be73e5a4981de68d08752af1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ldasm: depends on perl-tk

commit 0d332f1d9157f1b7d3ecd245418c246652d599af
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ldasm: Fix build

commit aceb132373c5627e6ec7ab29ac0a3540fab784fd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ldasm: new spell, Disassembler GUI

commit 94a54d1a7a65635682571e5a2a7838da393b7870
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

clutter 1.6.20

commit 880c7f4eb9c4eaf4c30f4a8ea285db1343ccf249
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

evfs: Use prepare_select_branch

commit d565d3d878cdfbaa1eb7cf5f9b538594883a746e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

evas: Use prepare_select_branch

commit 6ad0fe9e4d0255f846a6fe6a0bc8bc2e28a6d9de
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

eyelight: Use prepare_select_branch

commit 956baea75fb85470513bd3a8dc7af3578611f97e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

shellementary: Use prepare_select_branch

commit 89edc06272747e4d8833403e8571958f9cf20e20
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

eina: Use prepare_select_branch

commit f70293bcc086cb88e69963819ae99f16902a3a23
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

eet: Use prepare_select_branch

commit d914574a2f031bd535cb3fc88a927a83d2e8ca26
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

fuse 2.8.6

diff --git a/ChangeLog b/ChangeLog
index de7af09..63ea06d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/ldasm: new spell, Disassembler GUI
+
2011-09-16 Vlad Glagolev <stealth AT sourcemage.org>
* utils/pv: new spell, terminal-based tool for monitoring the progress
of data through a pipeline
diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index ffdce6d..06e658d 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,3 +1,3 @@
-OPTS="$PULSE_OSS $OPTS" &&
+OPTS="$PULSE_OSS $PULSE_IP6 --with-database=$PULSE_DB $OPTS" &&
LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&
default_build
diff --git a/audio-drivers/pulseaudio/CONFIGURE
b/audio-drivers/pulseaudio/CONFIGURE
index 669e488..8b67f76 100755
--- a/audio-drivers/pulseaudio/CONFIGURE
+++ b/audio-drivers/pulseaudio/CONFIGURE
@@ -1 +1,7 @@
-config_query_option PULSE_OSS 'build OSS support?' n '--enable-oss'
'--disable-oss'
+config_query_option PULSE_OSS 'build OSS support?' n \
+ '--enable-oss-output --enable-oss-wrapper' \
+ '--disable-oss-output --disable-oss-wrapper' &&
+config_query_option PULSE_IP6 'enable IPv6 support?' n \
+ '--enable-ipv6' \
+ '--disable-ipv6' &&
+config_query_list PULSE_DB 'which configuration database do you want?' gdbm
tdb simple auto
diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index b44f12a..4abbddc 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -1,72 +1,101 @@
depends liboil &&
-depends libsamplerate &&
depends libsndfile &&
depends libatomic_ops &&
-depends gdbm &&
depends speex &&
-optional_depends -sub HWDB udev \
- "--enable-udev" \
- "--disable-udev" \
- "for device hotplug support" &&
-optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
- "for D-BUS system messaging" &&
-optional_depends hal \
- "--enable-hal" \
- "--disable-hal" \
- "Enable Hardware Abstraction Layer support?" &&
-optional_depends tcp_wrappers \
- "--enable-tcpwrap" \
- "--disable-tcpwrap" \
- "Enable TCP network filtering?" &&
+
+if [[ "$PULSE_DB" == 'gdbm' ]]; then
+ depends gdbm
+elif [[ "$PULSE_DB" == 'tdb' ]]; then
+ depends tdb
+else
+ message "using configuration database $PULSE_DB"
+fi &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+optional_depends xorg-libs \
+ "--enable-x11" \
+ "--disable-x11" \
+ "Enable X11 support?" &&
+depends libsamplerate &&
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
"Enable Advanced Linux Sound Architecture support?
(RECOMMENDED)" &&
-optional_depends JACK-DRIVER \
- "--enable-jack" \
- "--disable-jack" \
- "for low-latency sound server support?" &&
optional_depends glib2 \
"--enable-glib2" \
"--disable-glib2" \
"Enable glib2 support?" &&
-optional_depends lirc \
- "--enable-lirc" \
- "--disable-lirc" \
- "Enable infra-red remote control support?" &&
+optional_depends gtk+2 \
+ "--enable-gtk2" \
+ "--disable-gtk2" \
+ "for GTK+2 support" &&
+optional_depends gconf2 \
+ "--enable-gconf" \
+ "--disable-gconf" \
+ "for gconf support" &&
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for ZerConf configuration support" &&
+optional_depends JACK-DRIVER \
+ "--enable-jack" \
+ "--disable-jack" \
+ "for low-latency sound server support?" &&
optional_depends libasyncns \
"--enable-asyncns" \
"--disable-asyncns" \
"for asynchronous service queries?" &&
+optional_depends tcp_wrappers \
+ "--enable-tcpwrap" \
+ "--disable-tcpwrap" \
+ "Enable TCP network filtering?" &&
+optional_depends lirc \
+ "--enable-lirc" \
+ "--disable-lirc" \
+ "Enable infra-red remote control support?" &&
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "Enable Hardware Abstraction Layer support?" &&
+optional_depends -sub HWDB udev \
+ "--enable-udev" \
+ "--disable-udev" \
+ "for device hotplug support" &&
+optional_depends bluez \
+ "--enable-bluez" \
+ "--disable-bluez" \
+ "for BlueZ support" &&
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-BUS system messaging" &&
+optional_depends openssl \
+ "--enable-openssl" \
+ "--disable-openssl" \
+ "for SSL support (Airtunes/RAOP)" &&
+optional_depends doxygen \
+ "--enable-manpages" \
+ "--disable-manpages" \
+ "for manpage generation" &&
optional_depends libcap \
"--with-caps" \
"--without-caps" \
- "Enable POSIX support?" &&
-optional_depends xorg-libs \
- "--enable-x11" \
- "--disable-x11" \
- "Enable X11 support?" &&
+ "Enable POSIX capability support?" &&

if is_depends_enabled $SPELL xorg-libs; then
depends libxtst
fi &&

-optional_depends policykit \
- "--enable-polkit" \
- "--disable-polkit" \
- "for PolicyKit authentication support" &&
-optional_depends avahi \
- "--enable-avahi" \
- "--disable-avahi" \
- "for ZerConf configuration support" &&
-optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
- "for Native Language Support" &&
+#optional_depends policykit \
+# "--enable-polkit" \
+# "--disable-polkit" \
+# "for PolicyKit authentication support" &&

suggest_depends padevchooser '' '' 'for Preferences tool' &&
suggest_depends paprefs '' '' 'for Preferences tool' &&
suggest_depends pavucontrol '' '' 'for Volume Control tool' &&
-suggest_depends pavumeter '' '' 'for Volume Meter tool'
+suggest_depends pavumeter '' '' 'for Volume Meter tool' &&
+suggest_depends paman '' '' 'for Manager tool'
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index a0a4425..313aa4c 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,12 @@
+2011-09-19 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: corrected oss options and added ipv6 switches
+ * DEPENDS: disabled polkit, no longer supported by configure.
+ Re-ordered all deps like configure for easy checking.
+ Added optional deps for gtk+2, gconf2, bluez, openssl, paman and
+ doxygen.
+ Added configuration database selection.
+ * BUILD: added ipv6 and database options to OPTS
+
2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: switched the udev sub_depends from extras to hwdb.

diff --git a/audio-libs/celt/BUILD b/audio-libs/celt/BUILD
index c2891c1..e8dd058 100755
--- a/audio-libs/celt/BUILD
+++ b/audio-libs/celt/BUILD
@@ -1,4 +1,4 @@
-if [[ $CELT_VCS == y ]]; then
+if [[ $CELT_BRANCH == scm ]]; then
./autogen.sh
fi &&
default_build
diff --git a/audio-libs/celt/DEPENDS b/audio-libs/celt/DEPENDS
index 00de136..3607b2f 100755
--- a/audio-libs/celt/DEPENDS
+++ b/audio-libs/celt/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $CELT_VCS == y ]]; then
+if [[ $CELT_BRANCH == scm ]]; then
depends autoconf &&
depends automake &&
depends libtool &&
diff --git a/audio-libs/celt/DETAILS b/audio-libs/celt/DETAILS
index 6601c1e..2b7bac5 100755
--- a/audio-libs/celt/DETAILS
+++ b/audio-libs/celt/DETAILS
@@ -1,6 +1,6 @@
SPELL=celt
-if [[ $CELT_VCS == y ]]; then
- if [[ $CELT_VCS_AUTOUPDATE == y ]]; then
+if [[ $CELT_BRANCH == scm ]]; then
+ if [[ $CELT_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-libs/celt/HISTORY b/audio-libs/celt/HISTORY
index ed174f4..f68de05 100644
--- a/audio-libs/celt/HISTORY
+++ b/audio-libs/celt/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-07-15 Pol Vinogradov <vin.public AT gmail.com>
* CONFLICTS: added to conflict with celt051

diff --git a/audio-libs/celt/PREPARE b/audio-libs/celt/PREPARE
index 374166f..98d27e4 100755
--- a/audio-libs/celt/PREPARE
+++ b/audio-libs/celt/PREPARE
@@ -1,6 +1,2 @@
-config_query CELT_VCS "Build latest version from development tree?" n &&
-
-if [[ $CELT_VCS == y ]]; then
- config_query CELT_VCS_AUTOUPDATE \
- "Update automatically on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
index 7fc0ab3..cefd432 100755
--- a/chat-im/choqok/DETAILS
+++ b/chat-im/choqok/DETAILS
@@ -1,6 +1,6 @@
SPELL=choqok
-if [ "$CHOQOK_SCM" = y ]; then
- if [ "$CHOQOK_AUTOUPDATE" = y ]; then
+if [[ "$CHOQOK_BRANCH" = scm ]]; then
+ if [[ "$CHOQOK_AUTOUPDATE" = y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
index 4c61460..d330970 100644
--- a/chat-im/choqok/HISTORY
+++ b/chat-im/choqok/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.1
diff --git a/chat-im/choqok/PREPARE b/chat-im/choqok/PREPARE
index e6bf0e6..98d27e4 100755
--- a/chat-im/choqok/PREPARE
+++ b/chat-im/choqok/PREPARE
@@ -1,5 +1,2 @@
-config_query CHOQOK_SCM "Build SCM version?" n &&
-if [[ "$CHOQOK_SCM" == "y" ]]; then
- config_query CHOQOK_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 384e122..8f6e7a0 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -9,6 +9,7 @@ if [[ $IRSSI_BRANCH == scm ]]; then
SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
SOURCE_IGNORE=volatile
+ SOURCE=$SPELL-scm.tar.bz2
else
VERSION=0.8.15
SECURITY_PATCH=1
@@ -17,8 +18,8 @@ else
SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
-fi
SOURCE=$SPELL-$VERSION.tar.bz2
+fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.irssi.org
ENTERED=20011126
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 757ec6d..37f0c77 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE for scm branch
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, PRE_BUILD, PREPARE, DETAILS: Use prepare_select_branch

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index f031605..efef7c5 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.7.1
- VERSIONX=autoconf-3070701
-
SOURCE_HASH=sha512:df88210fe53d13341eb671e77bd89deb672f5c7678fa75d0eeb931789f9d9f58543b81080a088c1fe9dbb72f1d5c9fb0f383af9b3535af84b9065205a55f3f94
+ VERSION=3.7.8
+ VERSIONX=autoconf-3070800
+
SOURCE_HASH=sha512:2e46d832f05d612853f3317956ec86b2d1832cc9a036ca72b527719e77fe79481352d71f562e9918be5bb3f017e8619c8db26d41702c1bea7fe423bfc023f4df
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 6235138..4d53a46 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.8
+
2011-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: always enable dynamic extensions for sqlite binary (tea
library
is built for its own); corrected configure flags for tea version
diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS
index d5ff64b..41345f4 100755
--- a/devel/codeblocks/DETAILS
+++ b/devel/codeblocks/DETAILS
@@ -1,6 +1,6 @@
SPELL=codeblocks
-if [[ $CODEBLOCKS_SVN = "y" ]]; then
- if [[ $SVN_AUTOUPDATE = y ]]; then
+if [[ $CODEBLOCKS_BRANCH = scm ]]; then
+ if [[ $CODEBLOCKS_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index da0182b..b7fa00b 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2010-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: moved execution of autotools there
* BUILD: use default_build
diff --git a/devel/codeblocks/PREPARE b/devel/codeblocks/PREPARE
index 1ef6e7c..98d27e4 100755
--- a/devel/codeblocks/PREPARE
+++ b/devel/codeblocks/PREPARE
@@ -1,4 +1,2 @@
-config_query CODEBLOCKS_SVN "Do you want to use the development version from
svn?" n &&
-if [[ $CODEBLOCKS_SVN == "y" ]]; then
- config_query SVN_AUTOUPDATE "Do you want to cast $SPELL on system
upgrade?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
index 54e95e0..a7c0f78 100755
--- a/devel/codeblocks/PRE_BUILD
+++ b/devel/codeblocks/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-if [[ $CODEBLOCKS_SVN == "y" ]]; then
+if [[ $CODEBLOCKS_BRANCH == scm ]]; then
cd ${SOURCE_DIRECTORY} &&
./bootstrap || return 1
fi
diff --git a/devel/ldasm/BUILD b/devel/ldasm/BUILD
new file mode 100755
index 0000000..6d0a9e1
--- /dev/null
+++ b/devel/ldasm/BUILD
@@ -0,0 +1,4 @@
+# NOTE: ptrace doesn't build, once fixed remove INSTALL and uncomment the
+# following line.
+
+#make
diff --git a/devel/ldasm/DEPENDS b/devel/ldasm/DEPENDS
new file mode 100755
index 0000000..5ee4fa6
--- /dev/null
+++ b/devel/ldasm/DEPENDS
@@ -0,0 +1,3 @@
+depends binutils &&
+depends perl &&
+depends perl-tk
diff --git a/devel/ldasm/DETAILS b/devel/ldasm/DETAILS
new file mode 100755
index 0000000..7e1379e
--- /dev/null
+++ b/devel/ldasm/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=ldasm
+ VERSION=0.04.53
+ SOURCE="LDasm-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.feedface.com/projects/files/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:45e86fc700dc6eccb22090fc99499389f8838df9d279d1b018d6f56b49e658f7bd8b6718276c4fbb56c1b1e66a8062fef01aa57d325273c3b748ac480ef51ce1
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/LDasm-${VERSION}"
+ WEB_SITE="http://www.feedface.com/projects/ldasm.html";
+ LICENSE[0]=GPL
+ ENTERED=20110919
+ SHORT="Disassembler GUI"
+cat << EOF
+LDasm (Linux Disassembler) is a Perl/Tk-based GUI for objdump/binutils that
+tries to imitate the look'n'feel of W32Dasm.
+
+It searchs for cross-references (e.g. strings), converts the code from GAS
+to a MASM-like style, traces programs and much more.
+
+Comes along with PTrace a process-flow-logger.
+EOF
diff --git a/devel/ldasm/HISTORY b/devel/ldasm/HISTORY
new file mode 100644
index 0000000..d407793
--- /dev/null
+++ b/devel/ldasm/HISTORY
@@ -0,0 +1,4 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+ * BUILD, INSTALL: Fixed build
+ * DEPENDS: depends on perl-tk
diff --git a/devel/ldasm/INSTALL b/devel/ldasm/INSTALL
new file mode 100755
index 0000000..fe903af
--- /dev/null
+++ b/devel/ldasm/INSTALL
@@ -0,0 +1 @@
+make install_ldasm
diff --git a/disk/cdrdao/BUILD b/disk/cdrdao/BUILD
index 0fec124..be57128 100755
--- a/disk/cdrdao/BUILD
+++ b/disk/cdrdao/BUILD
@@ -1,4 +1,4 @@
-if [ "$CVS" == "n" ]; then
+if [[ "$CDRDAO_BRANCH" != "scm" ]]; then
##### Patch needed for building on x86_64 ######
ARCH=$(uname -m) &&
if [ "${ARCH:0:6}" = "x86_64" ]; then
@@ -7,10 +7,7 @@ if [ "$CVS" == "n" ]; then
cd $SOURCE_DIRECTORY
fi
################################################
-fi &&
-
-if [ "$CVS" == "y" ]
-then
+else
sedit "/^AM_GCONF_SOURCE_2$/d" configure.ac &&
touch xdao/gcdmaster.schemas.in &&
./autogen.sh
diff --git a/disk/cdrdao/DEPENDS b/disk/cdrdao/DEPENDS
index 1fba8fc..8da3339 100755
--- a/disk/cdrdao/DEPENDS
+++ b/disk/cdrdao/DEPENDS
@@ -1,5 +1,5 @@
-if [ "$CVS" == "y" ]
-then depends CVS
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
+ depends CVS
fi &&

optional_depends pccts \
diff --git a/disk/cdrdao/DETAILS b/disk/cdrdao/DETAILS
index c104a08..d50e664 100755
--- a/disk/cdrdao/DETAILS
+++ b/disk/cdrdao/DETAILS
@@ -1,6 +1,6 @@
SPELL=cdrdao
-if [ "$CVS" == "y" ]; then
- if [ "$CDRDAO_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
+ if [[ "$CDRDAO_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=sfcvs
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index 950969e..9d8ae51 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch
+
2011-01-11 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added if statement for CVS
* BUILD: added if statement for CVS
diff --git a/disk/cdrdao/PREPARE b/disk/cdrdao/PREPARE
index d54d1c1..98d27e4 100755
--- a/disk/cdrdao/PREPARE
+++ b/disk/cdrdao/PREPARE
@@ -1,7 +1,2 @@
-config_query CVS "Use the CVS version?" n
-
-if [ "$CVS" == "y" ]; then
- config_query CDRDAO_CVS_AUTOUPDATE \
- "Update to the latest CVS automatically on every cast?" \
- n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index 18d7ab7..55a1bdc 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [ "$CVS" == "n" ]; then
+if [[ "$CDRDAO_BRANCH" == "scm" ]]; then
patch -p0 < "$SPELL_DIRECTORY/stat.patch"
fi
diff --git a/disk/fuse/BUILD b/disk/fuse/BUILD
index 4538a62..7341d05 100755
--- a/disk/fuse/BUILD
+++ b/disk/fuse/BUILD
@@ -1,4 +1,4 @@
-if [[ $CVS == y ]]; then
+if [[ $FUSE_BRANCH == scm ]]; then
OPTS="$OPTS --disable-mtab"
fi &&

diff --git a/disk/fuse/DEPENDS b/disk/fuse/DEPENDS
index ad21194..1e010b1 100755
--- a/disk/fuse/DEPENDS
+++ b/disk/fuse/DEPENDS
@@ -1,3 +1,3 @@
-if [ "$CVS" = "y" ]; then
+if [ "$FUSE_BRANCH" = "scm" ]; then
depends git
fi
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 87e230e..f581427 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,13 +1,13 @@
SPELL=fuse
-if [ "$CVS" != "y" ]; then
- VERSION=2.8.5
- PATCHLEVEL=2
-
SOURCE_HASH=sha512:83f668c5c02f591a1f6e5cb6f95abb7227248ba80fab940395ee5ec07ce44743dae07c3cfd865327143fe5cbe3bbee4aa1c4e856e55aa80cb8b6892f9683efad
+if [ "$FUSE_BRANCH" != "scm" ]; then
+ VERSION=2.8.6
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- if [ "$FUSE_CVS_AUTOUPDATE" == "y" ]; then
+ if [ "$FUSE_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 472f532..d9cac26 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,9 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch
+
+2011-09-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8.6
+
2011-07-18 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: init.patch is not applicable for CVS version

diff --git a/disk/fuse/PREPARE b/disk/fuse/PREPARE
index 5173cad..98d27e4 100755
--- a/disk/fuse/PREPARE
+++ b/disk/fuse/PREPARE
@@ -1,7 +1,2 @@
-config_query CVS "Use git version?" n &&
-
-if [ "$CVS" == "y" ]; then
- config_query FUSE_CVS_AUTOUPDATE \
- "Update to the latest git automatically on every cast?" \
- n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index e16f051..a2bb535 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,13 +2,13 @@ default_pre_build &&

cd "$SOURCE_DIRECTORY" &&

-if [ "$CVS" != "y" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
patch -p0 < "$SPELL_DIRECTORY/init.patch"
fi &&

# glibc-2.14 fix
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&

-if [ "$CVS" = "y" ]; then
+if [ "$FUSE_BRANCH" = "scm" ]; then
./makeconf.sh
fi
diff --git a/e-17/eet/DEPENDS b/e-17/eet/DEPENDS
index 86cbf6c..d15bea8 100755
--- a/e-17/eet/DEPENDS
+++ b/e-17/eet/DEPENDS
@@ -1,7 +1,7 @@
depends eina &&
depends JPEG &&

-if [ "$EET_CVS" == "y" ]; then
+if [[ $EET_BRANCH == scm ]]; then
depends subversion
fi &&

diff --git a/e-17/eet/DETAILS b/e-17/eet/DETAILS
index f3d5892..85ab8b5 100755
--- a/e-17/eet/DETAILS
+++ b/e-17/eet/DETAILS
@@ -1,6 +1,6 @@
SPELL=eet
-if [ "$EET_CVS" == "y" ]; then
- if [ "$EET_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $EET_BRANCH == scm ]]; then
+ if [[ $EET_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 36e8424..e930319 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2011-01-29 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updating version to 1.4.0

diff --git a/e-17/eet/PREPARE b/e-17/eet/PREPARE
index c2ec97d..98d27e4 100755
--- a/e-17/eet/PREPARE
+++ b/e-17/eet/PREPARE
@@ -1,6 +1,2 @@
-config_query EET_CVS "Build SCM (subversion) version?" n &&
-
-if [ "$EET_CVS" == "y" ]; then
- config_query EET_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/eet/PRE_BUILD b/e-17/eet/PRE_BUILD
index 168505e..747d7f9 100755
--- a/e-17/eet/PRE_BUILD
+++ b/e-17/eet/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$EET_CVS" == "y" ]; then
+if [[ $EET_BRANCH == scm ]]; then
cd $SOURCE_DIRECTORY &&

#
diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS
index 8a475f6..bd02aa6 100755
--- a/e-17/eina/DETAILS
+++ b/e-17/eina/DETAILS
@@ -1,6 +1,6 @@
SPELL=eina
-if [ "$EINA_CVS" == "y" ]; then
- if [ "$EINA_SCM_AUTOUPDATE" == "y" ]; then
+if [[ $EINA_BRANCH == scm ]]; then
+ if [[ $EINA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index 7bf36ac..924cca9 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2011-01-29 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updating version and url for 1.0.0
* PREPARE: adding cvs compile question
diff --git a/e-17/eina/PREPARE b/e-17/eina/PREPARE
index 3ff3c43..98d27e4 100755
--- a/e-17/eina/PREPARE
+++ b/e-17/eina/PREPARE
@@ -1,6 +1,2 @@
-config_query EINA_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EINA_CVS" == "y" ]; then
- config_query EINA_SCM_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/eina/PRE_BUILD b/e-17/eina/PRE_BUILD
index d2230cb..fdff541 100755
--- a/e-17/eina/PRE_BUILD
+++ b/e-17/eina/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$EINA_CVS" == "y" ]; then
+if [[ $EINA_BRANCH == scm ]]; then
cd $SOURCE_DIRECTORY &&
#
# Remove .svn directories, otherwise they get installed
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index 44c6728..a40d5d1 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -2,7 +2,7 @@ depends automake
&&
depends eina &&
depends libtool &&

-if [ "$EVAS_CVS" == "y" ]; then
+if [[ "$EVAS_BRANCH" == "scm" ]]; then
depends subversion
fi &&

diff --git a/e-17/evas/DETAILS b/e-17/evas/DETAILS
index 02dcbd8..04d2509 100755
--- a/e-17/evas/DETAILS
+++ b/e-17/evas/DETAILS
@@ -1,6 +1,6 @@
SPELL=evas
-if [ "$EVAS_CVS" == "y" ]; then
- if [ "$EVAS_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$EVAS_BRANCH" == "scm" ]]; then
+ if [[ "$EVAS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 979bd38..2715b1d 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: 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/evas/PREPARE b/e-17/evas/PREPARE
index 2775731..98d27e4 100755
--- a/e-17/evas/PREPARE
+++ b/e-17/evas/PREPARE
@@ -1,6 +1,2 @@
-config_query EVAS_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EVAS_CVS" == "y" ]; then
- config_query EVAS_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/e-17/evas/PRE_BUILD b/e-17/evas/PRE_BUILD
index f5108cf..e4c19d5 100755
--- a/e-17/evas/PRE_BUILD
+++ b/e-17/evas/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$EVAS_CVS" == "y" ]; then
+if [[ "$EVAS_BRANCH" == "scm" ]]; then
cd $SOURCE_DIRECTORY &&
#
# Remove .svn directories, otherwise they get installed
diff --git a/e-17/evfs/DETAILS b/e-17/evfs/DETAILS
index 9ca708e..77663c7 100755
--- a/e-17/evfs/DETAILS
+++ b/e-17/evfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=evfs
-if [ "$EVFS_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$EVFS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/evfs/HISTORY b/e-17/evfs/HISTORY
index 8375ba5..f2ad688 100644
--- a/e-17/evfs/HISTORY
+++ b/e-17/evfs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 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/evfs/PREPARE b/e-17/evfs/PREPARE
index 2fdd318..f8b7d7e 100755
--- a/e-17/evfs/PREPARE
+++ b/e-17/evfs/PREPARE
@@ -1,2 +1,2 @@
-config_query EVFS_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/eyelight/DETAILS b/e-17/eyelight/DETAILS
index 644b544..9b9a945 100755
--- a/e-17/eyelight/DETAILS
+++ b/e-17/eyelight/DETAILS
@@ -1,5 +1,5 @@
SPELL=eyelight
-if [ "$ELEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $ELEMENTARY_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/eyelight/HISTORY b/e-17/eyelight/HISTORY
index 3c2bb2f..1195d43 100644
--- a/e-17/eyelight/HISTORY
+++ b/e-17/eyelight/HISTORY
@@ -1,2 +1,5 @@
+2011-09-18 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2009-12-07 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD: spell created
diff --git a/e-17/eyelight/PREPARE b/e-17/eyelight/PREPARE
index b201253..f8b7d7e 100755
--- a/e-17/eyelight/PREPARE
+++ b/e-17/eyelight/PREPARE
@@ -1,2 +1,2 @@
-config_query EYELIGHT_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/shellementary/DETAILS b/e-17/shellementary/DETAILS
index 4efc16c..e5d5398 100755
--- a/e-17/shellementary/DETAILS
+++ b/e-17/shellementary/DETAILS
@@ -1,5 +1,5 @@
SPELL=shellementary
-if [ "$SHELLEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $SHELLEMENTARY_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/e-17/shellementary/HISTORY b/e-17/shellementary/HISTORY
index a09941b..0c786eb 100644
--- a/e-17/shellementary/HISTORY
+++ b/e-17/shellementary/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 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/shellementary/PREPARE b/e-17/shellementary/PREPARE
index 75848e6..f8b7d7e 100755
--- a/e-17/shellementary/PREPARE
+++ b/e-17/shellementary/PREPARE
@@ -1,2 +1,2 @@
-config_query SHELLEMENTARY_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/ftp/rsync/DETAILS b/ftp/rsync/DETAILS
index 9b9425f..23c861b 100755
--- a/ftp/rsync/DETAILS
+++ b/ftp/rsync/DETAILS
@@ -1,6 +1,6 @@
SPELL=rsync
-if [[ $RSYNC_GIT == y ]]; then
- if [[ $RSYNC_GIT_AUTOUPDATE == y ]]; then
+if [[ $RSYNC_BRANCH == scm ]]; then
+ if [[ $RSYNC_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY
index 2a99ebb..bd44324 100644
--- a/ftp/rsync/HISTORY
+++ b/ftp/rsync/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-08-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: global PATCHLEVEL=1
* INSTALL: added, to install init script
diff --git a/ftp/rsync/PREPARE b/ftp/rsync/PREPARE
index 924ad06..98d27e4 100755
--- a/ftp/rsync/PREPARE
+++ b/ftp/rsync/PREPARE
@@ -1,6 +1,2 @@
-config_query RSYNC_GIT "Build latest version from development tree?" n &&
-
-if [[ $RSYNC_GIT == y ]]; then
- config_query RSYNC_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/gnome2-libs/clutter/DETAILS b/gnome2-libs/clutter/DETAILS
index 8186f39..c6d1266 100755
--- a/gnome2-libs/clutter/DETAILS
+++ b/gnome2-libs/clutter/DETAILS
@@ -1,5 +1,5 @@
SPELL=clutter
- VERSION=1.6.18
+ VERSION=1.6.20
BRANCH=${VERSION:0:3}
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/clutter/HISTORY b/gnome2-libs/clutter/HISTORY
index 3c6c13c..a73943c 100644
--- a/gnome2-libs/clutter/HISTORY
+++ b/gnome2-libs/clutter/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.20
+
2011-09-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.18

diff --git a/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig
deleted file mode 100644
index 63f8e45..0000000
Binary files a/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/clutter/clutter-1.6.20.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.6.20.tar.bz2.sig
new file mode 100644
index 0000000..c4928ca
Binary files /dev/null and b/gnome2-libs/clutter/clutter-1.6.20.tar.bz2.sig
differ
diff --git a/graphics/exiv2/DETAILS b/graphics/exiv2/DETAILS
index 0c19419..329dad8 100755
--- a/graphics/exiv2/DETAILS
+++ b/graphics/exiv2/DETAILS
@@ -1,6 +1,6 @@
SPELL=exiv2
- VERSION=0.21.1
-
SOURCE_HASH=sha512:a83a6b10b6c3e7dc8718f1169684e09c4e9c2bab05e93fa29f7767f7babd12bf29203b1c8c46fbd576dad9b694ce3a699f4a47cee1c61dcfa889ae9e22a045b4
+ VERSION=0.22
+
SOURCE_HASH=sha512:3b7103b789a1fb7bac354def58787d71d9a5a958a782a2b8720975d3be96710b229619f7b73f0b6317db05637e8374beb3ab5ea33f8512a39e63c683e55b19a9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.exiv2.org
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index 9749d70..e318130 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,7 @@
+2011-09-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.22
+ * UP_TRIGGERS: update old soversion
+
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/exiv2/UP_TRIGGERS b/graphics/exiv2/UP_TRIGGERS
index 11b0952..f562017 100755
--- a/graphics/exiv2/UP_TRIGGERS
+++ b/graphics/exiv2/UP_TRIGGERS
@@ -1,5 +1,5 @@
# up_trigger everything on major version updates
-local OLD_SO_VERSION=9
+local OLD_SO_VERSION=10
local OLD_SPELL_VERSION=""
if spell_ok $SPELL; then
OLD_SPELL_VERSION="$(installed_version $SPELL)"
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index 218280f..299866a 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -7,7 +7,7 @@ depends smgl-fhs &&
depends smgl-archspecs &&
optional_depends libselinux '--with-selinux' '--without-selinux' 'for
selinux support' &&

-if [ "$GLIBC_GIT" = "y" ]; then
+if [ "${GLIBC_BRANCH/-*}" = "scm" ]; then
depends git
fi &&

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 0219656..44cbac3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -20,18 +20,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
- if [[ "$GLIBC_GIT" == "y" ]]; then
-local GLIBC_VERSION
- GLIBC_VERSION=2.13
- if [[ "${GLIBC_GIT_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_VERSION}-git-$(date +%Y%m%d)
+ if [[ "${GLIBC_BRANCH/-*}" == "scm" ]]; then
+ if [[ "${GLIBC_AUTOUPDATE}" == "y" ]]; then
+ VERSION=${GLIBC_BRANCH}-$(date +%Y%m%d)
else
- VERSION=${GLIBC_VERSION}-git
+ VERSION=${GLIBC_BRANCH}
fi
FORCE_DOWNLOAD=on
SOURCE=$SPELL-git.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
-
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_VERSION}/master"
+
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_BRANCH#scm-}/master"
SOURCE_IGNORE=volatile
else
VERSION=2.13
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 642b1f9..7cc3658 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-09-12 Bor Kraljič <pyrobor AT ver.si>
* PREPARE,DETAILS: changed cvs url to git (uses 2.13 branch) (fixes
#195)
* DEPENDS: replaced CVS with git
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 39ce0cc..5387658 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,3 +1,4 @@
+. ${GRIMOIRE}/FUNCTIONS &&
if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.* ]]; then
if test "$HOST" == "i386-pc-linux-gnu"; then
message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
@@ -5,10 +6,7 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
if [[ "$GLIBC_NPTL" == "y" ]]; then
- config_query GLIBC_GIT "Do you want to install the latest unstable
(requires git)?" n &&
- if [[ "$GLIBC_GIT" == "y" ]]; then
- config_query GLIBC_GIT_AUTOUPDATE "Update on every system update?" n
- fi
+ prepare_select_branch stable scm-2.13
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
diff --git a/shell-term-fm/bash-completion/HISTORY
b/shell-term-fm/bash-completion/HISTORY
index 7fabbc8..4c1f00b 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Bor Kraljič <pyrobor AT ver.si>
+ * smgl_completion: added gaze tablet that is now in devel sorcery
+
2011-02-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.3
fixed long description wrap
diff --git a/shell-term-fm/bash-completion/smgl_completion
b/shell-term-fm/bash-completion/smgl_completion
index 2ee8913..4601f49 100644
--- a/shell-term-fm/bash-completion/smgl_completion
+++ b/shell-term-fm/bash-completion/smgl_completion
@@ -82,7 +82,7 @@ _gaze()
older prune voyeur pam orphans depends spider time version
versions \
activity install-queue remove-queue show-held
show-exiled short \
source_urls install-full install-spell license size
grimoires dependencies \
- time time-system system-info \
+ time time-system system-info tablet\
BUILD CONFIGURE CONFLICTS DETAILS DEPENDS DOWNLOAD
FINAL HISTORY \
INSTALL INSTALL_EXTRAS PATCH POST_BUILD POST_INSTALL
POST_REMOVE \
POST_RESURRECT PRE_BUILD PRE_INSTALL PRE_REMOVE
PRE_RESURRECT \
@@ -98,7 +98,7 @@ _gaze()
_spell_list
return 0
;;
- installed)
+ installed|tablet)
_add_installed_spell_list
return 0
;;
diff --git a/smgl/castfs/DEPENDS b/smgl/castfs/DEPENDS
index e9e1225..0c698b5 100755
--- a/smgl/castfs/DEPENDS
+++ b/smgl/castfs/DEPENDS
@@ -2,7 +2,7 @@ depends fuse &&
depends libtool &&
depends pkgconfig &&
depends texinfo &&
-if [[ $CASTFS_GIT == y ]]
+if [[ $CASTFS_BRANCH == scm ]]
then
depends git
fi
diff --git a/smgl/castfs/DETAILS b/smgl/castfs/DETAILS
index 104b32a..642fe46 100755
--- a/smgl/castfs/DETAILS
+++ b/smgl/castfs/DETAILS
@@ -1,7 +1,7 @@
SPELL=castfs
-if [[ $CASTFS_GIT == y ]]
+if [[ $CASTFS_BRANCH == scm ]]
then
- if [[ $CASTFS_GIT_AUTOUPDATE == y ]]
+ if [[ $CASTFS_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 191bf96..57f4112 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2010-03-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.6.1 (Fix Bug #15636)

diff --git a/smgl/castfs/PREPARE b/smgl/castfs/PREPARE
index e221cce..98d27e4 100755
--- a/smgl/castfs/PREPARE
+++ b/smgl/castfs/PREPARE
@@ -1,7 +1,2 @@
-config_query CASTFS_GIT "Use git version?" n &&
-
-if [[ "$CASTFS_GIT" == "y" ]]
-then
- config_query CASTFS_GIT_AUTOUPDATE \
- "Automatically update every day?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/smgl/quill/DEPENDS b/smgl/quill/DEPENDS
index f0ac067..29a56a0 100755
--- a/smgl/quill/DEPENDS
+++ b/smgl/quill/DEPENDS
@@ -1,5 +1,5 @@
depends -sub SSL wget &&
-if [[ $QUILL_GIT == y ]]
+if [[ $QUILL_BRANCH == scm ]]
then
depends git
fi &&
diff --git a/smgl/quill/DETAILS b/smgl/quill/DETAILS
index 1f855e5..0b0145a 100755
--- a/smgl/quill/DETAILS
+++ b/smgl/quill/DETAILS
@@ -1,7 +1,7 @@
SPELL=quill
-if [[ $QUILL_GIT == y ]]
+if [[ $QUILL_BRANCH == scm ]]
then
- if [[ $QUILL_GIT_AUTOUPDATE == y ]]
+ if [[ $QUILL_AUTOUPDATE == y ]]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/smgl/quill/HISTORY b/smgl/quill/HISTORY
index 4d55dd7..1a5abb8 100644
--- a/smgl/quill/HISTORY
+++ b/smgl/quill/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2009-04-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.3.0-rc16

diff --git a/smgl/quill/PREPARE b/smgl/quill/PREPARE
index d3a54cc..98d27e4 100755
--- a/smgl/quill/PREPARE
+++ b/smgl/quill/PREPARE
@@ -1,7 +1,2 @@
-config_query QUILL_GIT "Use the development (git) version?" n &&
-
-if [[ "$QUILL_GIT" == "y" ]]
-then
- config_query QUILL_GIT_AUTOUPDATE \
- "Automatically update every day?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 3ac911b..5be8477 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -8,11 +8,14 @@ elif [ "$MPLAYER_GUI" == "gtk+2" ]; then
depends mplayer-gui
fi &&

-if [ "$MPLAYER_SVN" == "y" ]; then
+if [[ $MPLAYER_BRANCH == scm ]]; then
depends subversion &&

optional_depends ffmpeg-svn \
- "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
--disable-libavutil_a" "" "to use system ffmpeg instead of internal one"
+ "--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
+ --disable-libavutil_a" "" "to use system ffmpeg instead of internal one"
&&
+
+ optional_depends libxscrnsaver "" "--disable-xss" "to inhibit screensaver
start while playing"
else
optional_depends libdvdnav "" "--disable-dvdnav" "support for DVD
navigation"
fi &&
@@ -65,10 +68,6 @@ optional_depends libxv "--enable-xv" "--disable-xv" "for
xv output support" &&
optional_depends libxvmc "--enable-xvmc" "--disable-xvmc" "for xvmc output
support" &&
optional_depends xf86-video-mga "--enable-xmga" "--disable-xmga" "for xmga
output support" &&

-if [ "$MPLAYER_SVN" == "y" ]; then
- optional_depends libxscrnsaver "" "--disable-xss" "to inhibit screensaver
start while playing"
-fi &&
-
optional_depends sdl "" "--disable-sdl" "for SDL video and audio output" &&
optional_depends directfb "" "--disable-directfb" "for direct framebuffer
support" &&
optional_depends libcaca "" "--disable-caca" "for colored ASCII video
output" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index f65d74f..d59de9b 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,6 +1,6 @@
SPELL=mplayer
-if [ "$MPLAYER_SVN" == "y" ]; then
- if [ "$MPLAYER_SVN_AUTOUPDATE" == "y" ]; then
+if [[ $MPLAYER_BRANCH == scm ]]; then
+ if [[ $MPLAYER_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/video/mplayer/DOWNLOAD b/video/mplayer/DOWNLOAD
deleted file mode 100755
index a9b6ac0..0000000
--- a/video/mplayer/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 [[ $(url_get_prefix $SOURCE_URL[0]) != svn ]]; then
- default_download
- return $?
-fi &&
-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}"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index c7a3640..3db5d0e 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DOWNLOAD: Removed, sorcery supports Subversion URLs now
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-01-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0rc4
* DEPENDS: added --extra-libs=-lvorbisenc to libvorbis
diff --git a/video/mplayer/PREPARE b/video/mplayer/PREPARE
index 08386a5..26a2312 100755
--- a/video/mplayer/PREPARE
+++ b/video/mplayer/PREPARE
@@ -1,9 +1,5 @@
# changed CVS -> SVN, remove from test when it's in stable
# 2006-06-05 Arwed v. Merkatz
-config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
-if [[ $MPLAYER_SVN = y ]]; then
- config_query MPLAYER_SVN_AUTOUPDATE \
- "Update to the latest SVN on every system-update?" \
- ${MPLAYER_CVS_AUTOUPDATE:-n}
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index e307930..b96e046 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,7 @@
+2011-09-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added Jeremy Kajikawa's build fix for bug #178
+ and changed _XUTIL_H_ to _X11& in lib/Util.cc (opensuse fix)
+
2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added missing modular xorg dependencies

diff --git a/windowmanagers/blackbox/PRE_BUILD
b/windowmanagers/blackbox/PRE_BUILD
index 03383a8..344d369 100755
--- a/windowmanagers/blackbox/PRE_BUILD
+++ b/windowmanagers/blackbox/PRE_BUILD
@@ -29,4 +29,9 @@ sedit '35a\
sedit '38a\
#include <string.h>\' src/main.cc &&
sedit '35a\
-#include <string.h>\' util/bsetroot.cc
+#include <string.h>\' util/bsetroot.cc &&
+sedit '27a\
+#define XUTIL_H\' src/Window.hh &&
+sedit '28a\
+#define XUTIL_H\' lib/Util.cc &&
+sedit 's/_XUTIL_H_/_X11&/' lib/Util.hh
diff --git a/x11/freenx/DEPENDS b/x11/freenx/DEPENDS
index 237ca63..a332dbf 100755
--- a/x11/freenx/DEPENDS
+++ b/x11/freenx/DEPENDS
@@ -1,5 +1,5 @@
depends nx &&

-if [ "$FREENX_CVS" == "y" ]; then
+if [[ "$FREENX_BRANCH" == "scm" ]]; then
depends CVS
fi
diff --git a/x11/freenx/DETAILS b/x11/freenx/DETAILS
index 765fff6..e2a41d4 100755
--- a/x11/freenx/DETAILS
+++ b/x11/freenx/DETAILS
@@ -1,6 +1,6 @@
SPELL=freenx
-if [ "$FREENX_CVS" == "y" ]; then
- if [ "$FREENX_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$FREENX_BRANCH" == "scm" ]; then
+ if [[ "$FREENX_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
diff --git a/x11/freenx/HISTORY b/x11/freenx/HISTORY
index 7752fba..b23f492 100644
--- a/x11/freenx/HISTORY
+++ b/x11/freenx/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2009-12-09 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* FINAL, INSTALL: fixing persistent_add use to make spell cast

diff --git a/x11/freenx/PREPARE b/x11/freenx/PREPARE
index dcef9f4..98d27e4 100755
--- a/x11/freenx/PREPARE
+++ b/x11/freenx/PREPARE
@@ -1,6 +1,2 @@
-config_query FREENX_CVS "Build CVS version?" y &&
-
-if [ "$FREENX_CVS" == "y" ]; then
- config_query FREENX_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/x11/freenx/PRE_BUILD b/x11/freenx/PRE_BUILD
index a0912bc..7993eab 100755
--- a/x11/freenx/PRE_BUILD
+++ b/x11/freenx/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$FREENX_CVS" == "y" ]; then
+if [ "$FREENX_BRANCH" == "scm" ]; then
cd $SOURCE_DIRECTORY &&
patch -p0 < $SPELL_DIRECTORY/netcat.diff &&
patch -p0 < $SPELL_DIRECTORY/nx150backend.diff
diff --git a/xorg-driver/xf86-video-openchrome/DEPENDS
b/xorg-driver/xf86-video-openchrome/DEPENDS
index 044ff0d..92d51e4 100755
--- a/xorg-driver/xf86-video-openchrome/DEPENDS
+++ b/xorg-driver/xf86-video-openchrome/DEPENDS
@@ -3,7 +3,7 @@ depends xproto &&
depends xorg-server &&
depends libdrm &&
depends libxvmc &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
+if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
depends subversion
fi &&

diff --git a/xorg-driver/xf86-video-openchrome/DETAILS
b/xorg-driver/xf86-video-openchrome/DETAILS
index 9c2a173..8f79272 100755
--- a/xorg-driver/xf86-video-openchrome/DETAILS
+++ b/xorg-driver/xf86-video-openchrome/DETAILS
@@ -1,6 +1,6 @@
SPELL=xf86-video-openchrome
-if [[ $OPENCHROME_SVN == y ]]; then
- if [[ "$OPENCHROME_SVN_AUTOUPDATE" == "y" ]]; then
+if [[ $XF86_VIDEO_OPENCHROME_BRANCH == scm ]]; then
+ if [[ "$XF86_VIDEO_OPENCHROME_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/xorg-driver/xf86-video-openchrome/HISTORY
b/xorg-driver/xf86-video-openchrome/HISTORY
index 1d7dff0..92492cf 100644
--- a/xorg-driver/xf86-video-openchrome/HISTORY
+++ b/xorg-driver/xf86-video-openchrome/HISTORY
@@ -1,3 +1,6 @@
+2011-09-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2008-09-11 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Added release version 0.2.903. Updated svn $SOURCE_URL
* PREPARE: Added query for devel version
diff --git a/xorg-driver/xf86-video-openchrome/PREPARE
b/xorg-driver/xf86-video-openchrome/PREPARE
index e9658e5..98d27e4 100755
--- a/xorg-driver/xf86-video-openchrome/PREPARE
+++ b/xorg-driver/xf86-video-openchrome/PREPARE
@@ -1,6 +1,2 @@
-config_query OPENCHROME_SVN \
- "Use the development (svn) version?" n &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
- config_query OPENCHROME_SVN_AUTOUPDATE \
- "Queue for update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/xf86-video-openchrome/PRE_BUILD
b/xorg-driver/xf86-video-openchrome/PRE_BUILD
index 51c80d7..9281853 100755
--- a/xorg-driver/xf86-video-openchrome/PRE_BUILD
+++ b/xorg-driver/xf86-video-openchrome/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ "$OPENCHROME_SVN" == "y" ]]; then
+if [[ "$XF86_VIDEO_OPENCHROME_BRANCH" == "scm" ]]; then
autoreconf -v --install
fi
OPTS="--enable-maintainer-mode ${OPTS}"



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (3e351a0723a6b4875778e3042ee34e2e6ba66b7c), Vlad Glagolev, 09/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page