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

author: Mathieu Lonjaret 2008-08-21 18:30:43 +0200
committer: Mathieu Lonjaret 2008-08-21 18:30:43 +0200
commit: 33a1664d315396fc5cdb84cf6c3701a158dcfa81 (patch)
tree: e8eb30104426d9aeda96e8ce2531049814ad8b9a
parent: ade347f678b73b82270e2508abe968eee0b795e4 (diff)
parent: 80576b8d3238bbfa16d7acaf6b4594f37e14730a (diff)
135 files changed, 505 insertions, 2159 deletions
diff --git a/ChangeLog b/ChangeLog
index c29b36d57f..f73f6321ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* FUNCTIONS: added default_grimoire_post_install which takes care of
+	  moving bad paths into the proper place (currently man and info)
+
+2008-08-21 Ladislav Hagara <hgr@vabo.cz>
+	* video/luvcview: new spell, Sdl video Usb Video Class grabber
+
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* http/ijb-waldoff: spell deprecated, use privoxy instead
+	* http/ijb: spell deprecated, use privoxy instead
+
 2008-08-19 Vlad Glagolev <stealth@sourcemage.org>
 	* gnu.gpg: added key 624ACAD5 (Carlo Wood, Run on IRC <carlo@alinoe.com>)
 
diff --git a/FUNCTIONS b/FUNCTIONS
index f854259a4a..7e3ae66a97 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -3,6 +3,31 @@
 . $GRIMOIRE/config_query_multi.function
 
 #---------------------------------------------------------------------
+## This function automatically fixes any known bad paths
+#---------------------------------------------------------------------
+function default_grimoire_post_install () {
+  real_default_sorcery_post_install && # currently a no-op
+  pushd TRANSL &> /dev/null
+  if [[ -d usr/man ]]; then
+    echo Fixing bad install path: /usr/man &&
+    mv -v usr/man usr/share
+  fi &&
+  if [[ -d usr/info ]]; then
+    echo Fixing bad install path: /usr/info &&
+    mv -v usr/info usr/share
+  fi &&
+  if [[ -d usr/local/man ]]; then
+    echo Fixing bad install path: /usr/local/man &&
+    mv -v usr/local/man usr/share
+  fi &&
+  if [[ -d usr/local/info ]]; then
+    echo Fixing bad install path: /usr/local/info &&
+    mv -v usr/local/info usr/share
+  fi &&
+  popd &> /dev/null
+}
+
+#---------------------------------------------------------------------
 ## Replaces sorcerys default_pre_build with a custom version using
 ## the invoke_gcc function from libgcc #10641
 #---------------------------------------------------------------------
diff --git a/audio-players/digitaldj/DETAILS b/audio-players/digitaldj/DETAILS
index 3eaaead53b..4c20f6a392 100755
--- a/audio-players/digitaldj/DETAILS
+++ b/audio-players/digitaldj/DETAILS
@@ -1,9 +1,9 @@
            SPELL=digitaldj
-         VERSION=0.7.2
+         VERSION=0.7.5
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-   SOURCE_URL[0]=http://www.nostatic.org/ddj/${SOURCE}
-     SOURCE_HASH=sha512:cd371b8b7a88e47d4272a078c88bc48c8b7eb522a6f3fe7c593da5ca26180ac66cf2ed91f8a3d30f5207256e14aabf7bd7086c0f7d1e5f57c7b261b4bdc284b6
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/ddj/${SOURCE}
+     SOURCE_HASH=sha512:70dcc5e9dabdfc63c173423109a2eab8cf0a9010ff2413c0fab1165f92e1c6115cd38b4208ae6f5354c5364f041393a94c249cab152c4b7252418c858ed607eb
         WEB_SITE=http://www.nostatic.org/ddj/
          ENTERED=20020803
       LICENSE[0]=GPL
diff --git a/audio-players/digitaldj/HISTORY b/audio-players/digitaldj/HISTORY
index 195f416e87..ca28915db8 100644
--- a/audio-players/digitaldj/HISTORY
+++ b/audio-players/digitaldj/HISTORY
@@ -1,3 +1,8 @@
+2008-08-21 Robert Figura <template@sourcemage.org>
+	* DETAILS: version -> 0.7.5
+	* DETAILS: updated SOURCE_URL[0]
+	* PRE_BUILD: fix to sedit s/CLK_TCK/CLOCKS_PER_SEC/g (bug 12235)
+
 2008-04-17 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS: removing MPG123 provider, plain depend on mpg123
 
diff --git a/audio-players/digitaldj/PRE_BUILD b/audio-players/digitaldj/PRE_BUILD
new file mode 100755
index 0000000000..1a741977c0
--- /dev/null
+++ b/audio-players/digitaldj/PRE_BUILD
@@ -0,0 +1,4 @@
+ls /usr/src
+ls "$SOURCE_DIRECTORY"
+default_pre_build  &&
+sedit 's/CLK_TCK/CLOCKS_PER_SEC/g' "$SOURCE_DIRECTORY/src/ddj.c"
diff --git a/audio-plugins/bmp-extra-plugins/DEPENDS b/audio-plugins/bmp-extra-plugins/DEPENDS
index c4a69b489d..bf5d14b5a4 100755
--- a/audio-plugins/bmp-extra-plugins/DEPENDS
+++ b/audio-plugins/bmp-extra-plugins/DEPENDS
@@ -1 +1,3 @@
 depends "beep-media-player"
+depends esound
+
diff --git a/audio-plugins/bmp-extra-plugins/HISTORY b/audio-plugins/bmp-extra-plugins/HISTORY
index 69d50b2e22..e0939df9fd 100644
--- a/audio-plugins/bmp-extra-plugins/HISTORY
+++ b/audio-plugins/bmp-extra-plugins/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thoams Orgis <sobukus@sourcemage.org>
+	* DEPENDS: hard-depends on esound
+	* PRE_BUILD, bmp*-bogusstatic.patch: make it build
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/audio-plugins/bmp-extra-plugins/PRE_BUILD b/audio-plugins/bmp-extra-plugins/PRE_BUILD
new file mode 100755
index 0000000000..b89cdc95da
--- /dev/null
+++ b/audio-plugins/bmp-extra-plugins/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/bmp-extra-plugins-0.2.2-bogusstatic.patch"
diff --git a/audio-plugins/bmp-extra-plugins/bmp-extra-plugins-0.2.2-bogusstatic.patch b/audio-plugins/bmp-extra-plugins/bmp-extra-plugins-0.2.2-bogusstatic.patch
new file mode 100644
index 0000000000..3f4ce27c21
--- /dev/null
+++ b/audio-plugins/bmp-extra-plugins/bmp-extra-plugins-0.2.2-bogusstatic.patch
@@ -0,0 +1,29 @@
+Nur in bmp-extra-plugins-0.2.2.fix/input/musepack: tags.loT.
+diff -ru bmp-extra-plugins-0.2.2/output/crossfade/monitor.c bmp-extra-plugins-0.2.2.fix/output/crossfade/monitor.c
+--- bmp-extra-plugins-0.2.2/output/crossfade/monitor.c	2004-02-18 13:49:28.000000000 +0100
++++ bmp-extra-plugins-0.2.2.fix/output/crossfade/monitor.c	2008-08-19 20:42:44.000000000 +0200
+@@ -35,9 +35,9 @@
+ #include "support.h"
+ 
+ 
+-static GtkWidget   *monitor_win;
+-static GtkWidget   *monitor_display_drawingarea;
+-static GtkProgress *monitor_output_progress;
++GtkWidget   *monitor_win;
++GtkWidget   *monitor_display_drawingarea;
++GtkProgress *monitor_output_progress;
+ static GtkLabel    *monitor_position_label;
+ static GtkLabel    *monitor_total_label;
+ static GtkLabel    *monitor_left_label;
+diff -ru bmp-extra-plugins-0.2.2/output/crossfade/oss.c bmp-extra-plugins-0.2.2.fix/output/crossfade/oss.c
+--- bmp-extra-plugins-0.2.2/output/crossfade/oss.c	2004-01-13 10:27:04.000000000 +0100
++++ bmp-extra-plugins-0.2.2.fix/output/crossfade/oss.c	2008-08-19 20:43:15.000000000 +0200
+@@ -94,7 +94,7 @@
+ static gint     dsp_fragment_utime = 0;
+ static gboolean dsp_select_works = FALSE;
+ 
+-static pthread_mutex_t buffer_mutex;
++pthread_mutex_t buffer_mutex;
+ static pthread_t       buffer_thread;
+ 
+ static format_t  format;
diff --git a/chat-im/climm/DETAILS b/chat-im/climm/DETAILS
index 204c85adbd..fd0d2376ea 100755
--- a/chat-im/climm/DETAILS
+++ b/chat-im/climm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=climm
-         VERSION=0.6.2
+         VERSION=0.6.3
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.${SPELL}.org/
diff --git a/chat-im/climm/HISTORY b/chat-im/climm/HISTORY
index a67b203913..16fe4defce 100644
--- a/chat-im/climm/HISTORY
+++ b/chat-im/climm/HISTORY
@@ -1,5 +1,8 @@
+2008-08-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: updated to 0.6.3
+
 2008-03-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* DETAILS, DEPENDS: updated to 0.9.2
+	* DETAILS, DEPENDS: updated to 0.6.2
 
 2007-10-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* climm-0.6.1.tgz.sig, CONFLICTS, DEPENDS, DETAILS, HISTORY:
diff --git a/chat-im/climm/climm-0.6.2.tgz.sig b/chat-im/climm/climm-0.6.2.tgz.sig
deleted file mode 100644
index adc104e90d..0000000000
--- a/chat-im/climm/climm-0.6.2.tgz.sig
+++ /dev/null
diff --git a/chat-im/climm/climm-0.6.3.tgz.sig b/chat-im/climm/climm-0.6.3.tgz.sig
new file mode 100644
index 0000000000..38a4265901
--- /dev/null
+++ b/chat-im/climm/climm-0.6.3.tgz.sig
diff --git a/chat-im/funpidgin/BUILD b/chat-im/funpidgin/BUILD
index 5f756dc2f4..2aee352da7 100755
--- a/chat-im/funpidgin/BUILD
+++ b/chat-im/funpidgin/BUILD
@@ -1,6 +1,9 @@
 ### had to cook up some pkg-config files for nss and nspr 
 CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
 export PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr" &&
-make_single &&
-default_build &&
-cd $SOURCE_DIRECTORY                            
+OPTS="--disable-nm $OPTS" &&
+make_single          &&
+cd $SOURCE_DIRECTORY &&
+NOCONFIGURE=Y ./autogen.sh &&
+default_build        &&
+cd $SOURCE_DIRECTORY
diff --git a/chat-im/funpidgin/DEPENDS b/chat-im/funpidgin/DEPENDS
index 7bb37f927b..780faab48b 100755
--- a/chat-im/funpidgin/DEPENDS
+++ b/chat-im/funpidgin/DEPENDS
@@ -82,7 +82,22 @@ optional_depends  howl                                      \
                   ''                                        \
                   'for network ZeroConf in Bonjour plugin'  &&
 
+optional_depends  xscreensaver                      \
+                  ""                                \
+                  "--disable-screensaver"           \
+                  "to use X screensaver extension"  &&
+
+optional_depends  gstreamer                          \
+                  ""                                 \
+                  "--disable-gstreamer"              \
+                  "for GStreamer audio support"      &&
+
+optional_depends  avahi                              \
+                  ""                                 \
+                  "--disable-avahi"                  \
+                  "for avahi support"                &&
+
 optional_depends  meanwhile                                        \
                   ''                                               \
-                  ''                                               \
+                  '--disable-meanwhile'                            \
                   'for Lotus Instant Messenger/Sametime protocol'
diff --git a/chat-im/funpidgin/DETAILS b/chat-im/funpidgin/DETAILS
index 51c85dc0db..cfa79c53dc 100755
--- a/chat-im/funpidgin/DETAILS
+++ b/chat-im/funpidgin/DETAILS
@@ -1,9 +1,9 @@
            SPELL=funpidgin
-         VERSION=2.4.1
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         VERSION=2.4.3
+          SOURCE=carrier-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/pidgin-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/carrier-$VERSION
         WEB_SITE=http://funpidgin.sourceforge.net/
       LICENSE[0]=GPL
     DISTCC_HOSTS=
diff --git a/chat-im/funpidgin/HISTORY b/chat-im/funpidgin/HISTORY
index 9333e9ea7a..51ab4b771a 100644
--- a/chat-im/funpidgin/HISTORY
+++ b/chat-im/funpidgin/HISTORY
@@ -1,2 +1,9 @@
-2008-05-04	* DETAILS, BUILD, DEPENDS: Created from pidgin spell
-		* CONFLICTS: conflicts pidgin
+2008-08-20 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 2.4.3. Updated SOURCE_DIRECTORY
+	* BUILD: Added autogen.sh. Added OPT to disable netmanager
+	* DEPENDS: Added optional_depends xscreensaver, gstreamer, avahi.
+	  Added option to disable meanwhile.
+
+2008-05-04 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS, BUILD, DEPENDS: Created from pidgin spell
+	* CONFLICTS: conflicts pidgin
diff --git a/chat-im/funpidgin/carrier-2.4.3.tar.gz.sig b/chat-im/funpidgin/carrier-2.4.3.tar.gz.sig
new file mode 100644
index 0000000000..8c5a5533d7
--- /dev/null
+++ b/chat-im/funpidgin/carrier-2.4.3.tar.gz.sig
diff --git a/chat-im/funpidgin/funpidgin-2.4.1.tar.bz2.sig b/chat-im/funpidgin/funpidgin-2.4.1.tar.bz2.sig
deleted file mode 100644
index 809e92d57b..0000000000
--- a/chat-im/funpidgin/funpidgin-2.4.1.tar.bz2.sig
+++ /dev/null
diff --git a/collab/pmi/BUILD b/collab/pmi/BUILD
index 21b6e44223..27ba77ddaf 100755
--- a/collab/pmi/BUILD
+++ b/collab/pmi/BUILD
@@ -1,15 +1 @@
-# $Id: BUILD,v 1.1 2002/07/30 03:12:14 sergeyli Exp $
-(
-	cp ./pmi.conf ./pmi.conf.default &&
-
-	prepare_install                  &&
-
-	mkdir -p   /usr/share/$SPELL     &&
-	cp    -r . /usr/share/$SPELL/
-    
-) > $C_FIFO 2>&1 && (
-
-	echo "Please point your apache at /usr/share/$SPELL/htdocs"
-	echo "Edit or update /usr/share/$SPELL/pmi.conf"
-
-)
+true
diff --git a/collab/pmi/DETAILS b/collab/pmi/DETAILS
index 5858e23a51..c001a46449 100755
--- a/collab/pmi/DETAILS
+++ b/collab/pmi/DETAILS
@@ -1,26 +1,26 @@
-# $Id: DETAILS,v 1.4 2002/10/23 18:55:17 sergeyli Exp $
            SPELL=pmi
-         VERSION=1.0-rc3
+         VERSION=1.0-rc4
           SOURCE=$SPELL-$VERSION.tar.gz
-     SOURCE_HASH=sha512:87e1dbb7eda1c8cedf0bcbe74c680f7fbfffd7943f66339502f725caab62c4938e8d23023f69c06718c4bb3c5809cbf7a3e66f224f1e9692af23d8c873c1ab63
+     SOURCE_HASH=sha512:cf4f5fb912d5fc08343a1d9c4b645b38e8380bc7ea490c53f34f5651feea4da51398fa5b5b1ff4f898a7f5cfd848347481a322b983f17d4ed177d12a31434cd0
       LICENSE[0]=GPL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://majordojo.com/pmi/$SOURCE
         WEB_SITE=http://majordojo.com/pmi/
          ENTERED=20020729
-                                                       KEYWORDS="collab"
-       BUILD_API=1
+        KEYWORDS="collab"
            SHORT="Project Management Interface"
 cat << EOF
 The PMI (or "Project Management Interface") is a web based application to help
 companies manage project information for their intranet.
 Features
-*	Automatically generates project and release dashboards to easily communicate
-	to team members vital project informaton
-*	Bugzilla integration: generate bug reports, and statistics for your projects
-	and releases
-*	utilize watch lists to get notified via email when projects, and/or
-	documentation changes
-*	use a the "My PMI" dashboard to get a snapshot of the projects you belong to
-*	organize documentation for your intranet in a directory heirarchy
+* Automatically generates project and release dashboards to easily communicate
+  to team members vital project informaton
+* Bugzilla integration: generate bug reports, and statistics for your projects
+  and releases
+* utilize watch lists to get notified via email when projects, and/or
+  documentation changes
+* use a the "My PMI" dashboard to get a snapshot of the projects you belong to
+* organize documentation for your intranet in a directory heirarchy
+
+PMI is no longer being maintained and supported by upstream.
 EOF
diff --git a/collab/pmi/HISTORY b/collab/pmi/HISTORY
index b834e6fa20..1e66298ee5 100644
--- a/collab/pmi/HISTORY
+++ b/collab/pmi/HISTORY
@@ -1,3 +1,10 @@
+2008-08-20 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DETAILS: updated spell to 1.0-rc4, switched to BUILD_API=2,
+	  fixed tabs in the long description,
+	  added a note that the project is no longer maintained
+	* INSTALL: created for BUILD_API=2
+	* BUILD: adjusted to BUILD_API=2
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/collab/pmi/INSTALL b/collab/pmi/INSTALL
new file mode 100755
index 0000000000..7cc9aefbb6
--- /dev/null
+++ b/collab/pmi/INSTALL
@@ -0,0 +1,10 @@
+mkdir -pv  ${INSTALL_ROOT}/usr/share/www/$SPELL  &&
+
+# The upstream tarball ships along with the CVS archives and the
+# temporary files ending in *~. The following command filters out these files.
+find  bin conf cron htdocs include schemas  \
+           -not -type d  \
+      -and -not -wholename "*/CVS"  \
+      -and -not -wholename "*/CVS/*"  \
+      -and -not -name "*~"  \
+      -exec install -D "{}" "${INSTALL_ROOT}/usr/share/www/$SPELL/{}" ";"
diff --git a/collab/webmin/DETAILS b/collab/webmin/DETAILS
index eb104f6b04..012be2bb10 100755
--- a/collab/webmin/DETAILS
+++ b/collab/webmin/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webmin
-         VERSION=1.420
+         VERSION=1.430
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/webadmin/$SOURCE
-     SOURCE_HASH=sha512:a6cc63933d08e158df5b0230add1fc785cb40a8d109611561afd479d492747706be81ac1c5ebf2d07cf301b71c4681af2e32bfadb05f7e7d01fcb705513937bd
+     SOURCE_HASH=sha512:a51b62ec3aabefb8770f8ca6b4ef00b5615131c53c66dff863217b51cb086ea02db9f513198d28656e0dfce43d3e73a1a9db0f8295dfacb556fa8c87de4d5bca
         WEB_SITE=http://www.webmin.com/
          ENTERED=20020415
          ARCHIVE="off"
diff --git a/collab/webmin/HISTORY b/collab/webmin/HISTORY
index 3101b93ded..8153fcf95c 100644
--- a/collab/webmin/HISTORY
+++ b/collab/webmin/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 1.430
+
 2008-06-01 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to version 1.420
 
diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index 52944d4e22..9e1f3cf10a 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Ladislav Hagara <hgr@vabo.cz>
+	* PRE_BUILD: added sedit #14415
+
 2008-04-13 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: SECURITY_PATCH=5, CVE-2008-1530 [Bug 14447]
 
diff --git a/crypto/gnupg-exp/PRE_BUILD b/crypto/gnupg-exp/PRE_BUILD
index 427b6807e8..f8cb619ad5 100755
--- a/crypto/gnupg-exp/PRE_BUILD
+++ b/crypto/gnupg-exp/PRE_BUILD
@@ -1,3 +1,7 @@
 default_pre_build                                 &&
+
+#14415
+sedit 's:FAQ faq.html::' $SOURCE_DIRECTORY/doc/Makefile.in  &&
+
 patch $SOURCE_DIRECTORY/keyserver/gpgkeys_curl.c  \
       $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/devel/git/CONFIGURE b/devel/git/CONFIGURE
index c1372533e9..1eb637ab7b 100755
--- a/devel/git/CONFIGURE
+++ b/devel/git/CONFIGURE
@@ -3,6 +3,8 @@ config_query_list GIT_SHA_OPT \
                   openssl \
                   mozilla &&
 
+config_query GIT_SYMLINKS "Enable Git symlinks (obsolete since 1.6)?" n &&
+
 if spell_ok uri &&
    spell_ok term-readkey &&
    spell_ok lwp; then
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index e4cde80321..95c747de7a 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,10 @@
+2008-08-21 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.6.0
+	* init.d/git-daemon: use the multicall git binary (since 1.6); fixed
+	  running/stopping process, cleaned up
+	* CONFIGURE, INSTALL: added option to install symlinks for the deprecated
+	  path binaries
+
 2008-08-18 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.6.0, added some more bashism
 	* BUILD: default_build OK
diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index 249f68da16..c9a80a305b 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -36,4 +36,13 @@ if is_depends_enabled $SPELL vim; then
   VIM_VERSION=$(installed_version vim)
   install -vm 644 "$SOURCE_DIRECTORY/contrib/vim/syntax/gitcommit.vim" \
                   "$INSTALL_ROOT/usr/share/vim/vim${VIM_VERSION/./}/syntax"
+fi &&
+
+if [[ $GIT_SYMLINKS == y ]]; then
+  message "Creating needed symlinks..." &&
+
+  for i in `ls "$INSTALL_ROOT/usr/libexec/git-core"`; do
+    ln -vsf "$TRACK_ROOT/usr/libexec/git-core/$i" \
+            "$INSTALL_ROOT/usr/bin/$i"
+  done
 fi
diff --git a/devel/git/init.d/git-daemon b/devel/git/init.d/git-daemon
index cc4b1264de..c43b45ad1d 100755
--- a/devel/git/init.d/git-daemon
+++ b/devel/git/init.d/git-daemon
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-PROGRAM=/usr/bin/git-daemon
+PIDFILE=/var/run/git.pid
+PROGRAM=/usr/bin/git
 RUNLEVEL=3
 NEEDS="+network"
 
@@ -9,7 +10,7 @@ NEEDS="+network"
 
 create_args()
 {
-	ARGS="$EXTRA_ARGS"
+	ARGS="daemon --pid-file=/var/run/git.pid $EXTRA_ARGS"
 	[[ $TIMEOUT ]] && ARGS="$ARGS --timeout=$TIMEOUT"
 	[[ $INIT_TIMEOUT ]] && ARGS="$ARGS --init-timeout=$INIT_TIMEOUT"
 	[[ $PORT ]] && ARGS="$ARGS --port=$PORT"
@@ -31,7 +32,14 @@ start()
 	create_args
 	(
 		unset -f echo &&
-		su -c "$PROGRAM $ARGS >> ${LOG_FILE} 2>&1" $USER
-	) &
+		su $USER -c "$PROGRAM $ARGS >> $LOG_FILE 2>&1 &"
+	)
+	evaluate_retval
+}
+
+stop()
+{
+	echo "Shutting down Git Daemon:"
+	killproc git-daemon
 	evaluate_retval
 }
diff --git a/devel/tk/DETAILS b/devel/tk/DETAILS
index 876247820f..a327e65419 100755
--- a/devel/tk/DETAILS
+++ b/devel/tk/DETAILS
@@ -1,15 +1,17 @@
             SPELL=tk
 if [ "$DEVEL" = "y" ]; then
           VERSION=8.5a6
+           SOURCE=tcl$VERSION-src.tar.gz
+          SOURCE2=tk$VERSION-src.tar.gz
        SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
       SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
 else
           VERSION=8.5.4
+           SOURCE=tcl$VERSION-src.tar.gz
+          SOURCE2=tk$VERSION-src.tar.gz
       SOURCE_HASH=sha512:40ceec99d1aa76a5e7c87af6f3520ee5fba0b9ea0e879a29b0f83a914f2a88f81e3494c95f160342324df8dc59d906cc0f307f522b5fb1ec08349edbb609dcfd
      SOURCE2_HASH=sha512:badfcaa29bdcc4548b1c8e9797a7e664c1be5d8f100ed3ad3b9bc50fd689285ec4a46c487037991d107a122735729c453a6a9df1211d665f0968a8f68e8108ba
 fi
-           SOURCE=tcl$VERSION-src.tar.gz
-          SOURCE2=tk$VERSION-src.tar.gz
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/tcl$VERSION
 SOURCE2_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION
     SOURCE_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE
diff --git a/devel/tk/HISTORY b/devel/tk/HISTORY
index 740353d739..fa09a5aac9 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DETAILS: reordered SOURCE and SOURCE2 before SOURCE_GPG
+	  and SOURCE2_GPG for $DEVEL=y. Fixes bug 14659
+
 2008-08-15 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated stable to 8.5.4
 	* PRE_BUILD: Removed patch.
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index 68502aea90..f3d0df8469 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,7 +1,7 @@
            SPELL=transmission
-         VERSION=1.32
+         VERSION=1.33
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://download.m0k.org/$SPELL/files/$SOURCE
+   SOURCE_URL[0]=http://mirrors.m0k.org/$SPELL/files/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.transmissionbt.com/
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 0827bf8282..169f1108f9 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.33, renewed source url
+
 2008-08-09 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.32
 
diff --git a/ftp/transmission/transmission-1.32.tar.bz2.sig b/ftp/transmission/transmission-1.32.tar.bz2.sig
deleted file mode 100644
index 53d707313c..0000000000
--- a/ftp/transmission/transmission-1.32.tar.bz2.sig
+++ /dev/null
diff --git a/ftp/transmission/transmission-1.33.tar.bz2.sig b/ftp/transmission/transmission-1.33.tar.bz2.sig
new file mode 100644
index 0000000000..9095e81c72
--- /dev/null
+++ b/ftp/transmission/transmission-1.33.tar.bz2.sig
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index 8b556e1fcd..eed681ed3b 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,6 +1,10 @@
 depends  libole2-2    &&
 depends  libgsf       &&
-depends  goffice      &&
+if [[ $GNUMERIC_DEVEL == y ]]; then
+         depends goffice-dev
+else
+         depends goffice
+fi &&
 depends  libxml2      &&
 
 optional_depends  gtk+2                                \
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index d6304d8b5d..ca154ba605 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gnumeric
 if [[ $GNUMERIC_DEVEL == y ]]; then
-         VERSION=1.9.0
+         VERSION=1.9.1
 else
          VERSION=1.8.3
 fi
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 947d8e532b..9878a02034 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated devel to 1.9.1
+	* DEPENDS: Devel version depends goffice-dev
+
 2008-07-13 Arjan Bouter <abouter@sourcemage.org>
 	* DEPENDS: made rarian optional
 
diff --git a/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig
deleted file mode 100644
index f38536df80..0000000000
--- a/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig
new file mode 100644
index 0000000000..895b2acc01
--- /dev/null
+++ b/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig
diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS
index 2e5079b8a0..dd36272bdc 100755
--- a/gnome2-libs/goffice-dev/DETAILS
+++ b/gnome2-libs/goffice-dev/DETAILS
@@ -1,5 +1,5 @@
            SPELL=goffice-dev
-         VERSION=0.4.3
+         VERSION=0.7.0
           BRANCH=${VERSION%\.*}
           SOURCE=goffice-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY
index 49c373a36b..68c24ab3dc 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated to version 0.7.0
+
 2007-09-05 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to version 0.4.3
 
diff --git a/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig b/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig
deleted file mode 100644
index c60efea3ae..0000000000
--- a/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig b/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig
new file mode 100644
index 0000000000..ae3a564a23
--- /dev/null
+++ b/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig
diff --git a/gnome2-libs/orbit2/DETAILS b/gnome2-libs/orbit2/DETAILS
index 338b6bbcdc..4c085e7543 100755
--- a/gnome2-libs/orbit2/DETAILS
+++ b/gnome2-libs/orbit2/DETAILS
@@ -1,8 +1,8 @@
            SPELL=orbit2
-         VERSION=2.14.13
+         VERSION=2.14.14
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=ORBit2-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ORBit2-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/ORBit2-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/ORBit2/$BRANCH/$SOURCE	
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=GPL
diff --git a/gnome2-libs/orbit2/HISTORY b/gnome2-libs/orbit2/HISTORY
index ba55bdab78..d35dbd4d49 100644
--- a/gnome2-libs/orbit2/HISTORY
+++ b/gnome2-libs/orbit2/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.14.14
+
 2008-07-01 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 2.14.13, fixed short/long descs, cleaned up
 	* BUILD: cleaned up
diff --git a/gnome2-libs/orbit2/ORBit2-2.14.13.tar.bz2.sig b/gnome2-libs/orbit2/ORBit2-2.14.13.tar.bz2.sig
deleted file mode 100644
index ad5e41c7e3..0000000000
--- a/gnome2-libs/orbit2/ORBit2-2.14.13.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/orbit2/ORBit2-2.14.14.tar.bz2.sig b/gnome2-libs/orbit2/ORBit2-2.14.14.tar.bz2.sig
new file mode 100644
index 0000000000..db1bfe825c
--- /dev/null
+++ b/gnome2-libs/orbit2/ORBit2-2.14.14.tar.bz2.sig
diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index 9c985892f9..bdc36b7ef4 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -23,7 +23,8 @@ if [[ "$GCC_NOLIB64" == 'y' ]]; then
 fi                                                         &&
 
 cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
+# Ignore any installed g++, it could botch up configure!
+CXX=/bin/false $SOURCE_DIRECTORY/configure                 \
              --host=$HOST                                  \
              --prefix=${INSTALL_ROOT}/usr                  \
              --infodir=${INSTALL_ROOT}/usr/share/info      \
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index feb934f502..05926050c7 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
+	* BUILD: workaround for g++ upgrade where installed g++ (older version)
+	  is broken
+
 2008-06-11 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 4.3.1
 
diff --git a/graphics/qcad/DETAILS b/graphics/qcad/DETAILS
index d012b8ca4c..50a70577d8 100755
--- a/graphics/qcad/DETAILS
+++ b/graphics/qcad/DETAILS
@@ -1,19 +1,21 @@
            SPELL=qcad
          VERSION=2.0.5.0-1
-       P_VERSION=2.0.1.2-1
+       P_VERSION=2.1.2.8-1
           SOURCE=${SPELL}-${VERSION}-community.src.tar.gz
-         SOURCE2=partlibrary-${P_VERSION}.zip
+         SOURCE2=partlibrary-${P_VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-community.src
    SOURCE_URL[0]=http://www.ribbonsoft.com/archives/qcad/${SOURCE}
-  SOURCE2_URL[0]=http://www.ribbonsoft.com/archives/partlibrary/${SOURCE2}
+  SOURCE2_URL[0]=ftp://ribbonsoft.com/archives/partlibrary/${SOURCE2}
         WEB_SITE=http://www.ribbonsoft.com/qcad.html
-      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
-     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig"
+     SOURCE_HASH=sha512:a1d9f37005da9a1af57a0398e0421d50bde9c927576a9ddb26e33606aa9c2a3507f886ee0a46fa4b474e14fb2420867999a28e3ae4d287cd317d2005bb8e8b28
+    SOURCE2_HASH=sha512:09a5f2b53c41f6b2282242c8412cf8aa1f7c151190ab0d94d6f06489fd5d0e8d2b4dbeea16618d7aa4d31f7115b784d06423da688df49d1fc4e0b4ae96b27d09
       LICENSE[0]=GPL
       LICENSE[1]=GPL
          ENTERED=20020803
         KEYWORDS="graphics"
            SHORT="A 2D Computer Aided Drafting system for UNIX"
 cat << EOF
-QCad is a free open-source 2D CAD system for Linux. The developers main goals are to build a stable, fast and easy to use CAD for everyone. One doesn't need any knowledge of a CAD program to start working with QCad.
+QCad is a free open-source 2D CAD system for Linux. The developers main
+goals are to build a stable, fast and easy to use CAD for everyone. One
+doesn't need any knowledge of a CAD program to start working with QCad.
 EOF
diff --git a/graphics/qcad/HISTORY b/graphics/qcad/HISTORY
index d11e056127..a4235661c4 100644
--- a/graphics/qcad/HISTORY
+++ b/graphics/qcad/HISTORY
@@ -1,3 +1,10 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DETAILS: Fixed SOURCE2_URL[0]
+	  fixed long description wrap
+	  updated partlib to to 2.1.2.8
+	  fixed #14652
+	* INSTALL: added INSTALL_ROOT support
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/graphics/qcad/INSTALL b/graphics/qcad/INSTALL
index 20844039a4..34724ae1fa 100755
--- a/graphics/qcad/INSTALL
+++ b/graphics/qcad/INSTALL
@@ -1,5 +1,5 @@
 INSTALL="install  -o  root  -g  root"                      &&
-Q_DIR="/usr/share/qcad"                                    &&
+Q_DIR="$INSTALL_ROOT/usr/share/qcad"                       &&
 
 cd  ${SOURCE_DIRECTORY}/qcad                               &&
 
diff --git a/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig b/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig
deleted file mode 100644
index 85d792c117..0000000000
--- a/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig
+++ /dev/null
diff --git a/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig b/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig
deleted file mode 100644
index 59518fd91d..0000000000
--- a/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig
+++ /dev/null
diff --git a/http/ijb-waldhoff/BUILD b/http/ijb-waldhoff/BUILD
index 48b27fcf9d..27ba77ddaf 100755
--- a/http/ijb-waldhoff/BUILD
+++ b/http/ijb-waldhoff/BUILD
@@ -1,23 +1 @@
-(
-    
-  make                                               &&
-  prepare_install                                    &&
-  mkdir  -p              /var/log/junkbuster         &&
-  mkdir  -p              /etc/junkbuster             &&
-  mkdir  -p              /usr/doc/junkbuster         &&
-  install -s -m 755 junkbuster /usr/sbin/junkbuster  &&
-  cp  -f  junkbuster.1   /usr/man/man8/junkbuster.8  &&
-  cp  -f  ijbman.html    /usr/doc/junkbuster         &&
-  cp  -f  ijbfaq.html    /usr/doc/junkbuster
-
-) > $C_FIFO 2>&1  &&  (
-
-  ETC="/etc/junkbuster"
-
-  for file in blocklist imagelist cookiefile saclfile.ini \
-      	      config forward strust.ini
-  do
-  [  -f  $ETC/$file  ]  ||  cp  $file  $ETC
-  done
-
-)
+true
diff --git a/http/ijb-waldhoff/CONFLICTS b/http/ijb-waldhoff/CONFLICTS
index 90faebb821..9ed8442d3a 100755
--- a/http/ijb-waldhoff/CONFLICTS
+++ b/http/ijb-waldhoff/CONFLICTS
@@ -1 +1 @@
-conflicts  ijb
+conflicts ijb-waldhoff y
diff --git a/http/ijb-waldhoff/DEPENDS b/http/ijb-waldhoff/DEPENDS
new file mode 100755
index 0000000000..5c1a0a9c97
--- /dev/null
+++ b/http/ijb-waldhoff/DEPENDS
@@ -0,0 +1 @@
+depends privoxy
diff --git a/http/ijb-waldhoff/DETAILS b/http/ijb-waldhoff/DETAILS
index f29e92201a..3cb05a89c7 100755
--- a/http/ijb-waldhoff/DETAILS
+++ b/http/ijb-waldhoff/DETAILS
@@ -1,14 +1,14 @@
            SPELL=ijb-waldhoff
          VERSION=2.0.2-8
-          SOURCE=junkbuster-$VERSION.tar.gz
-     SOURCE_HASH=sha512:ea3ff8b8f5ebfec37ff4fc3c0eb729e101788966651af06bcc3b6a8d7409917ac888f238e7c72bd134cf775212eb18d253a53ab827f2e7dfc5523fba2e179621
+#         SOURCE=junkbuster-$VERSION.tar.gz
+#    SOURCE_HASH=sha512:ea3ff8b8f5ebfec37ff4fc3c0eb729e101788966651af06bcc3b6a8d7409917ac888f238e7c72bd134cf775212eb18d253a53ab827f2e7dfc5523fba2e179621
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ijb20
-   SOURCE_URL[0]=http://www.waldherr.org/redhat/rpm/srpm/$SOURCE
+#  SOURCE_URL[0]=http://www.waldherr.org/redhat/rpm/srpm/$SOURCE
         WEB_SITE=http://www.waldherr.org/junkbuster
+      PATCHLEVEL=1
          ENTERED=20010922
          UPDATED=20040220
         KEYWORDS="web http"
-       BUILD_API=1
            SHORT="junkbuster is an ad filtering web proxy"
 cat << EOF
 The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and
diff --git a/http/ijb-waldhoff/HISTORY b/http/ijb-waldhoff/HISTORY
index 241027f23b..8170f09485 100644
--- a/http/ijb-waldhoff/HISTORY
+++ b/http/ijb-waldhoff/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS:
+	  deprecated the spell in favour of privoxy
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed MAINTAINER.
 
diff --git a/http/ijb-waldhoff/INSTALL b/http/ijb-waldhoff/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/ijb-waldhoff/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/ijb-waldhoff/PRE_BUILD b/http/ijb-waldhoff/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/ijb-waldhoff/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/http/ijb-waldhoff/TRIGGERS b/http/ijb-waldhoff/TRIGGERS
new file mode 100644
index 0000000000..6b60c1d293
--- /dev/null
+++ b/http/ijb-waldhoff/TRIGGERS
@@ -0,0 +1 @@
+on_cast ijb-waldhoff dispel_self
diff --git a/http/ijb/BUILD b/http/ijb/BUILD
index 9cec5b58b6..27ba77ddaf 100755
--- a/http/ijb/BUILD
+++ b/http/ijb/BUILD
@@ -1,25 +1 @@
-(
-    
-  make                                               &&
-  prepare_install                                    &&
-  mkdir  -p              /var/log/junkbuster         &&
-  mkdir  -p              /etc/junkbuster             &&
-  mkdir  -p              /usr/doc/junkbuster         &&
-  install -s -m 755 junkbuster /usr/sbin/junkbuster  &&
-  cp  -f  junkbuster.1   /usr/man/man8/junkbuster.8  &&
-  cp  -f  ijbman.html    /usr/doc/junkbuster         &&
-  cp  -f  ijbfaq.html    /usr/doc/junkbuster
-
-) > $C_FIFO 2>&1  &&  (
-
-  ETC="/etc/junkbuster"
-
-  [  -f  $ETC/junkbstr.ini  ]  ||  cp  junkbstr.ini  $ETC
-  [  -f  $ETC/sblock.ini    ]  ||  cp  sblock.ini    $ETC
-  [  -f  $ETC/scookie.ini   ]  ||  cp  scookie.ini   $ETC
-  [  -f  $ETC/saclfile.ini  ]  ||  cp  saclfile.ini  $ETC
-  [  -f  $ETC/sforward.ini  ]  ||  cp  sforward.ini  $ETC
-  [  -f  $ETC/strust.ini    ]  ||  cp  strust.ini    $ETC
-   
-
-)
+true
diff --git a/http/ijb/CONFLICTS b/http/ijb/CONFLICTS
index 09a26da516..30aef27712 100755
--- a/http/ijb/CONFLICTS
+++ b/http/ijb/CONFLICTS
@@ -1 +1 @@
-conflicts ijb-waldhoff
+conflicts ijb y
diff --git a/http/ijb/DEPENDS b/http/ijb/DEPENDS
new file mode 100755
index 0000000000..5c1a0a9c97
--- /dev/null
+++ b/http/ijb/DEPENDS
@@ -0,0 +1 @@
+depends privoxy
diff --git a/http/ijb/DETAILS b/http/ijb/DETAILS
index 752842829e..30a29ee6c4 100755
--- a/http/ijb/DETAILS
+++ b/http/ijb/DETAILS
@@ -1,14 +1,14 @@
            SPELL=ijb
          VERSION=20
-          SOURCE=$SPELL$VERSION.tar.Z
-     SOURCE_HASH=sha512:cb7951767d623e517364bc37c962f6a86002eecacc96c683254a8ab6c5b85518299d18c8eb9773f91368eb6c6231f08f8d177c22c4a58d3d331d2ba1ba3b4a99
+#         SOURCE=$SPELL$VERSION.tar.Z
+#    SOURCE_HASH=sha512:cb7951767d623e517364bc37c962f6a86002eecacc96c683254a8ab6c5b85518299d18c8eb9773f91368eb6c6231f08f8d177c22c4a58d3d331d2ba1ba3b4a99
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
-   SOURCE_URL[0]=http://www.junkbuster.com/$SOURCE
+#  SOURCE_URL[0]=http://www.junkbuster.com/$SOURCE
         WEB_SITE=http://www.junkbuster.com
+      PATCHLEVEL=1
          ENTERED=20010922
          UPDATED=20040220
         KEYWORDS="web http"
-       BUILD_API=1
            SHORT="ijb, internet junk buster is an ad filtering web proxy"
 cat << EOF
 The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and
diff --git a/http/ijb/HISTORY b/http/ijb/HISTORY
index 62a2939424..4bb69561d1 100644
--- a/http/ijb/HISTORY
+++ b/http/ijb/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS:
+	  deprecated the spell in favour of privoxy
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed MAINTAINER.
 
diff --git a/http/ijb/INSTALL b/http/ijb/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/ijb/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/http/ijb/PRE_BUILD b/http/ijb/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/http/ijb/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/http/ijb/TRIGGERS b/http/ijb/TRIGGERS
new file mode 100755
index 0000000000..ed53b5d6ce
--- /dev/null
+++ b/http/ijb/TRIGGERS
@@ -0,0 +1 @@
+on_cast ijb dispel_self
diff --git a/kde-core/kdegames/DEPENDS b/kde-core/kdegames/DEPENDS
index a1e33a00b7..343f54e382 100755
--- a/kde-core/kdegames/DEPENDS
+++ b/kde-core/kdegames/DEPENDS
@@ -1,4 +1,5 @@
 depends  kdebase  &&
+depends  kdelibs  &&
 depends  perl     &&
 
 source  "$SECTION_DIRECTORY/KDE_DEPENDS"  &&
diff --git a/kde-core/kdegames/HISTORY b/kde-core/kdegames/HISTORY
index a4de83385d..ec91727ae1 100644
--- a/kde-core/kdegames/HISTORY
+++ b/kde-core/kdegames/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DEPENDS: added kdelibs as a dependency, see bug 14354
+
 2008-02-26 Julien "_kaze_" ROZO <julien@rozo.org>
 	* DETAILS: updated version to 3.5.9
 
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index a584609580..097a995181 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -2,7 +2,7 @@ source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 source $GRIMOIRE/FUNCTIONS              &&
 depends qimageblitz                     &&
 depends xine-lib                        &&
-if  check_if_xorg_modular_libs  qt4  ;  then
+#if  check_if_xorg_modular_libs  qt4  ;  then
 #  depends  imake          &&
 #  depends  libxau         &&
 #  depends  libxcomposite  &&
@@ -16,8 +16,7 @@ if  check_if_xorg_modular_libs  qt4  ;  then
 #  depends  xsetroot       &&
 #  depends  xset           &&
 #  optional_depends  libxdamage  '' '' 'Compositing support'
-    sub_depends xine-lib libxcb
-fi                         &&
+#fi                         &&
 optional_depends openexr  '' '' 'EXR support for thumbnails'  &&
 optional_depends samba    '' '' 'build smb-ioslave'
 
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 90465c5b1f..3fc31d2e78 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DEPENDS: don't request an invalid sub dependency #14644
+	  xine-lib usually depends on libxcb; if it doesn't, it isn't needed (xorg)
+
 2008-08-08 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 4.1.61
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 58d71534da..31092751a9 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Ladislav Hagara <hgr@vabo.cz>
+	* latest.defaults: updated latest to patch-2.6.26.3
+	* info/patches/maintenance_patches/patch-2.6.26.3: added
+
 2008-08-19 Robert Figura <rfigura@sourcemage.org>
 	* DEPENDS: added optional_depends mtools
 
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.3 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.3
new file mode 100755
index 0000000000..9bab5c566f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.26.3
@@ -0,0 +1,6 @@
+appliedkernels="2.6.26"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 12daea4896..f7b9e174ce 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
 LATEST_2_6=2.6.26
 LATEST_PRE_2_6=patch-2.6.27-rc3
-LATEST_maintenance_patches=patch-2.6.26.2
+LATEST_maintenance_patches=patch-2.6.26.3
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.32
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 0d43557c97..3c3e982253 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD, patch: removed, no longer needed
+
 2008-08-16 Mathieu Lonjaret <lejatorn@sourcemage.org>
 	* DETAILS: corrected wrong hashsum
 
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
deleted file mode 100755
index f32561003c..0000000000
--- a/libs/boost/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-
-if [[ "$(installed_version gcc | sed 's:\.::g')" -ge "430" ]] && \
-   [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-  patch -p1 < ${SPELL_DIRECTORY}/boost-1_35_0-serialization_gcc43_64bit.patch
-fi
diff --git a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
deleted file mode 100644
index 7f959d8b34..0000000000
--- a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- trunk/boost/archive/polymorphic_iarchive.hpp (revision 43694)
-+++ trunk/boost/archive/polymorphic_iarchive.hpp (revision 43958)
-@@ -18,4 +18,5 @@
- 
- #include <cstddef> // std::size_t
-+#include <climits> // ULONG_MAX 
- #include <boost/config.hpp>
- 
-@@ -39,7 +40,14 @@
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
--#if defined(BOOST_NO_INT64_T) \
--    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
--#   define BOOST_NO_INTRINSIC_INT64_T
-+#if defined(BOOST_NO_INT64_T)
-+    #define BOOST_NO_INTRINSIC_INT64_T
-+#else 
-+    #if defined(ULONG_MAX)
-+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-+            #define BOOST_NO_INTRINSIC_INT64_T
-+        #endif
-+    #else 
-+        #define BOOST_NO_INTRINSIC_INT64_T
-+    #endif
- #endif
- 
---- trunk/boost/archive/polymorphic_oarchive.hpp (revision 43694)
-+++ trunk/boost/archive/polymorphic_oarchive.hpp (revision 43958)
-@@ -18,4 +18,5 @@
- 
- #include <cstddef> // size_t
-+#include <climits> // ULONG_MAX 
- #include <string>
- 
-@@ -38,7 +39,14 @@
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
--#if defined(BOOST_NO_INT64_T) \
--    || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
--#   define BOOST_NO_INTRINSIC_INT64_T
-+#if defined(BOOST_NO_INT64_T)
-+    #define BOOST_NO_INTRINSIC_INT64_T
-+#else 
-+    #if defined(ULONG_MAX)
-+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
-+            #define BOOST_NO_INTRINSIC_INT64_T
-+        #endif
-+    #else 
-+        #define BOOST_NO_INTRINSIC_INT64_T
-+    #endif
- #endif
- 
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 49cf97daef..b2e1f9db65 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -2,8 +2,12 @@
          VERSION=1.9
      SOURCE_HASH=sha512:b8402ff0616c9f6dbd9d3b40dad9a75fb615b81b5e7afdc232c9819ed0d944db4206a83e1ab572bb3e1ff48566a314d930589d136c7d634c9eddb2157e7b0d48
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://josefsson.org/libidn/releases/$SOURCE
+         SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.sig
+      SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
         WEB_SITE=http://www.gnu.org/software/libidn/
          ENTERED=20040824
       LICENSE[0]=LGPL
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index e11472cecc..16e01d51d6 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: fixed source urls, upstream key > hash
+
 2008-07-02 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.9, compacted long desc
 
diff --git a/mobile/openobex-apps/BUILD b/mobile/openobex-apps/BUILD
index 8f2ffe6b9f..27ba77ddaf 100755
--- a/mobile/openobex-apps/BUILD
+++ b/mobile/openobex-apps/BUILD
@@ -1,4 +1 @@
-patch -p1 < $SCRIPT_DIRECTORY/gcc34.patch		&&
-./configure  --build=$BUILD        	                \
-             --prefix=${INSTALL_ROOT}/usr         	&&
-make					                
+true
diff --git a/mobile/openobex-apps/DETAILS b/mobile/openobex-apps/DETAILS
index 9a5723d02b..eab4b484b6 100755
--- a/mobile/openobex-apps/DETAILS
+++ b/mobile/openobex-apps/DETAILS
@@ -1,15 +1,17 @@
            SPELL=openobex-apps
          VERSION=1.0.0
-          SOURCE=$SPELL-$VERSION.tar.gz
+#          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/openobex/$SOURCE
+#   SOURCE_URL[0]=$SOURCEFORGE_URL/openobex/$SOURCE
         WEB_SITE=http://openobex.sourceforge.net
-     SOURCE_HASH=sha512:1601887fdf1aa2f793d173abe498c3f7fde8494b4c8d633fb7a0a85716cadc080240c0b0f6400e0f5394f44fafb66724cd337a873bb68ec2b6775566e4627700
+#     SOURCE_HASH=sha512:1601887fdf1aa2f793d173abe498c3f7fde8494b4c8d633fb7a0a85716cadc080240c0b0f6400e0f5394f44fafb66724cd337a873bb68ec2b6775566e4627700
          ENTERED=20030714
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         KEYWORDS="mobile"
-           SHORT="openobex applications"
+           SHORT="DEPRECATED: openobex applications"
 cat << EOF
+DEPRECATED! Use openobex spell.
 The overall goal of this project is to make an open source implementation of the Object Exchange (OBEX) 
 protocol. OBEX is a session protocol and can best be described as a binary HTTP protocol.
 The OpenOBEX Project is the foundation for many interesting applications. Here is a list which 
diff --git a/mobile/openobex-apps/HISTORY b/mobile/openobex-apps/HISTORY
index 21f6b93a4d..6a8e600771 100644
--- a/mobile/openobex-apps/HISTORY
+++ b/mobile/openobex-apps/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS, DEPENDS, TRIGGERS, PRE_BUILD, INSTALL, *.c, *.patch:
+	  properly deprecate
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/mobile/openobex-apps/INSTALL b/mobile/openobex-apps/INSTALL
index da6740b212..27ba77ddaf 100755
--- a/mobile/openobex-apps/INSTALL
+++ b/mobile/openobex-apps/INSTALL
@@ -1,7 +1 @@
-cd $SOURCE_DIRECTORY/src		                &&
-cp $SCRIPT_DIRECTORY/obexserver.c .	                &&
-cc -o obexserver obexserver.c libmisc.a -lopenobex	&&
-cd $SOURCE_DIRECTORY			                &&
-make install				                &&
-install  src/obexserver	/usr/bin/	
-
+true
diff --git a/mobile/openobex-apps/PRE_BUILD b/mobile/openobex-apps/PRE_BUILD
new file mode 100755
index 0000000000..7eead1ee75
--- /dev/null
+++ b/mobile/openobex-apps/PRE_BUILD
@@ -0,0 +1,2 @@
+true
+
diff --git a/mobile/openobex-apps/TRIGGERS b/mobile/openobex-apps/TRIGGERS
new file mode 100755
index 0000000000..8fa3c55768
--- /dev/null
+++ b/mobile/openobex-apps/TRIGGERS
@@ -0,0 +1 @@
+on_cast openobex dispel_self
diff --git a/mobile/openobex-apps/gcc34.patch b/mobile/openobex-apps/gcc34.patch
deleted file mode 100644
index 6dac1725b6..0000000000
--- a/mobile/openobex-apps/gcc34.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Naur openobex-apps-1.0.0-clean/src/obex_put_common.c openobex-apps-1.0.0/src/obex_put_common.c
---- openobex-apps-1.0.0-clean/src/obex_put_common.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_put_common.c	2004-05-12 12:57:37.000000000 +0200
-@@ -82,7 +82,7 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if(!body)	{
-@@ -123,7 +123,7 @@
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS);
- 		break;
- 	default:
--		printf(__FUNCTION__ "() Denied %02x request\n", cmd);
-+		printf("%s() Denied %02x request\n", __func__,  cmd);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
- 		break;
- 	}
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h openobex-apps-1.0.0/src/obex_test_cable.h
---- openobex-apps-1.0.0-clean/src/obex_test_cable.h	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_cable.h	2004-05-12 13:23:11.000000000 +0200
-@@ -1,16 +1,16 @@
- /*********************************************************************
-- *                
-+ *
-  * Filename:      obex_test_cable.h
-- * Version:       
-- * Description:   
-+ * Version:
-+ * Description:
-  * Status:        Experimental.
-  * Author:        Pontus Fuchs <pontus.fuchs@tactel.se>
-  * Created at:    Wed Nov 17 22:05:16 1999
-  * Modified at:   Sun Aug 13 10:55:20 PM CEST 2000
-  * Modified by:   Pontus Fuchs <pontus.fuchs@tactel.se>
-- * 
-+ *
-  *     Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
-- *      
-+ *
-  *     This library is free software; you can redistribute it and/or
-  *     modify it under the terms of the GNU Lesser General Public
-  *     License as published by the Free Software Foundation; either
-@@ -23,9 +23,9 @@
-  *
-  *     You should have received a copy of the GNU Lesser General Public
-  *     License along with this library; if not, write to the Free Software
-- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
-+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-  *     MA  02111-1307  USA
-- *     
-+ *
-  ********************************************************************/
- 
- #ifndef OBEX_TEST_CABLE_H
-@@ -38,7 +38,7 @@
- #include <openobex/obex.h>
- 
- #ifdef CABLE_DEBUG
--#define CDEBUG(args...) printf(__FUNCTION__ "() " args)
-+#define CDEBUG(args...) printf("%s() ", __func__, args)
- #else
- #define CDEBUG(args...)
- #endif
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_cable.h~ openobex-apps-1.0.0/src/obex_test_cable.h~
---- openobex-apps-1.0.0-clean/src/obex_test_cable.h~	1970-01-01 01:00:00.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_cable.h~	2004-05-12 13:22:48.000000000 +0200
-@@ -0,0 +1,66 @@
-+/*********************************************************************
-+ *
-+ * Filename:      obex_test_cable.h
-+ * Version:
-+ * Description:
-+ * Status:        Experimental.
-+ * Author:        Pontus Fuchs <pontus.fuchs@tactel.se>
-+ * Created at:    Wed Nov 17 22:05:16 1999
-+ * Modified at:   Sun Aug 13 10:55:20 PM CEST 2000
-+ * Modified by:   Pontus Fuchs <pontus.fuchs@tactel.se>
-+ *
-+ *     Copyright (c) 1999, 2000 Pontus Fuchs, All Rights Reserved.
-+ *
-+ *     This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU Lesser General Public
-+ *     License as published by the Free Software Foundation; either
-+ *     version 2 of the License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *     Lesser General Public License for more details.
-+ *
-+ *     You should have received a copy of the GNU Lesser General Public
-+ *     License along with this library; if not, write to the Free Software
-+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *     MA  02111-1307  USA
-+ *
-+ ********************************************************************/
-+
-+#ifndef OBEX_TEST_CABLE_H
-+#define OBEX_TEST_CABLE_H
-+
-+#define CABLE_DEBUG 1
-+
-+
-+#include <termios.h>
-+#include <openobex/obex.h>
-+
-+#ifdef CABLE_DEBUG
-+#define CDEBUG(args...) printf("%s() " __func__, args)
-+#else
-+#define CDEBUG(args...)
-+#endif
-+
-+struct cobex_context
-+{
-+	const char *portname;
-+	int ttyfd;
-+	char inputbuf[500];
-+	struct termios oldtio, newtio;
-+	int r320;
-+};
-+
-+/* User function */
-+struct cobex_context *cobex_open(const char *port, int r320);
-+void cobex_close(struct cobex_context *gt);
-+int cobex_do_at_cmd(struct cobex_context *gt, char *cmd, char *rspbuf, int rspbuflen, int timeout);
-+
-+/* Callbacks */
-+int cobex_handle_input(obex_t *handle, void * userdata, int timeout);
-+int cobex_write(obex_t *self, void * userdata, uint8_t *buffer, int length);
-+int cobex_connect(obex_t *handle, void * userdata);
-+int cobex_disconnect(obex_t *handle, void * userdata);
-+
-+#endif
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_client.c openobex-apps-1.0.0/src/obex_test_client.c
---- openobex-apps-1.0.0-clean/src/obex_test_client.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_client.c	2004-05-12 13:07:24.000000000 +0200
-@@ -370,13 +370,13 @@
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		if(hi == OBEX_HDR_BODY)	{
--		printf(__FUNCTION__ "() Found body\n");
-+		printf("%s() Found body\n", __func__);
- 			body = hv.bs;
- 			body_len = hlen;
- 			break;
- 		}
- 		else	{
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 
-diff -Naur openobex-apps-1.0.0-clean/src/obex_test_server.c openobex-apps-1.0.0/src/obex_test_server.c
---- openobex-apps-1.0.0-clean/src/obex_test_server.c	2002-12-01 18:34:41.000000000 +0100
-+++ openobex-apps-1.0.0/src/obex_test_server.c	2004-05-12 13:07:33.000000000 +0200
-@@ -54,17 +54,17 @@
- 	char *name = NULL;
- 	char *namebuf = NULL;
- 
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		switch(hi)	{
- 		case OBEX_HDR_BODY:
--			printf(__FUNCTION__ "() Found body\n");
-+			printf("%s() Found body\n", __func__);
- 			body = hv.bs;
- 			body_len = hlen;
- 			break;
- 		case OBEX_HDR_NAME:
--			printf(__FUNCTION__ "() Found name\n");
-+			printf("%s() Found name\n", __func__);
- 			if( (namebuf = malloc(hlen / 2)))	{
- 				OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
- 				name = namebuf;
-@@ -72,7 +72,7 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if(!body)	{
-@@ -103,12 +103,12 @@
- 	char *name = NULL;
- 	char *namebuf = NULL;
- 
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		switch(hi)	{
- 		case OBEX_HDR_NAME:
--			printf(__FUNCTION__ "() Found name\n");
-+			printf("%s() Found name\n", __func__);
- 			if( (namebuf = malloc(hlen / 2)))	{
- 				OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
- 				name = namebuf;
-@@ -116,16 +116,16 @@
- 			break;
- 		
- 		default:
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 
- 	if(!name)	{
--		printf(__FUNCTION__ "() Got a GET without a name-header!\n");
-+		printf("%s() Got a GET without a name-header!\n", __func__);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_FOUND, OBEX_RSP_NOT_FOUND);
- 		return;
- 	}
--	printf(__FUNCTION__ "() Got a request for %s\n", name);
-+	printf("%s() Got a request for %s\n", __func__,  name);
- 
- 	buf = easy_readfile(name, &file_size);
- 	if(buf == NULL) {
-@@ -154,7 +154,7 @@
- 
- 	const uint8_t *who = NULL;
- 	int who_len = 0;
--	printf(__FUNCTION__ "()\n");
-+	printf("%s()\n", __func__);
- 
- 	while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen))	{
- 		if(hi == OBEX_HDR_WHO)	{
-@@ -162,7 +162,7 @@
- 			who_len = hlen;
- 		}
- 		else	{
--			printf(__FUNCTION__ "() Skipped header %02x\n", hi);
-+			printf("%s() Skipped header %02x\n", __func__,  hi);
- 		}
- 	}
- 	if (who_len == 6)	{
-@@ -199,7 +199,7 @@
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS);
- 		break;
- 	default:
--		printf(__FUNCTION__ "() Denied %02x request\n", cmd);
-+		printf("%s() Denied %02x request\n", __func__,  cmd);
- 		OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
- 		break;
- 	}
-@@ -224,7 +224,7 @@
- 		break;
- 
- 	default:
--		printf(__FUNCTION__ "() Command (%02x) has now finished\n", obex_cmd);
-+		printf("%s() Command (%02x) has now finished\n", __func__,  obex_cmd);
- 		break;
- 	}
- }
diff --git a/mobile/openobex-apps/obexserver.c b/mobile/openobex-apps/obexserver.c
deleted file mode 100644
index 41e93fad65..0000000000
--- a/mobile/openobex-apps/obexserver.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Simple OpenOBEX server for Bluez+OpenOBEX */
-/* link with libmisc.a from OPENObex-apps and libopenobex from OpenOBEX */
-/* venglin@freebsd.lublin.pl */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <openobex/obex.h>
-
-#define OBEX_PUSH_HANDLE	10
-
-volatile int finished = 0;
-obex_t *handle = NULL;
-
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp);
-
-int main(int argc, char **argv)
-{
-	obex_object_t *object;
-
-	handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
-
-	if (argc == 1)
-	{
-		BtOBEX_ServerRegister(handle, NULL, OBEX_PUSH_HANDLE);
-		printf("Waiting for connection...\n");
-		btobex_accept(handle);
-
-		while (!finished)
-			OBEX_HandleInput(handle, 1);
-	}
-}
diff --git a/net/vpnc/DEPENDS b/net/vpnc/DEPENDS
index 90c64bcaf6..3e32532cba 100755
--- a/net/vpnc/DEPENDS
+++ b/net/vpnc/DEPENDS
@@ -1 +1,2 @@
+runtime_depends iproute2 &&
 depends  libgcrypt
diff --git a/net/vpnc/HISTORY b/net/vpnc/HISTORY
index 69c63361a8..e535c89078 100644
--- a/net/vpnc/HISTORY
+++ b/net/vpnc/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: runtime_depends iproute2 (ip)
+
 2008-08-18 Mathieu Lonjaret <lejatorn@sourcemage.org>
 	* DETAILS: 0.5.1 update 
 
diff --git a/net/vpnc/vpnc-0.3.3.tar.gz.sig b/net/vpnc/vpnc-0.3.3.tar.gz.sig
deleted file mode 100644
index 0b6aa97592..0000000000
--- a/net/vpnc/vpnc-0.3.3.tar.gz.sig
+++ /dev/null
diff --git a/perl-cpan/dbd-sybase/DEPENDS b/perl-cpan/dbd-sybase/DEPENDS
index b15da60ca0..d7b336471a 100755
--- a/perl-cpan/dbd-sybase/DEPENDS
+++ b/perl-cpan/dbd-sybase/DEPENDS
@@ -1,3 +1,3 @@
 depends  perl        &&
 depends  dbi         &&
-depends  sybase-ocsd
+depends  sybase-ocsd "" "" z-rejected
diff --git a/perl-cpan/dbd-sybase/HISTORY b/perl-cpan/dbd-sybase/HISTORY
index c610d7decd..e96871dc36 100644
--- a/perl-cpan/dbd-sybase/HISTORY
+++ b/perl-cpan/dbd-sybase/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
+	* DEPENDS: need z-rejected grimoire
+
 2008-01-07 Vlad Glagolev <stealth@sourcemage.org>
 	* BUILD: cleaned up
 
diff --git a/perl-cpan/perl-error/DETAILS b/perl-cpan/perl-error/DETAILS
index 9171ae318d..f4b2e16853 100755
--- a/perl-cpan/perl-error/DETAILS
+++ b/perl-cpan/perl-error/DETAILS
@@ -1,9 +1,9 @@
            SPELL=perl-error
-         VERSION=0.17014
+         VERSION=0.17015
           SOURCE=Error-$VERSION.tar.gz
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SH/SHLOMIF/$SOURCE
-     SOURCE_HASH=sha512:9dce9ce4982fe03f43782765648a7c890cdad551efe923e61930488bad5b9a1040b3ab9af27e848df50d8d396f6fb5a2eedebfe09472de619168e6b84fac4eb5
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Error-$VERSION
+     SOURCE_HASH=sha512:f1606bab1aa7e2b8c58d9e6e03d7f2a9b197f6ab670d6e5e71cf17a9076144fc1e3e063cf5f7561f41076c7b92c384c68d780f4a7c68bb678d544665598993b9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Error-$VERSION"
         WEB_SITE=http://search.cpan.org/~shlomif/Error/
       LICENSE[0]=ART
          ENTERED=20070526
diff --git a/perl-cpan/perl-error/HISTORY b/perl-cpan/perl-error/HISTORY
index 8256e0b05c..252872d255 100644
--- a/perl-cpan/perl-error/HISTORY
+++ b/perl-cpan/perl-error/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.17015
+
 2008-07-01 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.17014, use PERL_CPAN_URL, fixed desc
 
diff --git a/printer/efax-gtk/DEPENDS b/printer/efax-gtk/DEPENDS
index a389c96612..93dcb7be5a 100755
--- a/printer/efax-gtk/DEPENDS
+++ b/printer/efax-gtk/DEPENDS
@@ -1,12 +1,13 @@
 depends  gtk+2                   &&
+depends  libsigc++2  &&
 depends  POSTSCRIPT-INTERPRETER  &&
 
+optional_depends  mailx                  \
+                  ''                     \
+                  ''                     \
+                  'for mail_fax script'  &&
+
 optional_depends  gettext                        \
                   '--enable-nls'                 \
                   '--disable-nls'                \
-                  'for Native Language Support'  &&
-
-optional_depends  nail                   \
-                  ''                     \
-                  ''                     \
-                  'for mail_fax script'
+                  'for Native Language Support'
diff --git a/printer/efax-gtk/DETAILS b/printer/efax-gtk/DETAILS
index 7fc01d6102..02b11844b8 100755
--- a/printer/efax-gtk/DETAILS
+++ b/printer/efax-gtk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=efax-gtk
-         VERSION=3.0.10
+         VERSION=3.0.17
           SOURCE=$SPELL-$VERSION.src.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      SOURCE_HASH=sha512:7385bc577d8fb9f9982ac118684b49935e815689a19cbe96f534f1dcc14135707aaf468bc71b62aef1b31b75f89f6c63751057c8e045d60f1465b4ac2d3d4d79
         WEB_SITE=http://efax-gtk.sourceforge.net/
          ENTERED=20050108
       LICENSE[0]=GPL
diff --git a/printer/efax-gtk/HISTORY b/printer/efax-gtk/HISTORY
index 3bc99a669c..89e74b29b7 100644
--- a/printer/efax-gtk/HISTORY
+++ b/printer/efax-gtk/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
+	* DEPENDS: nail -> mailx; depends on libsigc++2
+	* DETAILS: update to 3.0.17
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/printer/efax-gtk/efax-gtk-3.0.10.src.tgz.sig b/printer/efax-gtk/efax-gtk-3.0.10.src.tgz.sig
deleted file mode 100644
index 31553084d1..0000000000
--- a/printer/efax-gtk/efax-gtk-3.0.10.src.tgz.sig
+++ /dev/null
diff --git a/printer/foomatic-db-hpijs/DETAILS b/printer/foomatic-db-hpijs/DETAILS
index a343261602..be938b8638 100755
--- a/printer/foomatic-db-hpijs/DETAILS
+++ b/printer/foomatic-db-hpijs/DETAILS
@@ -1,13 +1,12 @@
            SPELL=foomatic-db-hpijs
-         VERSION=1.4-1
-          SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+         VERSION=snapshot
+          SOURCE=${SPELL}-current.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-current
    SOURCE_URL[0]=http://www.linuxprinting.org/download/foomatic/${SOURCE}
         WEB_SITE=http://www.linuxprinting.org/foomatic.html
       LICENSE[0]=GPL
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+   SOURCE_IGNORE=unversioned
          ENTERED=20020405
-         UPDATED=20020420
         KEYWORDS="printer xml"
            SHORT="Foomatic printing system's XML data generators for HP's HPIJS driver."
 cat << EOF
diff --git a/printer/foomatic-db-hpijs/FINAL b/printer/foomatic-db-hpijs/FINAL
new file mode 100755
index 0000000000..b94d754dd8
--- /dev/null
+++ b/printer/foomatic-db-hpijs/FINAL
@@ -0,0 +1,3 @@
+cd             $BUILD_DIRECTORY     &&
+rm             foomatic-db-hpijs-current  &&
+rm_source_dir  $CURRENT_RELEASE
diff --git a/printer/foomatic-db-hpijs/HISTORY b/printer/foomatic-db-hpijs/HISTORY
index 5ffe754d13..6a7e4886dd 100644
--- a/printer/foomatic-db-hpijs/HISTORY
+++ b/printer/foomatic-db-hpijs/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
+	* DETAILS: use the current version which is only available as snapshots
+
 2008-08-15 Ethan Grammatikidis <eekee57@fastmail.fm>
 	* DEPENDS: hpijs => hplip
 
diff --git a/printer/foomatic-db-hpijs/PRE_BUILD b/printer/foomatic-db-hpijs/PRE_BUILD
new file mode 100755
index 0000000000..5eabd8d6f3
--- /dev/null
+++ b/printer/foomatic-db-hpijs/PRE_BUILD
@@ -0,0 +1,5 @@
+CURRENT_RELEASE=`tar tzf ${SOURCE_CACHE}/foomatic-db-hpijs-current.tar.gz | head -1 | cut -d / -f 1`  &&
+mk_source_dir  ${BUILD_DIRECTORY}/${CURRENT_RELEASE}                                            &&
+unpack_file                                                              &&
+cd             ${BUILD_DIRECTORY}                                                               &&
+ln  -s         ${CURRENT_RELEASE}  foomatic-db-hpijs-current
diff --git a/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig b/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig
deleted file mode 100644
index 506b3f6788..0000000000
--- a/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig
+++ /dev/null
diff --git a/science/xephem/CONFIGURE b/science/xephem/CONFIGURE
index 44d74aae17..1ce5d18311 100755
--- a/science/xephem/CONFIGURE
+++ b/science/xephem/CONFIGURE
@@ -1,8 +1 @@
-if ! grep -q CONFIGURED ${SPELL_CONFIG}
-then
-  if    query  "Do you want the documentation (v 3.5.2)?" y
-  then  echo   'doc="y"' >> ${SPELL_CONFIG}
-  fi
-
-  echo  "CONFIGURED='y'"  >>  ${SPELL_CONFIG}
-fi
+config_query X_DOCS "Do you want the documentation (v 3.5.2)?" y
diff --git a/science/xephem/HISTORY b/science/xephem/HISTORY
index b26d14fe46..46d2b7ace9 100644
--- a/science/xephem/HISTORY
+++ b/science/xephem/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* INSTALL, CONFIGURE: removed bit rot
+	* INSTALL: don't install to /usr/local #11507
+
 2007-03-24 Jeremy Blosser <jblosser-smgl@firinn.org>
 	* DEPENDS: Add groff, fix bug 11617.
 
diff --git a/science/xephem/INSTALL b/science/xephem/INSTALL
index ad0b5db2b3..ac26f6a8ce 100755
--- a/science/xephem/INSTALL
+++ b/science/xephem/INSTALL
@@ -1,18 +1,14 @@
-cp xephem /usr/bin                                                      &&
-mkdir  -p  /etc/xephem                                                  &&
-cp -R auxil /etc/xephem                                                 && 
-cp -R catalogs /etc/xephem                                              &&
-cp -R fifos /etc/xephem                                                 && 
-cp -R fits /etc/xephem                                                  &&
-cp -R help /usr/local/xephem                                            &&
-cp -R gallery /usr/local/xephem                                         &&
-cp -R lo /usr/local/xephem                                         &&
-touch /usr/lib/X11/app-defaults/XEphem                                  &&
-echo "XEphem.ShareDir: /etc/xephem"  > /usr/lib/X11/app-defaults/XEphem &&
-cp xephem.man /usr/man/man1/xephem.1                                    &&
+cp xephem "$INSTALL_ROOT"/usr/bin                                                      &&
+mkdir  -p  "$INSTALL_ROOT"/etc/xephem                                                  &&
+cp -R auxil catalogs fifos fits "$INSTALL_ROOT"/etc/xephem                             &&
+mkdir -p "$INSTALL_ROOT"/usr/share/xephem                                              &&
+cp -R help gallery lo "$INSTALL_ROOT"/usr/share/xephem                                 &&
+mkdir -p "$INSTALL_ROOT"/usr/lib/X11/app-defaults/                                  &&
+echo "XEphem.ShareDir: $TRACK_ROOT/etc/xephem"  > "$INSTALL_ROOT"/usr/lib/X11/app-defaults/XEphem &&
+cp xephem.man "$INSTALL_ROOT"/usr/man/man1/xephem.1                                    &&
 
-if grep -q 'doc="y"'  ${SPELL_CONFIG}
+if [[ X_DOCS == "y" ]]
 then
-  mkdir  -p  /usr/doc/xephem                                            &&
-  cp /var/spool/sorcery/${SPELL}-3.5.2.pdf /usr/doc/xephem
+  mkdir  -p  "$INSTALL_ROOT"/usr/share/doc/xephem                                       &&
+  cp "$SOURCE_CACHE"/$SPELL-3.5.2.pdf "$INSTALL_ROOT"/usr/share/doc/xephem
 fi
diff --git a/smgl/bashdoc/DETAILS b/smgl/bashdoc/DETAILS
index f996d85868..d9a62da97a 100755
--- a/smgl/bashdoc/DETAILS
+++ b/smgl/bashdoc/DETAILS
@@ -2,7 +2,7 @@
          VERSION=0.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.sourcemage.org/distro/projects/bashdoc/$SOURCE
+   SOURCE_URL[0]=http://download.sourcemage.org/projects/bashdoc/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_KEY
         WEB_SITE=http://wiki.sourcemage.org/bashdoc
          ENTERED=20040223
diff --git a/smgl/bashdoc/HISTORY b/smgl/bashdoc/HISTORY
index 8428b0f167..ab4ddc35d6 100644
--- a/smgl/bashdoc/HISTORY
+++ b/smgl/bashdoc/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Robert Figura <template@sourcemage.org>
+	* DETAILS: fixed SOURCE_URL[0]
+
 2008-04-14 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* INSTALL: removed incorporated code
 	* DETAILS: Fixed SOURCE_URL[0]
diff --git a/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig b/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig
deleted file mode 100644
index e0fe03cd6b..0000000000
--- a/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig
+++ /dev/null
diff --git a/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig b/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig
new file mode 100644
index 0000000000..28b56bfbe7
--- /dev/null
+++ b/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig
diff --git a/utils/sunbird/DETAILS b/utils/sunbird/DETAILS
index f0d74805a7..e7ded8ab4a 100755
--- a/utils/sunbird/DETAILS
+++ b/utils/sunbird/DETAILS
@@ -1,5 +1,5 @@
            SPELL=sunbird
-         VERSION=0.7
+         VERSION=0.8
           SOURCE=lightning-$SPELL-$VERSION-source.tar.bz2
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/calendar/$SPELL/releases/${VERSION}/source/${SOURCE}
       SOURCE_GPG="gurus.gpg:$SOURCE.sig"
diff --git a/utils/sunbird/HISTORY b/utils/sunbird/HISTORY
index b3ca002591..04d6473cf1 100644
--- a/utils/sunbird/HISTORY
+++ b/utils/sunbird/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS, PRE_BUILD: updated to 0.8
+	* gcc43.patch: removed
+
 2008-03-22 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gcc43.patch
 	* gcc43.patch: Patch to compile with gcc 4.3.0
diff --git a/utils/sunbird/PRE_BUILD b/utils/sunbird/PRE_BUILD
index 5d9f210158..98e402fd6a 100755
--- a/utils/sunbird/PRE_BUILD
+++ b/utils/sunbird/PRE_BUILD
@@ -1,7 +1,6 @@
 default_pre_build  &&
 cd  $SOURCE_DIRECTORY  &&
 
-patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch                           &&
 patch -p0 < $SCRIPT_DIRECTORY/000_add-missing-LDFLAGS.patch         &&
 patch -p1 < $SCRIPT_DIRECTORY/032_firefox-2.0_ppc64-1.patch         &&
 patch -p1 < $SCRIPT_DIRECTORY/033_firefox-2.0_ppc_powerpc.patch     &&
diff --git a/utils/sunbird/gcc43.patch b/utils/sunbird/gcc43.patch
deleted file mode 100644
index 6bda1347ab..0000000000
--- a/utils/sunbird/gcc43.patch
+++ /dev/null
@@ -1,1618 +0,0 @@
-#
-# From https://bugzilla.mozilla.org/show_bug.cgi?id=416463
-#
-Index: xpcom/obsolete/component/nsFileSpecImpl.cpp
-===================================================================
-RCS file: xpcom/obsolete/component/nsFileSpecImpl.cpp
-diff -N xpcom/obsolete/component/nsFileSpecImpl.cpp
---- xpcom/obsolete/component/nsFileSpecImpl.cpp	18 Apr 2004 14:18:15 -0000	1.2
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,857 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *   Pierre Phaneuf <pp@ludusdesign.com>
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles alone.
--
--#include "nsIFileStream.h"
--#include "nsFileStream.h"
--
--#include "nsILocalFile.h"
--
--#include "prmem.h"
--
--NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
--
--#ifdef NS_DEBUG
--#define TEST_OUT_PTR(p) \
--	if (!(p)) \
--		return NS_ERROR_NULL_POINTER;
--#else
--#define TEST_OUT_PTR(p)
--#endif
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::nsFileSpecImpl()
--//----------------------------------------------------------------------------------------
--	:	mInputStream(nsnull)
--	,	mOutputStream(nsnull)
--{
--//    NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
--
--}
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
--//----------------------------------------------------------------------------------------
--	:	mFileSpec(inSpec)
--	,	mInputStream(nsnull)
--	,	mOutputStream(nsnull)
--{
--//    NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!");
--
--}
--
--//----------------------------------------------------------------------------------------
--nsFileSpecImpl::~nsFileSpecImpl()
--//----------------------------------------------------------------------------------------
--{
--	CloseStream();
--}
--
--//----------------------------------------------------------------------------------------
--/* static */
--nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec, nsIFileSpec** result)
--//----------------------------------------------------------------------------------------
--{
--	nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
--	if (!it)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return it->QueryInterface(NS_GET_IID(nsIFileSpec), (void **) result);
--} // nsFileSpecImpl::MakeInterface
--
--#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
--//----------------------------------------------------------------------------------------
--{
--	if (original) {
--        nsresult rv = ((nsIFileSpec *)original)->GetFileSpec( &mFileSpec);
--        if (NS_SUCCEEDED( rv))
--            return mFileSpec.Error();
--        else
--            return( rv);
--    }
--    else
--        return( NS_ERROR_FAILURE);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
--                                        PRBool *_retval)
--{
--  *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
--  return mFileSpec.Error();
--}
--//----------------------------------------------------------------------------------------
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aURLString)
--	if (mFileSpec.Failed())
--		return mFileSpec.Error();
--	nsFileURL url(mFileSpec);
--	*aURLString = nsCRT::strdup(url.GetURLString());
--	if (!*aURLString)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--} // nsFileSpecImpl::GetURLString
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec = nsFileURL(aURLString);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char * *aUnixStyleFilePath)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aUnixStyleFilePath)
--	if (mFileSpec.Failed())
--		return mFileSpec.Error();
--	nsFilePath path(mFileSpec);
--	*aUnixStyleFilePath = nsCRT::strdup((const char*) path);
--	if (!*aUnixStyleFilePath)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char * aUnixStyleFilePath)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec = nsFilePath(aUnixStyleFilePath);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char * *aPersistentDescriptorString)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aPersistentDescriptorString)
--	if (mFileSpec.Failed())
--		return mFileSpec.Error();
--	nsPersistentFileDescriptor desc(mFileSpec);
--  nsCAutoString data;
--	desc.GetData(data);
--	*aPersistentDescriptorString = ToNewCString(data);
--	if (!*aPersistentDescriptorString)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char * aPersistentDescriptorString)
--//----------------------------------------------------------------------------------------
--{
--	nsPersistentFileDescriptor desc(mFileSpec);
--	desc.SetData(nsDependentCString(aPersistentDescriptorString));
--	mFileSpec = desc;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aNativePath)
--	if (mFileSpec.Failed())
--		return mFileSpec.Error();
--	*aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
--	if (!*aNativePath)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec = aNativePath;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aNSPRPath)
--	if (mFileSpec.Failed())
--		return mFileSpec.Error();
--	nsNSPRPath path(mFileSpec);
--	*aNSPRPath = nsCRT::strdup((const char*) path);
--	if (!*aNSPRPath)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Error()
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.Valid();
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	*_retval = mFileSpec.Failed();
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aLeafName)
--	*aLeafName = mFileSpec.GetLeafName();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec.SetLeafName(aLeafName);
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aParent)
--	nsFileSpec parent;
--	mFileSpec.GetParent(parent);
--	return MakeInterface(parent, aParent);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec.MakeUnique();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char *suggestedName)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec.MakeUnique(suggestedName);
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aModDate)
--	nsFileSpec::TimeStamp stamp;
--	mFileSpec.GetModDate(stamp);
--	*aModDate = stamp;
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.ModDateChanged(oldStamp);
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.IsDirectory();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.IsFile();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.Exists();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.IsHidden();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = mFileSpec.IsSymlink();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
--//----------------------------------------------------------------------------------------
--{
--    PRBool ignore;
--	return mFileSpec.ResolveSymlink(ignore);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aFileSize)
--	*aFileSize = mFileSpec.GetFileSize();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aDiskSpaceAvailable)
--	*aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char *relativePath)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec += relativePath;
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Touch()
--//----------------------------------------------------------------------------------------
--{
--	// create an empty file, like the UNIX touch command.
--	nsresult rv;
--	rv = OpenStreamForWriting();
--	if (NS_FAILED(rv)) return rv;
--	rv = CloseStream();
--	return rv;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CreateDir()
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec.CreateDir();
--	return mFileSpec.Error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Delete(PRBool aRecursive)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec.Delete(aRecursive);
--	return mFileSpec.Error();
--}
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Truncate(PRInt32 aNewLength)
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.Truncate(aNewLength);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.Rename(newLeafName);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.CopyToDir(FILESPEC(newParentDir));
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.MoveToDir(FILESPEC(newParentDir));
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
--//----------------------------------------------------------------------------------------
--{
--	return mFileSpec.Execute(args);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
--//----------------------------------------------------------------------------------------
--{
--	if (mInputStream || mOutputStream)
--		return NS_ERROR_FAILURE;
--	return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
--//----------------------------------------------------------------------------------------
--{
--	if (mInputStream || mOutputStream)
--		return NS_ERROR_FAILURE;
--	return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
--//----------------------------------------------------------------------------------------
--{
--	if (mInputStream || mOutputStream)
--		return NS_ERROR_FAILURE;
--	nsresult result = NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
--	if (NS_SUCCEEDED(result))
--		result = NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
--	return result;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::CloseStream()
--//----------------------------------------------------------------------------------------
--{
--	NS_IF_RELEASE(mInputStream);
--	NS_IF_RELEASE(mOutputStream);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = (mInputStream || mOutputStream);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	if (!mInputStream) {
--		nsresult rv = OpenStreamForReading();
--		if (NS_FAILED(rv)) return rv;
--	}
--	*_retval = mInputStream;
--	NS_IF_ADDREF(mInputStream);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	if (!mOutputStream) {
--		nsresult rv = OpenStreamForWriting();
--		if (NS_FAILED(rv)) return rv;
--	}
--	*_retval = mOutputStream;
--	NS_IF_ADDREF(mOutputStream);
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
--//----------------------------------------------------------------------------------------
--{
--	nsresult rv = OpenStreamForWriting();
--	if (NS_FAILED(rv)) return rv;
--	PRInt32 count;
--	rv = Write(inString, PL_strlen(inString), &count);
--	nsresult rv2 = CloseStream();
--	return NS_FAILED(rv) ? rv : rv2;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	*_retval = nsnull;
--	nsresult rv = OpenStreamForReading();
--	if (NS_FAILED(rv)) return rv;
--	PRInt32 theSize;
--	rv = GetFileSize((PRUint32*)&theSize);
--	if (NS_SUCCEEDED(rv))
--		rv = Read(_retval, theSize, &theSize);
--	if (NS_SUCCEEDED(rv))
--		(*_retval)[theSize] = 0;
--	nsresult rv2 = CloseStream();
--	return NS_FAILED(rv) ? rv : rv2;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(aFileSpec)
--	*aFileSpec = mFileSpec;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Equals(nsIFileSpec *spec, PRBool *result)
--//----------------------------------------------------------------------------------------
--{
--	nsresult rv;
--
--        if (!result || !spec) return NS_ERROR_NULL_POINTER;
--
--        nsFileSpec otherSpec;
--
--        rv = spec->GetFileSpec(&otherSpec);
--        if (NS_FAILED(rv)) return rv;
--
--        if (mFileSpec == otherSpec) {
--                *result = PR_TRUE;
--        }
--        else {
--                *result = PR_FALSE;
--        }
--
--        return NS_OK;
--}    
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
--//----------------------------------------------------------------------------------------
--{
--	mFileSpec = aFileSpec;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	if (!mInputStream)
--		return NS_ERROR_NULL_POINTER;
--	nsInputFileStream s(mInputStream);
--	*_retval = s.eof();
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount, PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	TEST_OUT_PTR(buffer)
--	if (!mInputStream) {
--		nsresult rv = OpenStreamForReading();
--		if (NS_FAILED(rv)) return rv;
--	}
--	if (!*buffer)
--		*buffer = (char*)PR_Malloc(requestedCount + 1);
--	if (!mInputStream)
--		return NS_ERROR_NULL_POINTER;
--	nsInputFileStream s(mInputStream);
--	*_retval = s.read(*buffer, requestedCount);
--	return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize, PRBool *wasTruncated)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(wasTruncated)
--	TEST_OUT_PTR(line)
--	if (!mInputStream) {
--		nsresult rv = OpenStreamForReading();
--		if (NS_FAILED(rv)) return rv;
--	}
--	if (!*line)
--		*line = (char*)PR_Malloc(bufferSize + 1);
--	if (!mInputStream)
--		return NS_ERROR_NULL_POINTER;
--	nsInputFileStream s(mInputStream);
--	*wasTruncated = !s.readline(*line, bufferSize);
--	return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32 requestedCount, PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	//if (!mOutputStream)
--	//	return NS_ERROR_NULL_POINTER;
--	if (!mOutputStream) {
--		nsresult rv = OpenStreamForWriting();
--		if (NS_FAILED(rv))
--			return rv;
--	}
--	nsOutputFileStream s(mOutputStream);
--	*_retval = s.write(data, requestedCount);
--	return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Flush()
--//----------------------------------------------------------------------------------------
--{
--	if (!mOutputStream)
--		return NS_ERROR_NULL_POINTER;
--	nsOutputFileStream s(mOutputStream);
--	s.flush();
--	return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
--//----------------------------------------------------------------------------------------
--{
--	nsresult result = NS_OK;
--	if (mOutputStream)
--	{
--		nsOutputFileStream os(mOutputStream);
--		os.seek(offset);
--		result = os.error();
--	}
--	if (NS_SUCCEEDED(result) && mInputStream)
--	{
--		nsInputFileStream is(mInputStream);
--		is.seek(offset);
--		result = is.error();
--	}
--	return result;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	if (!mInputStream)
--		return NS_ERROR_NULL_POINTER;
--	nsInputFileStream s(mInputStream);
--	*_retval = s.tell();
--	return s.error();
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::EndLine()
--//----------------------------------------------------------------------------------------
--{
--	nsOutputFileStream s(mOutputStream);
--	s << nsEndl;
--	return s.error();
--}
--
--NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
--
--//----------------------------------------------------------------------------------------
--nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
--//----------------------------------------------------------------------------------------
--	: mDirectoryIterator(nsnull)
--{
--}
--
--//----------------------------------------------------------------------------------------
--nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
--//----------------------------------------------------------------------------------------
--{
--	delete mDirectoryIterator;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool resolveSymlink)
--//----------------------------------------------------------------------------------------
--{
--	delete mDirectoryIterator;
--	mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent), resolveSymlink);
--	if (!mDirectoryIterator)
--		return NS_ERROR_OUT_OF_MEMORY;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
--//----------------------------------------------------------------------------------------
--{
--	TEST_OUT_PTR(_retval)
--	if (!mDirectoryIterator)
--		return NS_ERROR_NULL_POINTER;
--	*_retval = mDirectoryIterator->Exists();
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
--//----------------------------------------------------------------------------------------
--{
--	if (!mDirectoryIterator)
--		return NS_ERROR_NULL_POINTER;
--	(*mDirectoryIterator)++;
--	return NS_OK;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec * *aCurrentSpec)
--//----------------------------------------------------------------------------------------
--{
--	if (!mDirectoryIterator)
--		return NS_ERROR_NULL_POINTER;
--	return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(), aCurrentSpec);
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsDirectoryIteratorImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec)
--//----------------------------------------------------------------------------------------
--{
--  if (aIFileSpec == NULL)
--    return NS_ERROR_NULL_POINTER;
--
--	nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
--  if (!it)
--		return NS_ERROR_OUT_OF_MEMORY;
--
--  nsresult rv = it->QueryInterface(aIID, aIFileSpec);
--  if (NS_FAILED(rv))
--  {
--    delete it;
--    return rv;
--  }
--  return rv;
--}
--
--//----------------------------------------------------------------------------------------
--NS_IMETHODIMP nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec)
--//----------------------------------------------------------------------------------------
--{
--  if (aIFileSpec == NULL)
--    return NS_ERROR_NULL_POINTER;
--
--	nsFileSpecImpl* it = new nsFileSpecImpl;
--  if (!it)
--		return NS_ERROR_OUT_OF_MEMORY;
--
--  nsresult rv = it->QueryInterface(aIID, aIFileSpec);
--  if (NS_FAILED(rv))
--  {
--    delete it;
--    return rv;
--  }
--  return rv;
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec **result)
--//----------------------------------------------------------------------------------------
--{
--	if (!result)
--		return NS_ERROR_NULL_POINTER;
--
--	return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpec(nsIFileSpec** result)
--//----------------------------------------------------------------------------------------
--{
--	return nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec), (void**)result);
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewFileSpecFromIFile(nsIFile *aFile, nsIFileSpec **result)
--//----------------------------------------------------------------------------------------
--{
--	 nsresult rv = nsFileSpecImpl::Create(nsnull, NS_GET_IID(nsIFileSpec), (void**)result);
--     if (NS_FAILED(rv)) return rv;
--
--     nsCAutoString path;
--     rv = aFile->GetNativePath(path);
--     if (NS_FAILED(rv)) return rv;
--
--     rv = (*result)->SetNativePath(path.get());
--     if (NS_FAILED(rv))
--         NS_RELEASE(*result);
--     return rv;
--}
--
--//----------------------------------------------------------------------------------------
--nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
--//----------------------------------------------------------------------------------------
--{
--	return nsDirectoryIteratorImpl::Create(nsnull, NS_GET_IID(nsIDirectoryIterator), (void**)result);
--}
-Index: xpcom/obsolete/component/nsFileSpecImpl.h
-===================================================================
-RCS file: xpcom/obsolete/component/nsFileSpecImpl.h
-diff -N xpcom/obsolete/component/nsFileSpecImpl.h
---- xpcom/obsolete/component/nsFileSpecImpl.h	18 Apr 2004 14:18:15 -0000	1.3
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,116 +0,0 @@
--/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#ifndef _FILESPECIMPL_H_
--#define _FILESPECIMPL_H_
--
--#include "nscore.h"
--#include "nsIFileSpec.h" 
--#include "nsFileSpec.h"
--
--//========================================================================================
--class nsFileSpecImpl
--//========================================================================================
--	: public nsIFileSpec
--{
--
-- public: 
--
--	NS_DECL_ISUPPORTS
--
--  NS_DECL_NSIFILESPEC
--
--	//----------------------
--	// COM Cruft
--	//----------------------
--
--	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
--
--	//----------------------
--	// Implementation
--	//----------------------
--
--	nsFileSpecImpl();
--	nsFileSpecImpl(const nsFileSpec& inSpec);
--	static nsresult MakeInterface(const nsFileSpec& inSpec, nsIFileSpec** outSpec);
--
--	//----------------------
--	// Data
--	//----------------------
--
--	nsFileSpec							mFileSpec;
--	nsIInputStream*					mInputStream;
--	nsIOutputStream*				mOutputStream;
--
--private:
--	~nsFileSpecImpl();
--}; // class nsFileSpecImpl
--
--//========================================================================================
--class nsDirectoryIteratorImpl
--//========================================================================================
--	: public nsIDirectoryIterator
--{
--
--public:
--
--	nsDirectoryIteratorImpl();
--
--	NS_DECL_ISUPPORTS
--
--	NS_IMETHOD Init(nsIFileSpec *parent, PRBool resolveSymlink);
--
--	NS_IMETHOD Exists(PRBool *_retval);
--
--	NS_IMETHOD Next();
--
--	NS_IMETHOD GetCurrentSpec(nsIFileSpec * *aCurrentSpec);
--
--	//----------------------
--	// COM Cruft
--	//----------------------
--
--	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
--
--private:
--	~nsDirectoryIteratorImpl();
--
--protected:
--	nsDirectoryIterator*					mDirectoryIterator;
--}; // class nsDirectoryIteratorImpl
--
--#endif // _FILESPECIMPL_H_
-Index: xpcom/obsolete/component/nsIRegistry.idl
-===================================================================
-RCS file: xpcom/obsolete/component/nsIRegistry.idl
-diff -N xpcom/obsolete/component/nsIRegistry.idl
---- xpcom/obsolete/component/nsIRegistry.idl	18 Apr 2004 14:18:15 -0000	1.2
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,186 +0,0 @@
--/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org Code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1999
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--#include "nsISupports.idl"
--#include "nsIEnumerator.idl"
--
--interface nsIFile;
--
--typedef PRUint32 nsRegistryKey;
--typedef long     nsWellKnownRegistry;
--
--[scriptable,uuid(5D41A440-8E37-11d2-8059-00600811A9C3)]
--interface nsIRegistry : nsISupports
--{
--    const long None = 0;
--    const long Users = 1;
--    const long Common = 2;
--    const long CurrentUser = 3;
--
--    const long ApplicationComponentRegistry = 1;
--    const long ApplicationRegistry = 2;
--
--    // Dont use this one. This for internal use only.
--    const long ApplicationCustomRegistry = -1;
--
--    void open(in nsIFile regFile);
--    void openWellKnownRegistry(in nsWellKnownRegistry regid);
--
--    void flush();
--    boolean isOpen();
--    
--    nsRegistryKey addKey(in nsRegistryKey baseKey, in wstring keyname);
--    nsRegistryKey getKey(in nsRegistryKey baseKey, in wstring keyname);
--    void removeKey(in nsRegistryKey baseKey, in wstring keyname);
--
--    wstring getString(in nsRegistryKey baseKey, in wstring valname);
--    void setString(in nsRegistryKey baseKey, in wstring valname, in wstring value);
--
--    string getStringUTF8(in nsRegistryKey baseKey, in string path);
--    void setStringUTF8(in nsRegistryKey baseKey, in string path, in string value);
--
--    void getBytesUTF8(in nsRegistryKey baseKey, in string path, out PRUint32 length, [retval, array, size_is(length)] out PRUint8 valueArray);
--    void setBytesUTF8(in nsRegistryKey baseKey, in string path, in PRUint32 length, [array, size_is(length)] in PRUint8 valueArray);
--    PRInt32 getInt(in nsRegistryKey baseKey, in string path);
--    void setInt(in nsRegistryKey baseKey, in string path, in PRInt32 value);
--    PRInt64 getLongLong(in nsRegistryKey baseKey, in string path);
--    void setLongLong(in nsRegistryKey baseKey, in string path, inout PRInt64 value);
--
--    /**
--     * addSubtree() and friends need to be renamed to addKeyUTF8().
--     * If you are using these forms make sure you pass UTF8 data
--     */
--    nsRegistryKey addSubtree(in nsRegistryKey baseKey, in string path);
--    void removeSubtree(in nsRegistryKey baseKey, in string path);
--    nsRegistryKey getSubtree(in nsRegistryKey baseKey, in string path);
--
--    nsRegistryKey addSubtreeRaw(in nsRegistryKey baseKey, in string path);
--    void removeSubtreeRaw(in nsRegistryKey baseKey, in string path);
--    nsRegistryKey getSubtreeRaw(in nsRegistryKey baseKey, in string path);
--
--    nsIEnumerator enumerateSubtrees(in nsRegistryKey baseKey);
--    nsIEnumerator enumerateAllSubtrees(in nsRegistryKey baseKey);
--    nsIEnumerator enumerateValues(in nsRegistryKey baseKey);
--    
--    const unsigned long String = 1;
--    const unsigned long Int32 = 2;
--    const unsigned long Bytes = 3;
--    const unsigned long File = 4;
--    
--    unsigned long getValueType(in nsRegistryKey baseKey, in string path);
--    PRUint32 getValueLength(in nsRegistryKey baseKey, in string path);
--    void deleteValue(in nsRegistryKey baseKey, in string path);
--
--    /**
--     * escapeKey() takes arbitrary binary data and converts it into
--     * valid ASCII which can be used as registry key or value names
--     */
--    void escapeKey([array, size_is(length)] in PRUint8 key, in PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)] out PRUint8 escaped); 
--    void unescapeKey([array, size_is(length)] in PRUint8 escaped, in PRUint32 terminator, inout PRUint32 length, [retval, array, size_is(length)] out PRUint8 key); 
--
--    attribute string currentUserName;
--
--    void pack();
--};
--
--[scriptable, uuid(8cecf236-1dd2-11b2-893c-f9848956eaec)]
--interface nsIRegistryEnumerator : nsIEnumerator
--{
--    void currentItemInPlaceUTF8(out nsRegistryKey key,
--                                [shared, retval] out string item);
--};
--
--[scriptable, uuid(D1B54831-AC07-11d2-805E-00600811A9C3)]
--interface nsIRegistryNode : nsISupports
--{
--    readonly attribute string nameUTF8;
--    readonly attribute wstring name;
--    readonly attribute nsRegistryKey key;
--};
--
--[scriptable,uuid(5316C380-B2F8-11d2-A374-0080C6F80E4B)]
--interface nsIRegistryValue : nsISupports
--{
--    readonly attribute wstring name;
--    readonly attribute string nameUTF8;
--    readonly attribute unsigned long type;
--    readonly attribute PRUint32 length;
--};
--
--[uuid(3A15FC88-7A61-4Ab4-8E58-31E95fAB3DA8)]
--/**
-- * It sucks that nsIRegistry has to always allocate and return
-- * strings. nsIRegistryGetter adds in interfaces for non allocating getters
-- * to registry values.
-- */
--interface nsIRegistryGetter : nsISupports
--{
--    /**
--     * Get a string value of attribute valname in widestring or utf8 format
--     *
--     * @return
--     *  NS_OK on success.
--     *    buf has the string value copied into it. length is NOT changed.
--     *  NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
--     *    length is updated to actual length in chars including
--     *    terminating NULL and buf will be unchanged.
--     *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
--     *    length undefined.
--     *  various failure codes otherwise. buf and length wont be updated.
--     */
--    void getStringUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
--                                 inout char buf, inout PRUint32 length);
--
--    /**
--     * Get a a byte array value of attribute valname
--     *
--     * @return
--     *  NS_OK on success. buf has the string value copied into it.
--     *    length is updated to actual number of bytes copied into buf.
--     *  NS_ERROR_REG_BUFFER_TOO_SMALL if not enough buffer space.
--     *    length is updated to actual length in PRUint8s including
--     *    terminating NULL and buf will be unchanged.
--     *  NS_ERROR_FAILURE if an unknown error happened. state of buf and
--     *    length undefined.
--     *  various other failure codes otherwise. buf and length wont be updated.
--     */
--    void getBytesUTF8IntoBuffer(in nsRegistryKey baseKey, in string path,
--                                inout PRUint8 buf, inout PRUint32 length);
--};
--
--%{ C++
--#include "nsIRegistryUtils.h"
--%}
-Index: xpcom/obsolete/component/nsIRegistryUtils.h
-===================================================================
-RCS file: xpcom/obsolete/component/nsIRegistryUtils.h
-diff -N xpcom/obsolete/component/nsIRegistryUtils.h
---- xpcom/obsolete/component/nsIRegistryUtils.h	18 Apr 2004 14:18:15 -0000	1.2
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,63 +0,0 @@
--/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--#ifndef __nsIRegistryUtils_h
--#define __nsIRegistryUtils_h
--
--#define NS_REGISTRY_CONTRACTID "@mozilla.org/registry;1"
--#define NS_REGISTRY_CLASSNAME "Mozilla Registry"
--/* be761f00-a3b0-11d2-996c-0080c7cb1081 */
--#define NS_REGISTRY_CID                            \
--{                                                  \
--  0xbe761f00,                                      \
--  0xa3b0,                                          \
--  0x11d2,                                          \
--  {0x99, 0x6c, 0x00, 0x80, 0xc7, 0xcb, 0x10, 0x81} \
--}
--
--/*------------------------------- Error Codes ----------------------------------
--------------------------------------------------------------------------------*/
--#define NS_ERROR_REG_BADTYPE          NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 1 )
--#define NS_ERROR_REG_NO_MORE          NS_ERROR_GENERATE_SUCCESS( NS_ERROR_MODULE_REG, 2 )
--#define NS_ERROR_REG_NOT_FOUND        NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 3 )
--#define NS_ERROR_REG_NOFILE	          NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 4 )
--#define NS_ERROR_REG_BUFFER_TOO_SMALL NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 5 )
--#define NS_ERROR_REG_NAME_TOO_LONG    NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 6 )
--#define NS_ERROR_REG_NO_PATH          NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 7 )
--#define NS_ERROR_REG_READ_ONLY        NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 8 )
--#define NS_ERROR_REG_BAD_UTF8         NS_ERROR_GENERATE_FAILURE( NS_ERROR_MODULE_REG, 9 )
--
--#endif
-Index: xpcom/obsolete/component/regExport.cpp
-===================================================================
-RCS file: xpcom/obsolete/component/regExport.cpp
-diff -N xpcom/obsolete/component/regExport.cpp
---- xpcom/obsolete/component/regExport.cpp	18 Apr 2004 14:18:15 -0000	1.2
-+++ /dev/null	1 Jan 1970 00:00:00 -0000
-@@ -1,357 +0,0 @@
--/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is mozilla.org code.
-- *
-- * The Initial Developer of the Original Code is
-- * Netscape Communications Corporation.
-- * Portions created by the Initial Developer are Copyright (C) 1998
-- * the Initial Developer. All Rights Reserved.
-- *
-- * Contributor(s):
-- *
-- * Alternatively, the contents of this file may be used under the terms of
-- * either of the GNU General Public License Version 2 or later (the "GPL"),
-- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-- * in which case the provisions of the GPL or the LGPL are applicable instead
-- * of those above. If you wish to allow use of your version of this file only
-- * under the terms of either the GPL or the LGPL, and not to allow others to
-- * use your version of this file under the terms of the MPL, indicate your
-- * decision by deleting the provisions above and replace them with the notice
-- * and other provisions required by the GPL or the LGPL. If you do not delete
-- * the provisions above, a recipient may use your version of this file under
-- * the terms of any one of the MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include <stdio.h>
--
--#include "nsIServiceManager.h"
--#include "nsIComponentManager.h"
--#include "nsCOMPtr.h"
--#include "nsIRegistry.h"
--#include "nsIEnumerator.h"
--#include "nsILocalFile.h"
--#include "nsDependentString.h"
--#include "prmem.h"
--#include "plstr.h"
--#include "nsMemory.h"
--
--static void display( nsIRegistry *reg, nsRegistryKey root, const char *name );
--static void displayValues( nsIRegistry *reg, nsRegistryKey root );
--static void printString( const char *value, int indent );
--
--int main( int argc, char *argv[] ) {
--
--
--#ifdef __MWERKS__
--    // Hack in some arguments.  A NULL registry name is supposed to tell libreg
--    // to use the default registry (which does seem to work).
--    argc = 1;
--    const char* myArgs[] =
--    {
--        "regExport"
--    };
--    argv = const_cast<char**>(myArgs);
--#endif
--
--    nsresult rv;
--
--    // Initialize XPCOM
--    nsIServiceManager *servMgr = NULL;
--    rv = NS_InitXPCOM2(&servMgr, NULL, NULL);
--    if (NS_FAILED(rv))
--    {
--        // Cannot initialize XPCOM
--        printf("Cannot initialize XPCOM. Exit. [rv=0x%08X]\n", (int)rv);
--        exit(-1);
--    }
--    {
--        // Get the component manager
--        static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
--        nsCOMPtr<nsIComponentManager> compMgr = do_GetService(kComponentManagerCID, &rv);
--        if (NS_FAILED(rv))
--        {
--            // Cant get component manager
--            printf("Cannot get component manager from service manager.. Exit. [rv=0x%08X]\n", (int)rv);
--            exit(-1);
--        }
--
--        nsIRegistry *reg;
--
--        if (argc>1) {
--            // Create the registry
--            rv = compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
--                                                 NS_GET_IID(nsIRegistry),
--                                                 (void **) &reg);
--            // Check result.
--            if ( NS_FAILED(rv) )
--    	    {   
--                printf( "Error opening registry file %s, rv=0x%08X\n", argv[1] , (int)rv );
--                return rv;
--		    }
--            // Open it against the input file name.
--            nsCOMPtr<nsILocalFile> regFile;
--            rv = NS_NewNativeLocalFile( nsDependentCString(argv[1]), PR_FALSE, getter_AddRefs(regFile) );
--            if ( NS_FAILED(rv) ) {
--                printf( "Error instantiating local file for %s, rv=0x%08X\n", argv[1], (int)rv );
--                return rv;
--            }
--
--            rv = reg->Open( regFile );
--    
--            if ( rv == NS_OK ) 
--            {
--                printf( "Registry %s opened OK.\n", argv[1] );
--            
--                // Recurse over all 3 branches.
--                display( reg, nsIRegistry::Common, "nsRegistry::Common" );
--                display( reg, nsIRegistry::Users, "nsRegistry::Users" );
--            }
--            NS_RELEASE(reg);
--        }
--        else
--        {
--            // Called with no arguments. Print both the default registry and 
--            // the components registry. We already printed the default regsitry.
--            // So just do the component registry.
--            rv = compMgr->CreateInstanceByContractID(NS_REGISTRY_CONTRACTID, NULL,
--                                                 NS_GET_IID(nsIRegistry),
--                                                 (void **) &reg);
--
--            // Check result.
--            if ( NS_FAILED(rv) )
--            {   
--                printf( "Error opening creating registry instance, rv=0x%08X\n", (int)rv );
--                return rv;
--            }
--            rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
--            if ( rv == NS_ERROR_REG_BADTYPE ) {
--                printf( "\n\n\nThere is no <Application Component Registry>\n" );
--            }
--            else if ( rv == NS_OK ) {
--
--                printf( "\n\n\nRegistry %s opened OK.\n", "<Application Component Registry>\n" );
--            
--                // Recurse over all 3 branches.
--                display( reg, nsIRegistry::Common, "nsRegistry::Common" );
--                display( reg, nsIRegistry::Users, "nsRegistry::Users" );
--            }
--            NS_RELEASE(reg);
--        }
--    }
--    NS_ShutdownXPCOM( servMgr );
--
--    return rv;
--}
--
--void display( nsIRegistry *reg, nsRegistryKey root, const char *rootName ) {
--    // Print out key name.
--    printf( "%s\n", rootName );
--
--    // Make sure it isn't a "root" key.
--    if ( root != nsIRegistry::Common
--         &&
--         root != nsIRegistry::Users
--         &&
--         root != nsIRegistry::CurrentUser ) {
--        // Print values stored under this key.
--        displayValues( reg, root );
--    }
--
--    // Enumerate all subkeys (immediately) under the given node.
--    nsIEnumerator *keys;
--    nsresult rv = reg->EnumerateSubtrees( root, &keys );
--
--    // Check result.
--    if ( rv == NS_OK ) {
--        // Set enumerator to beginning.
--        rv = keys->First();
--        // Enumerate subkeys till done.
--        while( NS_SUCCEEDED( rv ) && (NS_OK != keys->IsDone()) ) {
--            nsISupports *base;
--            rv = keys->CurrentItem( &base );
--            // Test result.
--            if ( rv == NS_OK ) {
--                // Get specific interface.
--                nsIRegistryNode *node;
--                nsIID nodeIID = NS_IREGISTRYNODE_IID;
--                rv = base->QueryInterface( nodeIID, (void**)&node );
--                // Test that result.
--                if ( rv == NS_OK ) {
--                    // Get node name.
--                    char *name;
--                    rv = node->GetNameUTF8( &name );
--                    // Test result.
--                    if ( rv == NS_OK ) {
--                        // Build complete name.
--                        char *fullName = new char[ PL_strlen(rootName) + PL_strlen(name) + 5 ];
--                        PL_strcpy( fullName, rootName );
--                        PL_strcat( fullName, " -  " );
--                        PL_strcat( fullName, name );
--                        // Display contents under this subkey.
--                        nsRegistryKey key;
--                        rv = reg->GetSubtreeRaw( root, name, &key );
--                        if ( rv == NS_OK ) {
--                            display( reg, key, fullName );
--                            printf( "\n" );
--                        } else {
--                            printf( "Error getting key, rv=0x%08X\n", (int)rv );
--                        }
--                        delete [] fullName;
--                    } else {
--                        printf( "Error getting subtree name, rv=0x%08X\n", (int)rv );
--                    }
--                    // Release node.
--                    node->Release();
--                } else {
--                    printf( "Error converting base node ptr to nsIRegistryNode, rv=0x%08X\n", (int)rv );
--                }
--                // Release item.
--                base->Release();
--
--                // Advance to next key.
--                rv = keys->Next();
--                // Check result.
--                if ( NS_SUCCEEDED( rv ) ) {
--                } else {
--                    printf( "Error advancing enumerator, rv=0x%08X\n", (int)rv );
--                }
--            } else {
--                printf( "Error getting current item, rv=0x%08X\n", (int)rv );
--            }
--        }
--        // Release key enumerator.
--        keys->Release();
--    } else {
--        printf( "Error creating enumerator for %s, root=0x%08X, rv=0x%08X\n",
--                rootName, (int)root, (int)rv );
--    }
--    return;
--}
--
--static void displayValues( nsIRegistry *reg, nsRegistryKey root ) {
--    // Emumerate values at this registry location.
--    nsIEnumerator *values;
--    nsresult rv = reg->EnumerateValues( root, &values );
--
--    // Check result.
--    if ( rv == NS_OK ) {
--        // Go to beginning.
--        rv = values->First();
--
--        // Enumerate values till done.
--        while( rv == NS_OK && (NS_OK != values->IsDone()) ) {
--            nsISupports *base;
--            rv = values->CurrentItem( &base );
--            // Test result.
--            if ( rv == NS_OK ) {
--                // Get specific interface.
--                nsIRegistryValue *value;
--                nsIID valueIID = NS_IREGISTRYVALUE_IID;
--                rv = base->QueryInterface( valueIID, (void**)&value );
--                // Test that result.
--                if ( rv == NS_OK ) {
--                    // Get node name.
--                    char *name;
--                    rv = value->GetNameUTF8( &name );
--                    // Test result.
--                    if ( rv == NS_OK ) {
--                        // Print name:
--                        printf( "\t\t%s", name );
--                        // Get info about this value.
--                        PRUint32 type;
--                        rv = reg->GetValueType( root, name, &type );
--                        if ( rv == NS_OK ) {
--                            // Print value contents.
--                            switch ( type ) {
--                                case nsIRegistry::String: {
--                                        char *strValue;
--                                        rv = reg->GetStringUTF8( root, name, &strValue );
--                                        if ( rv == NS_OK ) {
--                                            printString( strValue, strlen(name) );
--                                            nsMemory::Free( strValue );
--                                        } else {
--                                            printf( "\t Error getting string value, rv=0x%08X", (int)rv );
--                                        }
--                                    }
--                                    break;
--
--                                case nsIRegistry::Int32:
--                                    {
--                                        PRInt32 val = 0;
--                                        rv = reg->GetInt( root, name, &val );
--                                        if (NS_SUCCEEDED(rv)) {
--                                            printf( "\t= Int32 [%d, 0x%x]", val, val);
--                                        }
--                                        else {
--                                            printf( "\t Error getting int32 value, rv=%08X", (int)rv);
--                                        }
--                                    }
--                                    break;
--
--                                case nsIRegistry::Bytes:
--                                    printf( "\t= Bytes" );
--                                    break;
--
--                                case nsIRegistry::File:
--                                    printf( "\t= File (?)" );
--                                    break;
--
--                                default:
--                                    printf( "\t= ? (unknown type=0x%02X)", (int)type );
--                                    break;
--                            }
--                        } else {
--                            printf( "\t= ? (error getting value, rv=0x%08X)", (int)rv );
--                        }
--                        printf("\n");
--                        nsMemory::Free( name );
--                    } else {
--                        printf( "Error getting value name, rv=0x%08X\n", (int)rv );
--                    }
--                    // Release node.
--                    value->Release();
--                } else {
--                    printf( "Error converting base node ptr to nsIRegistryNode, rv=0x%08X\n", (int)rv );
--                }
--                // Release item.
--                base->Release();
--
--                // Advance to next key.
--                rv = values->Next();
--                // Check result.
--                if ( NS_SUCCEEDED( rv ) ) {
--                } else {
--                    printf( "Error advancing enumerator, rv=0x%08X\n", (int)rv );
--                    break;
--                }
--            } else {
--                printf( "Error getting current item, rv=0x%08X\n", (int)rv );
--                break;
--            }
--        }
--
--        values->Release();
--    } else {
--        printf( "\t\tError enumerating values, rv=0x%08X\n", (int)rv );
--    }
--    return;
--}
--
--static void printString( const char *value, int /*indent*/ ) {
--    // For now, just dump contents.
--    printf( "\t = %s", value );
--    return;
--}
-
diff --git a/utils/sunbird/lightning-sunbird-0.7-source.tar.bz2.sig b/utils/sunbird/lightning-sunbird-0.7-source.tar.bz2.sig
deleted file mode 100644
index 44bbc4f14d..0000000000
--- a/utils/sunbird/lightning-sunbird-0.7-source.tar.bz2.sig
+++ /dev/null
diff --git a/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig b/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig
new file mode 100644
index 0000000000..2fa6efeff6
--- /dev/null
+++ b/utils/sunbird/lightning-sunbird-0.8-source.tar.bz2.sig
diff --git a/video/luvcview/BUILD b/video/luvcview/BUILD
new file mode 100755
index 0000000000..8f58e6df93
--- /dev/null
+++ b/video/luvcview/BUILD
@@ -0,0 +1 @@
+make
diff --git a/video/luvcview/DEPENDS b/video/luvcview/DEPENDS
new file mode 100755
index 0000000000..7ddd3ee43a
--- /dev/null
+++ b/video/luvcview/DEPENDS
@@ -0,0 +1 @@
+depends sdl
diff --git a/video/luvcview/DETAILS b/video/luvcview/DETAILS
new file mode 100755
index 0000000000..886c500877
--- /dev/null
+++ b/video/luvcview/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=luvcview
+         VERSION=20070512
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://mxhaard.free.fr/spca50x/Investigation/uvc/$SOURCE
+     SOURCE_HASH=sha512:2efd7221fb6edbdc327b79859b0f2e33f87574f7201a62d1b6b0a32d3cfd48281943744a7e3c752096af3f1fcc0f3b0631e9ac378f60ffd323bfe72c0d4c273d
+        WEB_SITE=http://linux-uvc.berlios.de/
+         ENTERED=20080821
+      LICENSE[0]=GPL
+        KEYWORDS="video"
+           SHORT="sdl video usb video class grabber"
+cat << EOF
+luvcview: Sdl video Usb Video Class grabber
+This package work with the Logitech UVC based webcams with the mjpeg feature.
+EOF
diff --git a/video/luvcview/HISTORY b/video/luvcview/HISTORY
new file mode 100644
index 0000000000..a415978cb9
--- /dev/null
+++ b/video/luvcview/HISTORY
@@ -0,0 +1,3 @@
+2008-08-21 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 20070512
+
diff --git a/video/luvcview/PRE_BUILD b/video/luvcview/PRE_BUILD
new file mode 100755
index 0000000000..076b994efc
--- /dev/null
+++ b/video/luvcview/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sed -i 's/BIN=\/usr\/local\/bin/BIN=\/usr\/bin/g' ${SOURCE_DIRECTORY}/Makefile
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 25e0d06d7c..a3e0d0d091 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -4,7 +4,6 @@ depends  gtk+2 &&
 
 depends  X11-LIBS  '--with-x  --with-libxpm'  &&
 
-depends  OPENGL "--with-opengl"  &&
 # all of the "depends" below strictly speaking are not required, e.g. we can
 # use included library by specifying --with-*=builtin, but we want to use the
 # system libraries, so we're saying --with-*[=sys] here.
@@ -14,6 +13,10 @@ depends  jpeg    '--with-libjpeg'  &&
 depends  tiff    '--with-libtiff'  &&
 depends  pcre    '--with-regex=sys'    &&
 
+optional_depends  OPENGL             \
+                  '--with-opengl'    \
+                  '--without-opengl' \
+                  'for OpenGL support'  &&
 optional_depends  expat              \
                   '--with-expat'     \
                   '--without-expat'  \
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index f5c4cf0c05..851c20c3cd 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,6 @@
+2008-08-20 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: made opengl optional again
+
 2008-07-23 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* (REPAIR^)PRE_SUB_DEPENDS: fixed DEV check always returning true
 
diff --git a/x11/lavaps/BUILD b/x11/lavaps/BUILD
index 3f4aea47dc..8c2cfe9055 100755
--- a/x11/lavaps/BUILD
+++ b/x11/lavaps/BUILD
@@ -13,4 +13,7 @@ fi  &&
              --disable-schemas-install         \
              $OPTS                             &&
 
-make
+make_single &&
+make &&
+make_normal
+
diff --git a/x11/lavaps/HISTORY b/x11/lavaps/HISTORY
index 1f5821b920..4c90bb4a02 100644
--- a/x11/lavaps/HISTORY
+++ b/x11/lavaps/HISTORY
@@ -1,3 +1,8 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* BUILD: make_single, failed with 5 jobs
+	* PRE_BUILD, 2 2.7 patches: made it compile using gentoo patches #14651
+	* POST_INSTALL: fixed inclusion of build stuff into the docdir
+
 2008-08-19 Robert Figura <rfigura@sourcemage.org>
 	* DEPENDS: added dependency for libgnomeui
 
diff --git a/x11/lavaps/POST_INSTALL b/x11/lavaps/POST_INSTALL
new file mode 100755
index 0000000000..cb7312b7ff
--- /dev/null
+++ b/x11/lavaps/POST_INSTALL
@@ -0,0 +1,3 @@
+default_post_install &&
+cd TRANSL/usr/share/doc/lavaps &&
+rm doc/Makefile* doc/pod* doc/master.pod doc/lavaps.1
diff --git a/x11/lavaps/PRE_BUILD b/x11/lavaps/PRE_BUILD
new file mode 100755
index 0000000000..8a08f465cd
--- /dev/null
+++ b/x11/lavaps/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-build-fixes.patch
+patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-gcc43.patch
diff --git a/x11/lavaps/lavaps-2.7-build-fixes.patch b/x11/lavaps/lavaps-2.7-build-fixes.patch
new file mode 100644
index 0000000000..08111f5e66
--- /dev/null
+++ b/x11/lavaps/lavaps-2.7-build-fixes.patch
@@ -0,0 +1,34 @@
+--- lavaps-2.7/src/process_model.cc
++++ lavaps-2.7/src/process_model.cc
+@@ -86,7 +86,7 @@
+ void
+ process_model::dump()
+ {
+-	cout << int(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
++	cout << long(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
+ 		endl;
+ }
+ 
+--- lavaps-2.7/src/blob.cc
++++ lavaps-2.7/src/blob.cc
+@@ -503,7 +503,7 @@
+ blob::print()
+ {
+ 	ENTRY_TRACE(__FILE__,__LINE__);
+-	cout << O_("blob: ") << (unsigned)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
++	cout << O_("blob: ") << (unsigned long)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
+ 	for (int i = 0; i < num_; i++) {
+ 		cout << O_(" ") << y_lows_[i] << O_("-") << y_highs_[i];
+ 	};
+--- lavaps-2.7/src/linux/proc/ps.h
++++ lavaps-2.7/src/linux/proc/ps.h
+@@ -5,9 +5,6 @@
+ /* get definition of HZ */
+ #include <asm/param.h>
+ 
+-/* get page info */
+-#include <asm/page.h>
+-
+ char *wchan(unsigned long);
+ char *find_func(unsigned long address);
+ void *xcalloc(void *pointer, int size);
diff --git a/x11/lavaps/lavaps-2.7-gcc43.patch b/x11/lavaps/lavaps-2.7-gcc43.patch
new file mode 100644
index 0000000000..9e79ec16bc
--- /dev/null
+++ b/x11/lavaps/lavaps-2.7-gcc43.patch
@@ -0,0 +1,30 @@
+diff -NrU5 lavaps-2.7.orig/src/const_str.hh lavaps-2.7/src/const_str.hh
+--- lavaps-2.7.orig/src/const_str.hh	2008-06-29 14:39:09.000000000 +0200
++++ lavaps-2.7/src/const_str.hh	2008-06-29 14:39:29.000000000 +0200
+@@ -22,10 +22,11 @@
+ 
+ 
+ #ifndef lavaps_const_str_h
+ #define lavaps_const_str_h
+ 
++#include <cstdlib>
+ #include <string.h>
+ 
+ class const_str {
+ protected:
+ 	const char *rep_;
+diff -NrU5 lavaps-2.7.orig/src/lava_signal.cc lavaps-2.7/src/lava_signal.cc
+--- lavaps-2.7.orig/src/lava_signal.cc	2008-06-29 14:38:04.000000000 +0200
++++ lavaps-2.7/src/lava_signal.cc	2008-06-29 14:40:13.000000000 +0200
+@@ -28,10 +28,11 @@
+ #include "main.hh"
+ 
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/types.h>
++#include <cstring>
+ #include <signal.h>
+ 
+ int
+ lava_signal(int pid, int sig)
+ {
author	Mathieu Lonjaret	2008-08-21 18:30:43 +0200
committer	Mathieu Lonjaret	2008-08-21 18:30:43 +0200
commit	33a1664d315396fc5cdb84cf6c3701a158dcfa81 (patch)
tree	e8eb30104426d9aeda96e8ce2531049814ad8b9a
parent	ade347f678b73b82270e2508abe968eee0b795e4 (diff)
parent	80576b8d3238bbfa16d7acaf6b4594f37e14730a (diff)