Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

11 files changed, 25 insertions, 12 deletions

diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index f679c0724a..cd37f9da53 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=aria2
-         VERSION=1.10.1
-     SOURCE_HASH=sha512:850457062fd58ae1765378cb27d90fdd1bcf33a28ce91357cc9df3f81cd9c7c7ad1d9dfd7258c30f74e86f48c3065dfc3a261ffb7529bd613901d07bddcdd449
+         VERSION=1.10.2
+     SOURCE_HASH=sha512:da8955cdb0f5c9b20d3779ffa45ab3b59ef5bab079a540ef3cb023daee8722b5339256283a3329a92d25d66f2f4c940f64f4f43e417b6952d4d4c16d9dc367c1
           SOURCE=${SPELL}-$VERSION.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 164e259cac..a62492117d 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2010-09-01 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 1.10.2
+
 2010-08-30 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 1.10.1
 
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 3c3197503a..249e60b38a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -10,11 +10,11 @@ depends  zlib                              &&
 depends  cairo                             &&
 depends  python                            &&
 depends  libnotify                         &&
-depends  xulrunner                         &&
 if [[ "$FIREFOX_CVS" = "n" ]]; then 
 depends  nspr                              &&
 depends  -sub "3.12.x" nss                 &&
-depends -sub APNG libpng
+depends -sub APNG libpng                   &&
+depends  xulrunner
 else
 depends autoconf-2.13                      &&
 depends libnotify                          &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 04cce1e454..dba8f8ecd4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,6 +1,3 @@
-2010-08-30 David C. Haley <khoralin@gmail.com>
-	* DEPENDS: xulrunner not dependent on CVS status.
-
 2010-08-28 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated devel to version 4.0b4
 	* DEPENDS: Optional depends on yasm
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index be0471bb4f..d20c78d77a 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2010-08-31 David C. Haley <khoralin@gmail.com>
+	* init.d/mountall.sh: checkfs() fixed removal of /fastboot
+
 2009-09-08 Arjan Bouter <abouter@sourcemage.org>
 	* PROVIDES: added, provide INITSCRIPTS
 
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 4107f29596..f0ddf5e89d 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -26,7 +26,10 @@ function recursive_rm() {
 
 checkfs()
 {
-  [ -e /fastboot     ]  &&  return
+  if [ -e /fastboot ]; then
+    rm -f /fastboot;
+    return;
+  fi
   [ -e /forcefsck    ]  &&  FORCE="-f"
   [ "$NOSOFTFIX" != yes ]  &&  FIX="-a"
   [ "$FSCKFIX" = yes ]  &&  FIX="-y"
@@ -47,8 +50,6 @@ checkfs()
     /sbin/sulogin
     /sbin/reboot  -f
   fi
-
-  rm -f /fastboot /forcefsck
 }
 
 scanlvm()
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index e2f00825ef..4570032889 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -92,4 +92,5 @@ optional_depends  libdvdread "" "--disable-dvdread" "support for reading scrambl
 optional_depends  fribidi "" "--disable-fribidi" "for locales writing from right to left" &&
 optional_depends  enca "" "--disable-enca" "for ENCA charset oracle library" &&
 optional_depends  OPENAL "" "--disable-openal" "for OpenAL sound support" &&
-optional_depends  samba "--enable-smb" "" "for SMB protocol support"
+optional_depends  samba "--enable-smb" "" "for SMB protocol support" &&
+optional_depends  yasm "" "--yasm=" "for NASM assembler support"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 75df611d0f..27f8c3765a 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2010-08-31 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org>
+	* DEPENDS: added optional dep on yasm
+
 2010-06-03 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: removed polypaudio; pulseaudio isn't SVN anymore; cleaned up;
 	  replaced tabs with spaces
diff --git a/xfce/xfburn/BUILD b/xfce/xfburn/BUILD
index 157daa2820..9bce9fbdf3 100755
--- a/xfce/xfburn/BUILD
+++ b/xfce/xfburn/BUILD
@@ -1,4 +1,4 @@
-if [[ $XFBURN_SVN == y ]]; then
+if [[ $XFBURN_GIT == y ]]; then
   ./autogen.sh --prefix=${INSTALL_ROOT}/usr  \
            --sysconfdir=${INSTALL_ROOT}/etc  \
         --localstatedir=${INSTALL_ROOT}/var  \
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
index e9fb51cd6d..5e3abd7dde 100755
--- a/xfce/xfburn/DEPENDS
+++ b/xfce/xfburn/DEPENDS
@@ -7,6 +7,7 @@ depends intltool &&
 depends libxfcegui4 &&
 
 if [[ $XFBURN_GIT == y ]]; then
+  depends docbook-xsl &&
   depends git &&
   depends xfce4-dev-tools
 fi &&
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index a72b11e0ed..e6d1a69fb2 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,7 @@
+2010-08-31 Pol Vinogradov <vin.public@gmail.com>
+	* BUILD: fixed switching to git
+	* DEPENDS: added required docbook-xsl for git branch
+
 2010-05-30 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.4.3