[SM-Commit] GIT changes to devel-gcc grimoire by Arwed von Merkatz (2b31d2fa8ce08745d7b445f5e0cb2a33e0a9afa4)

Arwed von Merkatz scm at sourcemage.org
Sat Oct 20 05:23:59 EDT 2007


GIT changes to devel-gcc grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 ChangeLog                          |    3 +
 audio-players/bmpx/DETAILS         |    4 +-
 audio-players/bmpx/HISTORY         |    3 +
 audio-soft/gnump3d/DETAILS         |    2 -
 audio-soft/gnump3d/HISTORY         |    3 +
 collab/typo3/DEPENDS               |    2 -
 collab/typo3/DETAILS               |   12 +-----
 collab/typo3/HISTORY               |    4 ++
 crypto/openssl/DETAILS             |    4 +-
 crypto/openssl/HISTORY             |    3 +
 crypto/putty/DETAILS               |    1 
 crypto/putty/HISTORY               |    4 ++
 crypto/putty/desktop/pterm.desktop |    8 ++++
 crypto/putty/desktop/putty.desktop |    8 ++++
 devel/phpmyadmin/DETAILS           |    6 +--
 devel/phpmyadmin/HISTORY           |    5 ++
 display/directfb/BUILD             |   19 +++++++--
 display/directfb/CONFIGURE         |   73 ++++++++++++++++++++++++++++++++++---
 display/directfb/DEPENDS           |   11 ++++-
 display/directfb/HISTORY           |    8 ++++
 display/directfb/inputdrivers      |   16 ++++++++
 editors/tea/DETAILS                |    4 +-
 editors/tea/HISTORY                |    3 +
 ftp/rtorrent/DEPENDS               |    7 +++
 ftp/rtorrent/HISTORY               |    7 ++-
 gnome2-apps/gramps/DETAILS         |    4 +-
 gnome2-apps/gramps/HISTORY         |    3 +
 gnu/ada/DETAILS                    |    2 -
 gnu/ada/HISTORY                    |    6 +++
 gnu/fortran/HISTORY                |    6 +++
 gnu/g++/HISTORY                    |    6 +++
 gnu/gcc/DETAILS                    |    1 
 gnu/gcc/HISTORY                    |    6 +++
 gnu/gcj/DEPENDS                    |    4 +-
 gnu/gcj/HISTORY                    |    9 ++++
 gnu/objc/HISTORY                   |    6 +++
 http/firefox/DETAILS               |    4 +-
 http/firefox/HISTORY               |    5 ++
 http/firefox/firefox-config.patch  |   10 ++---
 kde4/FUNCTIONS                     |   22 +++++++++--
 kde4/HISTORY                       |    5 ++
 kde4/KDE_DEPENDS                   |    1 
 kde4/kdeadmin4/DETAILS             |    4 +-
 kde4/kdeadmin4/HISTORY             |    3 +
 kde4/kdeedu4/DETAILS               |    4 +-
 kde4/kdeedu4/HISTORY               |    3 +
 kde4/kdemultimedia4/DETAILS        |    4 +-
 kde4/kdemultimedia4/HISTORY        |    3 +
 kde4/kdenetwork4/DETAILS           |    4 +-
 kde4/kdenetwork4/HISTORY           |    3 +
 kde4/kdetoys4/DETAILS              |    4 +-
 kde4/kdetoys4/HISTORY              |    3 +
 kde4/kdeutils4/DETAILS             |    4 +-
 kde4/kdeutils4/HISTORY             |    3 +
 kde4/plasma/CONFIGURE              |    1 
 kde4/plasma/DEPENDS                |   10 +++++
 kde4/plasma/DETAILS                |   14 +++++++
 kde4/plasma/HISTORY                |    3 +
 kernels/ndiswrapper/DETAILS        |    2 -
 kernels/rt2500_driver/HISTORY      |    3 +
 kernels/rt2500_driver/INSTALL      |    6 ++-
 printer/splix/DETAILS              |    4 +-
 printer/splix/HISTORY              |    3 +
 utils/strigi/DETAILS               |    4 +-
 utils/strigi/HISTORY               |    5 ++
 utils/strigi/strigi.sh             |    2 -
 utils/virtualbox-module/DETAILS    |    4 +-
 utils/virtualbox-module/HISTORY    |    3 +
 utils/virtualbox/DETAILS           |    4 +-
 utils/virtualbox/HISTORY           |    3 +
 utils/watchdog/DETAILS             |    2 -
 utils/watchdog/HISTORY             |    4 ++
 utils/watchdog/watchdog-gcc3.patch |    6 ++-
 video/ffmpeg-svn/BUILD             |    2 -
 video/ffmpeg-svn/DETAILS           |    1 
 video/ffmpeg-svn/HISTORY           |    5 ++
 video/ffmpeg-svn/PREPARE           |    2 -
 video/ffmpeg-svn/PRE_BUILD         |   12 +++---
 78 files changed, 383 insertions(+), 84 deletions(-)

New commits:
commit fb60576ca920e9b293a441edb0d049301a6ca210
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    objc: updated to 4.2.1

commit 3f0164d2f8a187c20620b12316e575fcbc61a5c4
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gcj: updated to 4.2.1

commit 9567a34a9231366739736184a2fc3969788a638d
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gcc: updated to 4.2.1

commit f81f02ce861af84d06c3a8a732156588735fe58b
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    g++: updated to 4.2.1

commit 10d53454c9b6d92b8b74aef13506db676059de07
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    fortran: updated to 4.2.1

commit 275affdab098014213bf15baf18debe461df00ca
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    ada: updated to 4.2.1

commit 437c35a7d87d46774a0156f5057d00c29ed5cbcd
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gcj: add some new depends

commit 0dadd305539c5e794a8e06a1f56e28bb1269e4d0
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gcj: 4.2.0

commit 0a28db6de90af6c53dae3a00d7a46fc558e1f524
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    ada: 4.2.0

commit 67dff844beb4d68af9b152fdbec769e948414c90
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    objc: 4.2.0

commit 330b8fa93e2ec70dad0e668a2ebba175dba46abc
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    fortran: 4.2.0

commit 4493ecd437cdf9fd56a4a3622854df93ba0f3545
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    g++: 4.2.0

commit d46dabd1186b16db72a4d5018198fd19760f71ad
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    gcc: 4.2.0
    g++ and fortran in the queue

commit bf97b85ef459a1a0371029d69f2a0ce8c6f87f5d
Author: Mathieu Lonjaret <lejatorn at sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn at sourcemage.org>

    rtorrent: added xmlrpc-c opt dep

commit 1ef732094042c8cee70331d999a03e61181505db
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    utils/watchdog:
    
    DETAILS: removed UPDATED, PATCHLEVEL++
    watchdog-gcc3.patch: updated so it builds with gcc 4.x

commit 5f5adf8c994abcdeb6cb25e76408b017d5139cf5
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    phpmyadmin 2.11.1.2

commit 5857da47cbcdd604b406cabc10061f04e84564d5
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    tea 17.3.5

commit 1b8d8d01a31bc29b28a1ac30a8b6b30293c5d382
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    virtualbox-module 1.5.2

commit 4ec9eba2592679d716ce73bf7aad16f1ebe92045
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    virtualbox 1.5.2

commit 28b732716f34b055cb739f524b3c5807902dc219
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    bmpx 0.40.13

commit fd9c944a65d3db5ad0e5b419e4c35d73b7479482
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kde4/plasma - new spell

commit 42d2d0773cbf63faa4ff95bd2d0978f650912573
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    thomas.leonard.gpg: Moved from rox to section for other Rox apps

commit 0af8850032fc170d10508206ca34a29d9bc290db
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "thomas.leonard.gpg: Moved to section level for other Rox apps"
    
    This reverts commit a799a32f8eac2e0d0c14650443060334e92a9f0f.
    
    Conflicts:
    
    	ChangeLog
    
    Accidently committed ndiswrapper change

commit cf0550222d628e13ff732ea42ae8411001db9334
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    openssl 0.9.8g

commit f2427e023723f66692d34295c77e315bbb8c41ce
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdenetwork4-3.94.0

commit 4e273ef630dc3269b54e290a90b550af5ff7412e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    splix-1.0.2

commit 9e3b784d954cb6196162e0fd72b341765f07fed7
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeadmin4-3.94.0

commit 98d6cc737e9db60e455a2c3caddaa0ba7af4a819
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdetoys4-3.94.0

commit 81a3928b9f60c69392fa700489a603e0245dc340
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeutils-3.94.0

commit e17017043eab1ff0a69ce8c8e6d7b319aac29c2b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdemultimedia4-3.94.0

commit 0766736e1e6d3cde09f747869aea21ddbdbcf4fa
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdeedu4-3.94.0

commit b4a44a368ee1bc10291019bcb6c57915b2f34826
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kde4 - section files

commit 6b9ae3263542b7cc4806517ad258da503c0dccc7
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    typo3: version bump and depends fix

commit 778baed24c625dbe1ef683d01e6632392daf7ec4
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    ffmpeg-svn: added swscale option

commit 8bb94b6e5a6f60dd63cc9b30690704c8a0dcf79e
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    rt2500_driver: fixed source dir for cvs builds

commit 832d0175ec00a52ba37d5f711555e4a5d52d3f87
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    directfb: various fixes

commit 85aa02980c0a1debb0077e97d43efca13c743a33
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    putty: added desktopfiles

commit 159952a29fbb25e2cc7a2e317cefe3288c6dfd4b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gramps-2.2.9

commit fbcbee4e4600baa98cbcd2b141202818f6090592
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    firefox 2.0.0.8, SECURITY_PATCH=12
    I can run it only as root, as a normal user I have some problem.
    Only my problem?

commit d60b619b2a8098ff94e7f7aa0a5f66b8be3b50d1
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    gnump3d: version update 3.0

commit fd1ea477b03d31f211820d32b60b5a123e329f1c
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    strigi - update profile script

diff --git a/ChangeLog b/ChangeLog
index 483f5d2..957591b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-19 Treeve Jelbert <treeve at sourcemage.org>
+	* kde/plasma: new spell, may only be temporary
+
 2007-10-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* audio-libs/libmp3splt: added new spell, library to split mp3/ogg files
 
diff --git a/audio-players/bmpx/DETAILS b/audio-players/bmpx/DETAILS
index b0f1bcd..2b2839c 100755
--- a/audio-players/bmpx/DETAILS
+++ b/audio-players/bmpx/DETAILS
@@ -1,10 +1,10 @@
            SPELL=bmpx
-         VERSION=0.40.10
+         VERSION=0.40.13
           BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
           SOURCE=bmpx-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://files.beep-media-player.org/releases/${BRANCH}/${SOURCE}
-     SOURCE_HASH=sha512:9d8738d55100320256324b5961654f0694450254db7845e8b702c3022e5c79dc79f0b8c8cf4e391071f00fd97864c9357f38f47a3ab4411dfbc13afd01271805
+     SOURCE_HASH=sha512:f90f391d14d4c76d81e3f56e9c37bb049c51a0ac607c1bce1ea36aea2a12988ac3afe4966cc48b3ade5642dfc1d070c98417c4576e265440d1c438d13a27cc72
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
         WEB_SITE=http://beep-media-player.org/index.php/BMPx_Homepage
diff --git a/audio-players/bmpx/HISTORY b/audio-players/bmpx/HISTORY
index 45e3465..12e15df 100644
--- a/audio-players/bmpx/HISTORY
+++ b/audio-players/bmpx/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.40.13
+
 2007-10-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.40.10
 
diff --git a/audio-soft/gnump3d/DETAILS b/audio-soft/gnump3d/DETAILS
index 71af1e7..e7dc4ad 100755
--- a/audio-soft/gnump3d/DETAILS
+++ b/audio-soft/gnump3d/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnump3d
-         VERSION=2.9final
+         VERSION=3.0
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
          SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://savannah.gnu.org/download/${SPELL}/${SOURCE}
diff --git a/audio-soft/gnump3d/HISTORY b/audio-soft/gnump3d/HISTORY
index 932558b..d9fdf3c 100644
--- a/audio-soft/gnump3d/HISTORY
+++ b/audio-soft/gnump3d/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: updated spell to 3.0
+
 2007-07-22 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: converted to upstream signature checking
 	* init.d/gnump3d: added
diff --git a/collab/typo3/DEPENDS b/collab/typo3/DEPENDS
index 20ebaa1..f9aed14 100755
--- a/collab/typo3/DEPENDS
+++ b/collab/typo3/DEPENDS
@@ -1,3 +1,3 @@
-depends php4 &&
+depends PHP &&
 
 optional_depends imagemagick '' '' 'for imaging tasks'
diff --git a/collab/typo3/DETAILS b/collab/typo3/DETAILS
index 46a4fff..e582ada 100755
--- a/collab/typo3/DETAILS
+++ b/collab/typo3/DETAILS
@@ -1,17 +1,11 @@
            SPELL=typo3
-         VERSION=3.8.0
-     SOURCE_HASH=sha512:0232b6adc173a84e21c7bd5ee8b7b92e859f3d1c4b6bb0f0641cd7a71b26109a619d3fd0bceb1aeafd60a03533b88b4a71ba67589bada7c0b36e4813af24105c
-    SOURCE2_HASH=sha512:11dfd22feb34b00b45eea2e8fdca065fcf5a2bc2ad5f53740d859dddaba81c58de2f92df07fce0e18acb6b3fd0f9b65b94821415cceceba7502997b22d40a419
-    SOURCE3_HASH=sha512:12d0ba174b5ae92052912e5279fff7bedd1394c7315d02f1aa071eb81005727c7112111c713ae2be4791420595d924b47e456852156030c6b9f0a3a3353d9956
-    SOURCE4_HASH=sha512:cf09645c7d1b1585a6dc5edbab962eac45c621310da9f66366657bd90cd478c91d436a5d96eef6d39662695e3d41da7a591a81af4ebb52f6027d1cb22199b65a
+         VERSION=4.1.2
+     SOURCE_HASH=sha512:7840a17c3341ca1fdf6f1db23aeb6b560dca8b7d4e0f12fe69d118719805d9825ece732cdaf414dca237f66e7de67c425dba34a336490291857ce10ee5745680
+    SOURCE2_HASH=sha512:e6fe4ebcc6faebbe6afc5b70956478ec79773b9dec17996da23a370a751b2cd72c10c9712d0891b767bc2fe88077cf25e3b00dad4578ef4be576f537ba9a92a7
           SOURCE="${SPELL}_src-$VERSION.tar.gz"
          SOURCE2="dummy-$VERSION.tar.gz"
-         SOURCE3="quickstart-$VERSION.tar.gz"
-         SOURCE4="testsite-$VERSION.tar.gz"
    SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE"
   SOURCE2_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE2"
-  SOURCE3_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE3"
-  SOURCE4_URL[0]="$SOURCEFORGE_URL/$SPELL/$SOURCE4"
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="http://$SPELL.org/"
    FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/"
diff --git a/collab/typo3/HISTORY b/collab/typo3/HISTORY
index 17077e0..a486817 100644
--- a/collab/typo3/HISTORY
+++ b/collab/typo3/HISTORY
@@ -1,3 +1,7 @@
+2007-10-19 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 4.1.2
+	* DEPENDS: php4 -> PHP
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 932cfec..435d9dd 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=openssl
-         VERSION=0.9.8f
+         VERSION=0.9.8g
       PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[2]=ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.mirror.ac.uk/sites/ftp.openssl.org/source/$SOURCE
    SOURCE_URL[4]=ftp://sunsite.uio.no/pub/security/openssl/source/$SOURCE
-     SOURCE_HASH=sha512:642dcef556a6f5a62cac779b5bd952b4ac56349c2a395fc4f1b27c244e3e145cb30d4cbc79e8061ef73140921b17caac171280097e5c6122313e545e8db249a8
+     SOURCE_HASH=sha512:d69a5ea4f95f82845fe75fee98c03cebde20f0fd89442bcd886b4a135f9df9ee2853aa8fb7a037d797a8c2a8c110dd7133913088cafe96b77838f0ae8409794f
         WEB_SITE=http://www.openssl.org
          ENTERED=20010922
   SECURITY_PATCH=2
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index b2ac411..9489408 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.9.8g
+
 2007-10-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.9.8f
 	* PRE_BUILD, evp_lib.c.diff: removed patch
diff --git a/crypto/putty/DETAILS b/crypto/putty/DETAILS
index 00016dd..d83253c 100755
--- a/crypto/putty/DETAILS
+++ b/crypto/putty/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
      SOURCE_HASH=sha512:c557b3f7104b0c8c0ae21b278fbe61880cc43288e2ceb3bf1f155b7b9c70cb2063e3b3212e4c43c88a207b0aa9f9aec10763a353513a9302e0fc97be09ca27d0
         WEB_SITE=http://www.chiark.greenend.org.uk/~sgtatham/putty/
          ENTERED=20040721
+      PATCHLEVEL=1
       LICENSE[0]=MIT
         KEYWORDS="telnet ssh crypto"
            SHORT="Telnet and SSH client"
diff --git a/crypto/putty/HISTORY b/crypto/putty/HISTORY
index bb70aa7..e1a0009 100644
--- a/crypto/putty/HISTORY
+++ b/crypto/putty/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Arjan Bouter <abouter at sourcemage.org>
+	* desktop/pterm, desktop/putty: added
+	* DETAILS: patchlevel=1
+
 2007-04-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.60
 
diff --git a/crypto/putty/desktop/pterm.desktop b/crypto/putty/desktop/pterm.desktop
new file mode 100755
index 0000000..455b41c
--- /dev/null
+++ b/crypto/putty/desktop/pterm.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pterm
+Exec=pterm
+Icon=xterm.png
+Terminal=false
+Type=Application
+Categories=Application;XTerminals;
diff --git a/crypto/putty/desktop/putty.desktop b/crypto/putty/desktop/putty.desktop
new file mode 100755
index 0000000..fe22792
--- /dev/null
+++ b/crypto/putty/desktop/putty.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PuTTY
+Exec=putty
+Icon=xterm.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index bd4d513..837cee5 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=phpmyadmin
-         VERSION=2.11.1
-  SECURITY_PATCH=7
-     SOURCE_HASH=sha512:c47f529e0f4de9bdf38633a1fff15c9a0f8f27a2ccd30f93a46a447f7df29f578291787ef3f6199b976c207d148a8495e3584b5a2ce9bf4f932b99c09028303c
+         VERSION=2.11.1.2
+  SECURITY_PATCH=8
+     SOURCE_HASH=sha512:d71392d9cf780d481a34015842430ba0d4294b7b1b8fc40175295af34900fd12123738b71eda245b65ad97f2d3f415042e1a6610eaa87027c5160bba7797e99c
           SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 271bbab..2e90e03 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,8 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.11.1.2, SECURITY_PATCH=8
+	  http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-5
+	  http://www.phpmyadmin.net/home_page/security.php?issue=PMASA-2007-6
+
 2007-09-21 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to version 2.11.1
 
diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index fa9cd72..d12211a 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,11 +1,20 @@
-if  [  -f  /usr/include/linux/fusion.h  ];  then
+if  [[  -f  /usr/include/linux/fusion.h  ]];  then
   OPTS="$OPTS --enable-multi"
 fi  &&
 
-OPTS="--enable-linux-input           \
-      --with-gfxdrivers=$gfxdrivers  \
-      $OPTS"                         &&
+OPTS="--with-inputdrivers=$inputdrivers         \
+      --with-gfxdrivers=$gfxdrivers             \
+      $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO       \
+      $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
+      $OPTS"                                    &&
 
-export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"  &&
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source  "$GRIMOIRE/is_depends_enabled.function"  &&
+
+if is_depends_enabled $SPELL libmpeg3; then
+     export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"
+fi &&
 
 default_build
diff --git a/display/directfb/CONFIGURE b/display/directfb/CONFIGURE
index fe88b36..383d476 100755
--- a/display/directfb/CONFIGURE
+++ b/display/directfb/CONFIGURE
@@ -12,12 +12,15 @@ make_gfxdrivers_checklist()  {
   add_status  `cat  $SCRIPT_DIRECTORY/gfxdrivers`
 }
 
+make_inputdrivers_checklist()  {
+  add_status  `cat  $SCRIPT_DIRECTORY/inputdrivers`
+}
 
-get_gfx()  {
 
+get_gfx()  {
   BACKTITLE="DirectFB GFXDRIVER Configuration"
       TITLE="Chipset Manufacturer selection"
-       HELP="Choose the chiipset your card uses, don't bother with any others if you don't have the 
+       HELP="Choose the chipset your card uses, don't bother with any others if you don't have the 
 hardware. If none are selected then all will be installed."
 
   dialog  --backtitle  "$BACKTITLE"  \
@@ -30,8 +33,22 @@ hardware. If none are selected then all will be installed."
 
 }
 
+get_input()  {
+  BACKTITLE="DirectFB INPUTDRIVER Configuration"
+      TITLE="Input device selection"
+       HELP="Choose the input devices your box uses, don't bother with any others. If none are selected then all will be installed."
+  dialog  --backtitle  "$BACKTITLE"  \
+          --title      "$TITLE"      \
+          --stdout                   \
+          --separate-output          \
+          --checklist  "$HELP"       \
+          0 0 0                      \
+         `make_inputdrivers_checklist`
+
+}
+
 if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then 
-  if query "select gfxdrivers to compile ?" n 
+  if query "select gfxdrivers to compile?" n 
   then 
   gfxdrivers=all
   OLD_IFS=$IFS
@@ -42,4 +59,52 @@ if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then
   export  IFS=$OLD_IFS
   else echo gfxdrivers=all  >> $SPELL_CONFIG
   fi
-fi
+fi &&
+
+if ! grep -q "inputdrivers" $SPELL_CONFIG ;then 
+  if query "select inputdrivers to compile?" n 
+  then 
+  inputdrivers=all
+  OLD_IFS=$IFS
+  export  IFS="	
+"
+  inputdrivers=`get_input | tr '\n' ','`
+  echo "inputdrivers=$inputdrivers" >> $SPELL_CONFIG
+  export  IFS=$OLD_IFS
+  else echo inputdrivers=all  >> $SPELL_CONFIG
+  fi
+fi &&
+
+config_query_option DFB_DEBUG 'Compile in debug support? (This will slow DFB down a lot)' \
+                              'n' \
+                              '--enable-debug --enable-debug-support' \
+                              '--disable-debug --disable-debug-support' &&
+
+config_query_option DFB_NETWORK 'Compile in networking support?' 'y' \
+                                '--enable-network' \
+                                '--disable-network' &&
+
+config_query_option DFB_VOODOO 'Compile in Voodoo support? (networking)' \
+                                'n'                 \
+                                '--enable-voodoo'   \
+                                '--disable-voodoo'  &&
+
+config_query_option DFB_UNIQUE 'Compile in Unique? (Window management module)' \
+                                'n'                \
+                                '--enable-unique'  \
+                                '--disable-unique' &&
+
+config_query_option DFB_V4L 'Enable the v4l video provider?' \
+                                'y'                     \
+                                '--enable-video4linux'  \
+                                '--disable-video4linux' &&
+
+config_query_option DFB_V4L2 'Enable the v4l2 support?'  \
+                                'n'                      \
+                                '--enable-video4linux2'  \
+                                '--disable-video4linux2' &&
+
+config_query_option DFB_TESTS 'Build test programs?'    \
+                                'n'                     \
+                                '--with-tests'          \
+                                '--with-tests'
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index 68acaf2..ffce9bb 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -28,8 +28,8 @@ optional_depends  zlib                    \
 
 optional_depends  sdl                       \
                   '--enable-sdl'            \
-                  '--enable-sdl=no'         \
-                  'build with SDL support'  &&
+                  '--disable-sdl'           \
+                  'build with SDL support (Experimental, intended for DFB devs)'  &&
 
 optional_depends  X11-SERVER         \
                   '--enable-x11'     \
@@ -54,4 +54,9 @@ optional_depends  gpm                                  \
 optional_depends  sysfsutils                      \
                   '--enable-sysfs'                \
                   '--disable-sysfs'               \
-                  'for Linux 2.6+ SysFS support'
+                  'for Linux 2.6+ SysFS support'  &&
+
+optional_depends  libvncserver                    \
+                  '--enable-vnc'                  \
+                  '--disable-vnc'                 \
+                  'for vnc support'
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index 1a95650..94a44d9 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,11 @@
+2007-09-23 Arjan Bouter <abouter at sourcemage.org>
+	* CONFIGURE: fixed typo
+	* DEPENDS: added warning for SDL, added libvncserver
+	* CONFIGURE: added queries for debugging, networking,
+          tests, v4l, inputdrivers and unique
+	* inputdrivers: added
+	* BUILD: added DFB_x options to OPTS
+
 2006-10-03 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 1.0.0-rc1
 	  updated download url to match website
diff --git a/display/directfb/inputdrivers b/display/directfb/inputdrivers
new file mode 100644
index 0000000..79b7ec2
--- /dev/null
+++ b/display/directfb/inputdrivers
@@ -0,0 +1,16 @@
+dbox2remote		Dreambox2 remote
+dreamboxremote		Dreambox remote
+dynapro		?
+elo-input		?
+gunze		?
+h3600_ts		?
+joystick		Joystick
+keyboard		Keyboard
+linuxinput		Linux input
+lirc		Lirc infra-red
+mutouch		Mutouch touch-screen
+penmount	?
+ps2mouse		PS/2 mouse
+serialmouse		Serial mouse
+sonypijogdial		Sony jog dial
+wm97xx		WM97xx touch-screen
diff --git a/editors/tea/DETAILS b/editors/tea/DETAILS
index ff53301..53bd14a 100755
--- a/editors/tea/DETAILS
+++ b/editors/tea/DETAILS
@@ -1,9 +1,9 @@
            SPELL=tea
-         VERSION=17.3.3
+         VERSION=17.3.5
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_URL=$SOURCEFORGE_URL/tea-editor/$SOURCE
-     SOURCE_HASH=sha512:4c7482396825751a2ca17b4dd65d163b0359dbc5df6b3f5098a5e6cf79c28ea1234c9d6495808f9f3b49e1e63a9555b2c7d47fb0649f0d046334e182b1ef7f6c
+     SOURCE_HASH=sha512:ac823572c9f3b54b1459cb350969ea9c1ff33f53f8f7623e1aa92f1284f973212d0db989c51044cc73a770a4a1484050c980a8a10192157ec101c97a9bb2cce9
         WEB_SITE=http://tea-editor.sourceforge.net/
          ENTERED=20070302
       LICENSE[0]=GPL
diff --git a/editors/tea/HISTORY b/editors/tea/HISTORY
index 8e8487b..b1286d6 100644
--- a/editors/tea/HISTORY
+++ b/editors/tea/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 17.3.5
+
 2007-10-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 17.3.3
 
diff --git a/ftp/rtorrent/DEPENDS b/ftp/rtorrent/DEPENDS
index 9f522c1..27958b6 100755
--- a/ftp/rtorrent/DEPENDS
+++ b/ftp/rtorrent/DEPENDS
@@ -4,4 +4,9 @@ if [[ ${DHT_PATCH} != n ]]; then
 else
   depends libtorrent 
 fi &&
-depends curl 
+depends curl                             &&
+optional_depends  xmlrpc-c               \
+                  "--with-xmlrpc-c"      \
+                  "--without-xmlrpc-c"   \
+                  "for XMLRPC interface" 
+
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index c3d5f2e..69045ac 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,6 +1,9 @@
+2007-10-20 Mathieu Lonjaret <lejatorn at sourcemage.org>
+	* DEPENDS: added optional xmlrpc-c
+
 2007-10-03 Mathieu Lonjaret <lejatorn at sourcemage.org>
-        * CONFIGURE: dht patch defaults to no
-        * DEPENDS: automake-1.9 if dht patch
+	* CONFIGURE: dht patch defaults to no
+	* DEPENDS: automake-1.9 if dht patch
 
 2007-10-03 Mathieu Lonjaret <lejatorn at sourcemage.org>
 	* DEPENDS, CONFIGURE, PRE_BUILD, dht.diff: added support for dht
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 171c210..25c81bd 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gramps
-         VERSION=2.2.8
-     SOURCE_HASH=sha512:8afe2a54d8f0a16bb8ef8357c5723d3ec9cae1edbc3bb12267b50285b501e3dec6f45a77b52337bfc7b060bbc12bc4eabc643fbb1026645bf5c2966093cc5273
+         VERSION=2.2.9
+     SOURCE_HASH=sha512:f383cdb1a04d55d81c48e9373d79d4cce66a3085f9ea4daff4c3a3fe254f90e3742512ce9e6381a7df56090bb5237d804a47a25be55320e85c23f52b50b900aa
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 418e3d8..c81189f 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS:  version 2.2.9
+
 2007-09-22 Robin Cook <rcook at wyrms.net>
         * DEPENDS: changed scrollkeeper to rarian
 
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index 325457f..1de328e 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
   SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
   SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
          SOURCE3=gnat-4.1.1-i386-pc-linux-gnu.tar.bz2
-     SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_HASH
+     SOURCE3_GPG=gurus.gpg:$SOURCE3.sig:UPSTREAM_KEY
   SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
 
 #upstream signatures
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index 0e2eea5..dc0e83e 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -2,6 +2,12 @@
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 4.2.2
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-19 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0; fixed the gnat verification
+
 2007-02-14 Treeve Jelbert <treeve at oi.be>
 	* DETAILS: version 4.1.2
 	  convert to upstream signatures
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index f555e4b..0fbc3df 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -2,6 +2,12 @@
 	* DETAILS: updated spell to 4.2.2
 	  fixed WEB_SITE
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0
+
 2007-02-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* CONFLICTS: removed, deprecation complete
 
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index daf5838..3e637ff 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -2,6 +2,12 @@
 	* DETAILS: updated spell to 4.2.2
 	  fixed WEB_SITE
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0
+
 2007-03-01 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: -ffast-math also breaks with pentium-m
 
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index a418c2b..07933d6 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040420
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index aeb22c3..4959b51 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -2,6 +2,12 @@
 	* DETAILS: updated spell to 4.2.2
 	  fixed WEB_SITE
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0
+
 2007-03-01 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: -ffast-math also breaks with pentium-m
 
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index f025ea2..f4f2486 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -7,4 +7,6 @@ fi                                                                  &&
 if  [[  $VERSION != $(installed_version gcc) ]]; then
   force_depends  gcc
 fi &&
-depends smgl-archspecs
+depends smgl-archspecs &&
+depends unzip &&
+depends zip
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index e0d28e8..bca31d4 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,6 +1,15 @@
 2007-10-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 4.2.2
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-22 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: added zip and unzip for fastjar
+
+2007-05-19 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0
+
 2007-02-14 Treeve Jelbert <treeve at oi.be>
 	* DETAILS: version 4.1.2
 	  convert to upstream signatures
diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY
index 7a50d22..8809564 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -2,6 +2,12 @@
 	* DETAILS: updated spell to 4.2.2
 	  fixed WEB_SITE
 
+2007-08-15 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DETAILS: updated to 4.2.1
+
+2007-05-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 4.2.0
+
 2007-02-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.2
 	  convert to upstream signatures
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d767530..953096d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if  [  "$FIREFOX_CVS"  ==  "y"  ];  then
    SOURCE_URL[0]=cvs://:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
    SOURCE_IGNORE=volatile
 else
-         VERSION=2.0.0.7
+         VERSION=2.0.0.8
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=${SOURCE}.asc
       SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,7 @@ else
    SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL}.asc
-  SECURITY_PATCH=11
+  SECURITY_PATCH=12
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
         WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 6c07798..7245c4d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.0.8, SECURITY_PATCH=12
+	  http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.8
+	* firefox-config.patch: updated to 2.0.0.8
+
 2007-09-24 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to used UPSTREAM_KEY again
 	* firefox.gpg: Added new upstream key
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
index 6a3f0dd..4e7b316 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
        exit 0
        ;;
      --cflags)
--      if test "/usr/local/include/firefox-2.0.0.7" != /usr/include ; then
--        includes="-I/usr/local/include/firefox-2.0.0.7"
+-      if test "/usr/local/include/firefox-2.0.0.8" != /usr/include ; then
+-        includes="-I/usr/local/include/firefox-2.0.0.8"
 +      if test "/usr/include/firefox" != /usr/include ; then
 +        includes="-I/usr/include/firefox"
        fi
@@ -25,14 +25,14 @@
  if test "$echo_cflags" = "yes"; then
      nspr_cflags="-I/usr/include/nspr"
      for n in $echo_components; do
--	component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.7/$n"
+-	component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.8/$n"
 +	component_includes="$component_includes -I/usr/include/firefox/$n"
      done
      echo $component_includes $includes $nspr_cflags
  fi
  
  if test "$echo_idlflags" = "yes"; then
--    echo "-I/usr/local/share/idl/firefox-2.0.0.7"
+-    echo "-I/usr/local/share/idl/firefox-2.0.0.8"
 +    echo "-I/usr/share/idl/firefox"
  fi
  
@@ -41,6 +41,6 @@
  	    ;;
          esac
      done
--    echo -L/usr/local/lib/firefox-2.0.0.7 $libs
+-    echo -L/usr/local/lib/firefox-2.0.0.8 $libs
 +    echo -L/usr/lib $libs
  fi
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 900f37a..00ca672 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -9,8 +9,6 @@ PATH=$KDE4DIR/bin:$PATH                         &&
 LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH   &&
 QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins        &&
 
-XDG_DATA_DIRS=$KDE4DIR/share                    &&
-
 cd $SOURCE_DIRECTORY                            &&
 mkdir -p build                                  &&
 cd build                                        &&
@@ -32,8 +30,24 @@ PATH=$KDE4DIR/bin:$PATH                         &&
 LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH   &&
 QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins        &&
 
-XDG_DATA_DIRS=$KDE4DIR/share                    &&
-
 cd $SOURCE_DIRECTORY/build                      &&
 make install
 }
+
+
+# we need a default_final, default_post_remove
+# so that the mime and desktop databases get updated
+
+update_databases() {
+update-mime-database /opt/share/mime/
+update-desktop-database /opt/share/desktop-directories
+}
+
+default_final() {
+update_databases
+}
+
+
+default_post_remove() {
+update_databases
+}
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 025e4ef..949bbf1 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,8 @@
+2007-10-19 Treeve Jelbert <treeve at sourcemage.org>
+	* default_final, default_post_remove: added
+	  don't set XDG_DATA_DIRS, this is now done by strigi
+	* KDE_DEPENDS: add depends desktop-file-utils
+
 2007-09-25 Treeve Jelbert <treeve at sourcemage.org>
 	* KDE_DEPENDS: remove soprano, pcre, FAM from kdelibs4
 	  everything depends on kdelibs4 and optional kdebase-workspace4
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 3568c7f..99efe08 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -9,6 +9,7 @@ case $SPELL in
                 depends  libsm         &&
                 depends  libxext
               fi                       &&
+              depends desktop-file-utils  &&
               depends dbus             &&
               depends hal              &&
               depends pkgconfig        &&
diff --git a/kde4/kdeadmin4/DETAILS b/kde4/kdeadmin4/DETAILS
index 1b1fde3..4f7decd 100755
--- a/kde4/kdeadmin4/DETAILS
+++ b/kde4/kdeadmin4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdeadmin4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:d9abc5d023e8877e2c7411c6cee299ae186a8c4da58317c07eb5d90faab3d83ba68860cdca358764bbe7ac9f834705005b8880949b908efb12659a2022eb92fe
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:e81d544e56cb91201165900782bd48d1fdfde2305a765d0364c4dec36a2b5fb3cebb204fe293ba868f4c3512c3509c6d0c32471c54e68447d55e73af91973464
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeadmin4/HISTORY b/kde4/kdeadmin4/HISTORY
index 4bcd00a..fce710e 100644
--- a/kde4/kdeadmin4/HISTORY
+++ b/kde4/kdeadmin4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.93.0
 	* DEPENDS: remove old code
diff --git a/kde4/kdeedu4/DETAILS b/kde4/kdeedu4/DETAILS
index 9dfce9e..c615b73 100755
--- a/kde4/kdeedu4/DETAILS
+++ b/kde4/kdeedu4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdeedu4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:b7d17deb0d69bce0477d327f0e3112933671964232e1d96200e658cf1a86456f6e1ef2739835dcd00c83db09ab985d18154d4a0918a1d9c0370e2a9909510337
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:1b6e20dda0fac4d79b27f198206cdfe1634eaca7aa971e0fb749e6d6bff78cc258a3f02014bf7da9b856ec305319bbf7a01047cd22d8ed41686c634f13f264c1
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index c4f7983..b30934c 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.93.0
 	* DEPENDS: add facile, for Kalzium (linear algebra support)
diff --git a/kde4/kdemultimedia4/DETAILS b/kde4/kdemultimedia4/DETAILS
index adc64e6..baa5e59 100755
--- a/kde4/kdemultimedia4/DETAILS
+++ b/kde4/kdemultimedia4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdemultimedia4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:c9ffe775f97ce3eb5b7a5348409ffec6f9d752735591d9a406801c3be058c2ef92b9fbf094b2a325255e3188597fef049ec74c7f69ac0dde8c731b9d94de2384
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:068db2fa84e46195934c881a04b65c2f120c01d966dc4ab644c0baac45253c7363ab359377652645e92c21bb9f945bff56fc8010b77e7d03c6dbb939753de4f0
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index fafead7..bea668e 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.93.0
 	* DEPENDS: remove explicit kdebase4
diff --git a/kde4/kdenetwork4/DETAILS b/kde4/kdenetwork4/DETAILS
index b5e85ca..5a57533 100755
--- a/kde4/kdenetwork4/DETAILS
+++ b/kde4/kdenetwork4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdenetwork4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:9f2a0e6486e5f85ffc1435ecc29bcbeefb6ac6bbd31052de165ed32a7e7bc55c5bff0ecdd9fbb90bdd3ab4eb50ec6593decbf43b0783258529fb9755e4b969f3
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:4f59adb626c1059465066eb542f05c3ed5fb20b9bd5e8e0c3818dc4a7fa677ca21eaf3fa6c26e2f54363799126a35b4041af1738e8fa102e9532348a5f7ca84a
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index edffffb..751f156 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: tidy up
 
diff --git a/kde4/kdetoys4/DETAILS b/kde4/kdetoys4/DETAILS
index 0e52439..ba48fd9 100755
--- a/kde4/kdetoys4/DETAILS
+++ b/kde4/kdetoys4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdetoys4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:aa903b7d79f3f7da317267bdfb54eede8aece85d87a65abcb179d700f2aba75e0b5ee05bb5b763ea0974714dfca0a25992d2553fb740fa14c87db8a738a8dbe1
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:3251442c203237b4133b47ed730f47efdd213b785b6be4df694efcb940f6390bf1391a139775455b093f40b712ac6880c6c91f6383ab4190bb3d0209fb1dbf19
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdetoys4/HISTORY b/kde4/kdetoys4/HISTORY
index 64d1030..64156dc 100644
--- a/kde4/kdetoys4/HISTORY
+++ b/kde4/kdetoys4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.93.0
 	* DEPENDS: remove explict kdebase4
diff --git a/kde4/kdeutils4/DETAILS b/kde4/kdeutils4/DETAILS
index c7cf277..0473eee 100755
--- a/kde4/kdeutils4/DETAILS
+++ b/kde4/kdeutils4/DETAILS
@@ -1,7 +1,7 @@
           SPELL=kdeutils4
         SPELLX=${SPELL//4}
-         VERSION=3.93.0
-     SOURCE_HASH=sha512:eea1cb95042be8adcef5db354965a37f6d4e8c63a2f3b0f4f83ba43e88ddc9313afeb41c5550dd9a1339b7f03c2d43d6a954d2ace9b998dd5d1051c4317cb23d
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:2f6b8020eceb3122bd9751a11f7a083344dd9e3f42bf1baceface2034c18906ee74b258a08a0f8193ca64223ab6eea974a0ac75a587bb06702842600e2b7ddf3
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index 1ca6aeb..88fd865 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+
 2007-09-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.93.0
 
diff --git a/kde4/plasma/CONFIGURE b/kde4/plasma/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/plasma/CONFIGURE
@@ -0,0 +1 @@
+source  $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/plasma/DEPENDS b/kde4/plasma/DEPENDS
new file mode 100755
index 0000000..ffedbe9
--- /dev/null
+++ b/kde4/plasma/DEPENDS
@@ -0,0 +1,10 @@
+source  $SECTION_DIRECTORY/KDE_DEPENDS  
+
+#optional_depends  ppp       '' ''  'for dialup support'                 &&
+#optional_depends  openslp    '' '' 'to find available remote desktops'  &&
+#optional_depends  wireless_tools '' '' 'Wireless support'               &&
+#optional_depends  libidn     '' '' 'International Domain Name Support'  &&
+#optional_depends  decibel    '' '' 'Decibel support'                    &&
+#optional_depends  qca2       '' '' 'needed to build kopete'
+# libdnssd: libvncserver  jpeg?
+# 
diff --git a/kde4/plasma/DETAILS b/kde4/plasma/DETAILS
new file mode 100755
index 0000000..4b65e78
--- /dev/null
+++ b/kde4/plasma/DETAILS
@@ -0,0 +1,14 @@
+          SPELL=plasma
+         SPELLX=extragear-plasma
+         VERSION=3.94.0
+     SOURCE_HASH=sha512:884016af5c0ef9db2ff663f55dee66e93b1cdc49b9b85d32a6aa95e64906ccd521205001ad891720a06e0680349da458f2c00ba3645b51e93e6aa93ee8cfe687
+          SOURCE=$SPELLX-$VERSION.tar.bz2 
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+   SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0}/src/$SOURCE
+        WEB_SITE=http://www.kde.org
+         ENTERED=20071019
+#  SECURITY_PATCH=1
+      LICENSE[0]=GPL
+        KEYWORDS="kde"
+           SHORT="" cat << EOF 
+EOF
diff --git a/kde4/plasma/HISTORY b/kde4/plasma/HISTORY
new file mode 100644
index 0000000..530a5ca
--- /dev/null
+++ b/kde4/plasma/HISTORY
@@ -0,0 +1,3 @@
+2007-10-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.94.0
+	  spell created
diff --git a/kernels/ndiswrapper/DETAILS b/kernels/ndiswrapper/DETAILS
index d6e26bd..32a0397 100755
--- a/kernels/ndiswrapper/DETAILS
+++ b/kernels/ndiswrapper/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ndiswrapper
-         VERSION=1.41
+         VERSION=1.48
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/rt2500_driver/HISTORY b/kernels/rt2500_driver/HISTORY
index d6c4de7..e187e6e 100644
--- a/kernels/rt2500_driver/HISTORY
+++ b/kernels/rt2500_driver/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Arjan Bouter <abouter at sourcemage.org>
+	* INSTALL: fixed source dir when installing cvs version
+
 2006-08-31 Anton Brondz <dinolinux at sourcemage.org>
 	* DETAILS: updated sourceforge CVS location, updated to 1.1.0-b4, removed UPDATED
 	* BUILD: fixed broken CVS install
diff --git a/kernels/rt2500_driver/INSTALL b/kernels/rt2500_driver/INSTALL
index c8f9722..f43744b 100755
--- a/kernels/rt2500_driver/INSTALL
+++ b/kernels/rt2500_driver/INSTALL
@@ -1,2 +1,6 @@
-cd ${SOURCE_DIRECTORY}/Module &&
+if  [  "$RT_CVS"  ==  "n"  ]; then
+    cd ${SOURCE_DIRECTORY}/Module
+else
+    cd ${SOURCE_DIRECTORY}/rt2500/Module
+fi &&
 make KERNDIR=/lib/modules/$(get_kernel_version)/build install
diff --git a/printer/splix/DETAILS b/printer/splix/DETAILS
index fcb3722..d86668a 100755
--- a/printer/splix/DETAILS
+++ b/printer/splix/DETAILS
@@ -1,6 +1,6 @@
            SPELL=splix
-         VERSION=1.0.1-1
-     SOURCE_HASH=sha512:fc58aa8c47b3266b73e87e87e64db54347a6598f701da50ef411e0d68014faa6fa2e1fff69b7f5b6401adabd58ad011e9ba702fac06f822dd3d7abaef63a37f2
+         VERSION=1.0.2
+     SOURCE_HASH=sha512:99dbba1743ef3ca808a478d6f75847d2209bf265f1f350c06437134212ee0b731b362b8a974c905fe03de822494ef2635fa2018f0fdcb41a08eefc911eb79a3e
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/printer/splix/HISTORY b/printer/splix/HISTORY
index 1fda2be..39789fe 100644
--- a/printer/splix/HISTORY
+++ b/printer/splix/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.2
+
 2007-02-13 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.1-1
 	* DEPENDS: add cupsddk, to translate ppd files
diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index fd001e5..530a0a6 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,6 +1,5 @@
            SPELL=strigi
 #          KDEVER=3.92.0
-        WEB_SITE=http://www.vandenoever.info/software/strigi/
 if [[ "$STRIGI_SVN" == "y" ]]; then
 if [[ "$STRIGI_SVN_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
@@ -20,9 +19,10 @@ else
    SOURCE_URL[0]=$WEB_SITE/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
+        WEB_SITE=http://strigi.sourceforge.net/
       LICENSE[0]=LGPL
          ENTERED=20070309
-      PATCHLEVEL=1
+      PATCHLEVEL=2
         KEYWORDS="search engine"
            SHORT="desktop search engine"
 cat << EOF
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 7a0a0ae..2b461a3 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,8 @@
+2007-10-19 Treeve Jelbert <treeve at sourcemage.org>
+	* strigi.sh: add /opt/share to XDG_DATA_DIRS, for use by kde4
+	* DETAILS: PATCHLEVEL++
+	  new WEB_SITE
+
 2007-09-12 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* PPREPARE: ask the autoupdate query only if svn was chosen
 
diff --git a/utils/strigi/strigi.sh b/utils/strigi/strigi.sh
index 6e3c824..b5da9d4 100755
--- a/utils/strigi/strigi.sh
+++ b/utils/strigi/strigi.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 #set environment for using strigi
-export XDG_DATA_DIRS=/usr/share
+export XDG_DATA_DIRS=/usr/share:/opt/share
diff --git a/utils/virtualbox-module/DETAILS b/utils/virtualbox-module/DETAILS
index 9c4b0ea..e8f024f 100755
--- a/utils/virtualbox-module/DETAILS
+++ b/utils/virtualbox-module/DETAILS
@@ -1,9 +1,9 @@
            SPELL=virtualbox-module
-         VERSION=1.5.0
+         VERSION=1.5.2
           SOURCE=vbox-kernel-module-src-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
    SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:57c441b359ecce5ac9b506118c163c06c4762a8b035386465a02f54c5dc5af289f4703d363599c24747d83e6c1101635366c30bbed3d1fdb18df0ff8aba929cd
+     SOURCE_HASH=sha512:e98553aed0c7f24ffa761b43a2d63cdac1386c258d0ad32c1ad226207b141e48267898bbb3ac186ce08f2016705b58065a8b2c2ec006481769665d4e37d5263d
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070613
diff --git a/utils/virtualbox-module/HISTORY b/utils/virtualbox-module/HISTORY
index 8f2086c..884d2fb 100644
--- a/utils/virtualbox-module/HISTORY
+++ b/utils/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.5.2
+
 2007-09-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.5.0
 
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 47e4f57..0ab35ce 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,9 +1,9 @@
            SPELL=virtualbox
-         VERSION=1.5.0
+         VERSION=1.5.2
           SOURCE=VirtualBox-${VERSION}_OSE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION}_OSE
    SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:1d5b0eb9cdc005619f87bd506ca49351650793d3a5ec3676fc9f3563852c558985b3d144f6a388d75364b96c1ae109421c3a4afaf1b476dc1bc43b05e3089130
+     SOURCE_HASH=sha512:eafce674f0eb0ed59a964388b2dff8be240e85c15c47b649a6e7e9ed072ec66a1970e1b7f095be4ca39ec1e83da36b6dc42e1ab4c2eef129e453e9e864589300
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 796ab48..4f61f2b 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2007-10-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.5.2
+
 2007-09-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.5.0, updated SOURCE and SOURCE_DIRECTORY
 	* PRE_BUILD: updated
diff --git a/utils/watchdog/DETAILS b/utils/watchdog/DETAILS
index 686d535..66bdee9 100755
--- a/utils/watchdog/DETAILS
+++ b/utils/watchdog/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=GPL
         WEB_SITE=http://www.gnu.org/directory/System_administration/monitor/watchdog.html
          ENTERED=20030731
-         UPDATED=20030822
+      PATCHLEVEL=1
         KEYWORDS="utils"
            SHORT="A software watchdog daemon"
 cat << EOF
diff --git a/utils/watchdog/HISTORY b/utils/watchdog/HISTORY
index 38b3272..d5a4ca5 100644
--- a/utils/watchdog/HISTORY
+++ b/utils/watchdog/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: removed UPDATED, PATCHLEVEL++
+	* watchdog-gcc3.patch: updated so it builds with gcc 4.x
+
 2006-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/utils/watchdog/watchdog-gcc3.patch b/utils/watchdog/watchdog-gcc3.patch
index aec2700..aff7b52 100644
--- a/utils/watchdog/watchdog-gcc3.patch
+++ b/utils/watchdog/watchdog-gcc3.patch
@@ -13,7 +13,7 @@ diff -Nur watchdog-5.2-orig/include/sundries.h watchdog-5.2/include/sundries.h
 diff -Nur watchdog-5.2-orig/src/quotactl.c watchdog-5.2/src/quotactl.c
 --- watchdog-5.2-orig/src/quotactl.c	1999-09-09 11:03:06.000000000 +0200
 +++ watchdog-5.2/src/quotactl.c	2003-07-31 01:40:26.000000000 +0200
-@@ -34,6 +34,7 @@
+@@ -34,9 +34,10 @@
  	return syscall(__NR_quotactl, cmd, special, id, addr);
  }
  #else
@@ -21,3 +21,7 @@ diff -Nur watchdog-5.2-orig/src/quotactl.c watchdog-5.2/src/quotactl.c
  #include <sys/types.h>
  #define __LIBRARY__
  #include <linux/unistd.h>
+ 
+-_syscall4(int, quotactl, int, cmd, const char *, special, int, id, caddr_t, addr);
++_syscall4(int quotactl, int cmd, const char * special, int id, caddr_t addr);
+ #endif
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index 5f5ff83..e95970a 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -2,7 +2,7 @@ CFLAGS="${CFLAGS/-funroll-loops/} -O3"
 disable_pic  &&
 
 if [ $FFAMR != none ];then
-  OPTS="--enable-$FFAMR $OPTS"
+  OPTS="--enable-lib$FFAMR $FFMPEG_SWSCALE $OPTS"
 fi  &&
 
 ./configure  --prefix=${INSTALL_ROOT}/usr            \
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index e469bef..dd4bf0e 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -32,6 +32,7 @@ esac
         WEB_SITE=http://ffmpeg.sourceforge.net
          ENTERED=20030514
       LICENSE[0]=GPL
+      PATCHLEVEL=1
   STAGED_INSTALL=off
         KEYWORDS="video"
            SHORT="ffmpeg is complete video and audio broadcasting solution"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index e4de220..5bd5c78 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,8 @@
+2007-09-02 Arjan Bouter <abouter at sourcemage.org>
+	* CONFIGURE: added a question for libswscale
+	* BUILD: added swscale option to OPTS
+	* DETAILS: patchlevel++
+
 2007-08-30 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS: sync options with normal ffmpeg spell
 	  forgot to recheck some stuff
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
index 7a16e1a..f5c13e0 100755
--- a/video/ffmpeg-svn/PREPARE
+++ b/video/ffmpeg-svn/PREPARE
@@ -1,3 +1,3 @@
 persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
 config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?" ${DEFAULT:-n}
-config_query_list FFAMR "which AMR codec?" none amr_nb amr_nb-fixed amr_wb
+config_query_list FFAMR "which AMR codec?" none amr-nb amr-nb-fixed amr-wb
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 133962c..65ff957 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -8,15 +8,15 @@ cd libavcodec       &&
 case $FFAMR in
     none);;
     *)
-message amr_nb=$VERSION2         &&
+message amr-nb=$VERSION2         &&
       unpack_file 2              &&
       unzip ${VERSION2}*.zip     &&
       mv c-code amr_float        &&
-message amr_nb-fixed=$VERSION3   &&
-      unpack_file 3              &&
-      unzip ${VERSION3}*.zip     &&
-      mv c-code amr              &&
-message amr_wb=$VERSION4         &&
+#message amr-nb-fixed=$VERSION3   &&
+#      unpack_file 3              &&
+#      unzip ${VERSION3}*.zip     &&
+#      mv c-code amr              &&
+message amr-wb=$VERSION4         &&
       unpack_file 4              &&
       unzip ${VERSION4}*.zip     &&
       mv c-code amrwb_float



More information about the SM-Commit mailing list