Source Mage code commit list

[Arjan Bouter <scm AT sourcemage.org>]

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

 archive/dynamite/DETAILS          |   11 ++++++-----
 archive/dynamite/HISTORY          |    3 +++
 shell-term-fm/grdesktop/DEPENDS   |    4 +++-
 shell-term-fm/grdesktop/HISTORY   |    5 +++++
 shell-term-fm/grdesktop/PRE_BUILD |    5 +++++
 shell-term-fm/rdesktop/CONFIGURE  |    2 +-
 shell-term-fm/rdesktop/DEPENDS    |    7 ++++++-
 shell-term-fm/rdesktop/HISTORY    |    3 +++
 8 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit acb63cfa5de662c2c54ed2df28a0c5f4b553df7e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    grdesktop: added dependency on libgnomeui and an optional dep on rarian

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

    dynamite: version 0.1.1

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

    rdesktop: added alsa and libao sound providers

diff --git a/archive/dynamite/DETAILS b/archive/dynamite/DETAILS
index 1ab3f3b..7340965 100755
--- a/archive/dynamite/DETAILS
+++ b/archive/dynamite/DETAILS
@@ -1,13 +1,14 @@
            SPELL=dynamite
-         VERSION=0.1
-          SOURCE=$SPELL-$VERSION.tar.gz
-     
SOURCE_HASH=sha512:c75dfa9fec3cd06373c99ac52f9f4d891f27786ae352b4a10c601a44d485f6f4068e07b8d7be71f051b4b373985d7f17f9ede507fbe704a4ff394433e9585453
+         VERSION=0.1.1
+          SOURCE=lib${SPELL}-$VERSION.tar.gz
+     
SOURCE_HASH=sha512:8f28be83f90d452430059fc24910fd6201446e20305555c19dada6e1e410aab8888b537f3502deadb9536f4128a21690d87b30bcdb4b3fc6910e33e1e3bdbe40
    SOURCE_URL[0]=$SOURCEFORGE_URL/synce/${SOURCE}
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/lib$SPELL-$VERSION
         WEB_SITE=http://www.synce.org
          ENTERED=20071024
       LICENSE[0]=GPL
            SHORT="PKware extraction utility"
 cat << EOF
-Dynamite is a tool and library for decompressing data compressed with PKWARE 
Data Compression Library
+Dynamite is a tool and library for decompressing data compressed with
+PKWARE Data Compression Library.
 EOF
diff --git a/archive/dynamite/HISTORY b/archive/dynamite/HISTORY
index c0a5ec7..8de96b5 100644
--- a/archive/dynamite/HISTORY
+++ b/archive/dynamite/HISTORY
@@ -1,3 +1,6 @@
+2009-12-19 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.1.1
+
 2007-10-24 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS,HISTORY: created spell
 
diff --git a/shell-term-fm/grdesktop/DEPENDS b/shell-term-fm/grdesktop/DEPENDS
index 7b54469..0babc7e 100755
--- a/shell-term-fm/grdesktop/DEPENDS
+++ b/shell-term-fm/grdesktop/DEPENDS
@@ -1,2 +1,4 @@
 depends gtk+2          &&
-depends        rdesktop
+depends        rdesktop        &&
+depends libgnomeui      &&
+optional_depends rarian '' '' 'for help files'
diff --git a/shell-term-fm/grdesktop/HISTORY b/shell-term-fm/grdesktop/HISTORY
index 9c2e3b5..78c4ae0 100644
--- a/shell-term-fm/grdesktop/HISTORY
+++ b/shell-term-fm/grdesktop/HISTORY
@@ -1,3 +1,8 @@
+2009-12-19 Arjan Bouter <abouter AT sourcemage.org>
+       * DEPENDS: added dependency on libgnomui and optionally depend on 
rarian
+       * PRE_BUILD: added, remove help from the makefile when building 
without
+         rarian
+
 2007-08-11 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: removed gnome-libs dep
 
diff --git a/shell-term-fm/grdesktop/PRE_BUILD 
b/shell-term-fm/grdesktop/PRE_BUILD
new file mode 100755
index 0000000..ecfe4b6
--- /dev/null
+++ b/shell-term-fm/grdesktop/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+if ! is_depends_enabled $SPELL rarian; then
+  sedit 's/pixmaps help/pixmaps/' Makefile.in
+fi
diff --git a/shell-term-fm/rdesktop/CONFIGURE 
b/shell-term-fm/rdesktop/CONFIGURE
index 3848663..dc68224 100755
--- a/shell-term-fm/rdesktop/CONFIGURE
+++ b/shell-term-fm/rdesktop/CONFIGURE
@@ -2,4 +2,4 @@ config_query_option  RDESKTOP_IPV6   "Enable IPv6 support?"  
y  \
                      "--with-ipv6"  "--without-ipv6"            &&
 
 config_query_list    RDESKTOP_SOUND  "Which sound system to use?"  \
-                     "none"  "oss"  "sun"  "sgi"
+                     "none"  "alsa"  "oss"  "libao"  "sun"  "sgi"
diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index a70b5cf..0572b1d 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -1 +1,6 @@
-depends  openssl
+depends  openssl  &&
+if list_find $RDESKTOP_SOUND alsa; then
+  depends  alsa-lib
+elif list_find $RDESKTOP_SOUND libao; then
+  depends  libao
+fi
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index eef4d80..0ec53e1 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2009-12-19 Arjan Bouter <abouter AT sourcemage.org>
+       * CONFIGURE, DEPENDS: added libao and alsa sound providers
+
 2008-05-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.6.0, SECURITY_PATCH=1