[SM-Commit] GIT changes to stable-0.27 grimoire by Eric Sandall (8ea7adc48e58f7db5e94cbaa09785725a3b8e576)

Eric Sandall scm at sourcemage.org
Mon Dec 1 18:11:49 EST 2008


GIT changes to stable-0.27 grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                                    |    4 +
 VERSION                                      |    2 
 audio-libs/sidplay-libs/BUILD                |    2 
 audio-libs/sidplay-libs/HISTORY              |    6 +
 audio-libs/sidplay-libs/PRE_BUILD            |    9 ++
 audio-libs/sidplay-libs/gcc43.patch          |   31 +++++++++
 audio-libs/sidplay-libs/openmode.patch       |   38 +++++++++++
 audio-soft/mp3info/HISTORY                   |    3 
 audio-soft/mp3info/INSTALL                   |    2 
 config_query_multi.function                  |    4 -
 dev/null                                     |binary
 devel/git/HISTORY                            |    3 
 devel/git/INSTALL                            |    2 
 devel/graphviz/DEPENDS                       |    2 
 devel/graphviz/HISTORY                       |    4 +
 devel/recode/BUILD                           |    2 
 devel/recode/HISTORY                         |    4 +
 gnome2-libs/gnome-vfs2/FINAL                 |    2 
 gnome2-libs/gnome-vfs2/HISTORY               |    3 
 graphics-libs/glitz/DEPENDS                  |    3 
 graphics-libs/glitz/HISTORY                  |    3 
 kernels/madwifi/DETAILS                      |    2 
 kernels/madwifi/HISTORY                      |    3 
 kernels/virtualbox-module/DETAILS            |    2 
 kernels/virtualbox-module/HISTORY            |    3 
 latex/xcolor/DEPENDS                         |    3 
 latex/xcolor/HISTORY                         |    3 
 libs/libgksu/DEPENDS                         |    2 
 libs/libgksu/HISTORY                         |    3 
 libs/libtabe/BUILD                           |    7 --
 libs/libtabe/DETAILS                         |   11 +--
 libs/libtabe/HISTORY                         |   10 +++
 libs/libtabe/PRE_BUILD                       |    7 ++
 libs/libtabe/libtabe-db4.patch               |   24 -------
 libs/libtabe/libtabe-db41.patch              |   58 -----------------
 libs/libtabe/libtabe_0.2.6-1.1.diff.bz2      |binary
 libs/libtabe/tsi-remove-annoyance.patch      |   10 ---
 net/dhcp/BUILD                               |    2 
 net/dhcp/HISTORY                             |    3 
 net/ngrep/BUILD                              |    4 +
 net/ngrep/HISTORY                            |    4 +
 net/samba/DETAILS                            |    6 -
 net/samba/HISTORY                            |    4 +
 printer/ghostscript/BUILD                    |    5 -
 printer/ghostscript/CONFIGURE                |    2 
 printer/ghostscript/HISTORY                  |    4 +
 utils/devtodo/HISTORY                        |    3 
 utils/devtodo/PRE_BUILD                      |    3 
 utils/devtodo/gcc4.3.0_fix.diff              |   10 +++
 utils/fcrontabs/DETAILS                      |    1 
 utils/fcrontabs/HISTORY                      |    3 
 utils/virtualbox/BUILD                       |    2 
 utils/virtualbox/DEPENDS                     |    1 
 utils/virtualbox/DETAILS                     |    4 -
 utils/virtualbox/HISTORY                     |    5 +
 utils/virtualbox/PRE_BUILD                   |    2 
 video-libs/dirac/HISTORY                     |    5 +
 video-libs/dirac/PRE_BUILD                   |    4 +
 video-libs/dirac/doxygen.patch               |   13 +++
 video/mjpegtools/HISTORY                     |    3 
 video/mjpegtools/PRE_BUILD                   |    3 
 video/mjpegtools/gcc-4.3.patch               |   90 +++++++++++++++++++++++++++
 wm-addons/wmtop/HISTORY                      |    3 
 wm-addons/wmtop/PRE_BUILD                    |    3 
 x11/gmrun/DETAILS                            |    4 -
 x11/gmrun/HISTORY                            |    4 +
 x11/gmrun/PRE_BUILD                          |    3 
 x11/gmrun/gmrun-0.9.2-gcc43.patch            |   40 ++++++++++++
 x11/xbindkeys/DEPENDS                        |    7 +-
 x11/xbindkeys/HISTORY                        |    3 
 xfce/xfce4-dict/DETAILS                      |    2 
 xfce/xfce4-dict/HISTORY                      |    3 
 xfce/xfce4-dict/xfce4-dict-0.4.1.tar.bz2.sig |    0 
 xfce/xfce4-dict/xfce4-dict-0.5.1.tar.bz2.sig |binary
 74 files changed, 404 insertions(+), 131 deletions(-)

New commits:
commit 8ea7adc48e58f7db5e94cbaa09785725a3b8e576
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    VERSION: 0.27-1

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

    sidplay-libs: Added patches for Bug 14905 from gentoo.
    Removed BUILD and added PRE_BUILD for patching.
    
    (cherry-picked from commit 349a243d455b65212f11071eac1928e67ac51b5a)

commit 60e54b5dad0f00540d568b6a5209184a34cdec61
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    samba: Updated to version 3.2.5. SECURITY_PATCH++
    
    (cherry-picked from commit 64ad08bafedabca486821889382d6b5234327f0f)

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

    config_query_multi.function: fixed two issues, patch by Fredrik
          Carlström #14914
    
    someone please apply this to binary too; other grimoires don't use it
    
    (cherry-picked from commit 87957f241f95b029983b5191dee7fccd7885f385)

commit 67686a004d0364c94fd8b50d95d8716ec40f04d9
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mjpegtools: gcc-4.3.patch: added for #14913
    except for the fuzz factor, this was all done by quill itself :)
    in a repository near you soon!
    
    (cherry-picked from commit d20780c2d2b0f029d59b3937079c0c246bee0c29)

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

    fcrontabs: turn off staging, as it runs fcron that doesn't like it #14911
    
    (cherry-picked from commit 3232c4093aee9fff4d71543d38870336e69e408c)

commit 4a2adedf446ba45d516fae1b63540047f61249fb
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    devtodo: gcc4.3.0_fix.diff: added for #14910
    
    (cherry-picked from commit 9abdac84fb3f03c3dc08b27edd27a1a9c6b43e7f)

commit 79ce0476d32f38ac7764cdcc47dbda5415e7c322
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    recode: Removed unneeded BUILD. Patch was previously removed.
    Bug 14902.
    
    (cherry-picked from commit 81d0791f5d5b7e6efbd76ab7e7dddb811bb44653)

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

    ngrep: Added --with-pcap-includes=/usr/include/pcap to
    BUILD to fix Bug #14901.
    
    (cherry-picked from commit 3ea1231281ba1cf270dd0159a1824b0feaa309ec)

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

    gmrun 0.9.2 #14899
    
    (cherry-picked from commit df24bb433616546228710c988a4fc66e8c1cc352)

commit 256c6174f29ebb31fd16560ab642ddae03ea701c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    graphviz: Added check for cairo with librsvg2 if optional
    depends pango is selected. Bug #14891.
    
    (cherry-picked from commit e3da5ddf007e6a8318fbc9136dbf461890563379)

commit 96c4fd30b91985139fd2aa04e8aff66420815ac3
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    madwifi: Updated subversion SOURCE_URL. Bug #14890
    
    (cherry-picked from commit 0d6263e8b2be190a1fbcc2aee9c488886af9d4a4)

commit 1fa3e6750d926b3dd91feaed563091b5e8de9ee4
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    ghostscript: Added option for file formats only, no printers.
    Bug 14889.
    
    (cherry-picked from commit af3c8207e133abff1535e7bec251e3aa151b5d0a)

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

    git: fixed #14887
    
    (cherry-picked from commit 85064fd07ea5aa452a57760b10db6ff2440a8508)

commit 71e5128329884b4394f2b856e9cbe5c1219540d0
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xfce4-dict: Update to 0.5.1
    (cherry picked from 442a4a0088ee7a2631cb7ba5014a5c32bd6a7969)

commit 57caf2658c1f4bb2d84fa4fd01359042238fe653
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnome-vfs2: Added || true to FINAL to fix failure if nothing
    in /usr/share/applications.  Bug 14883.
    
    (cherry-picked from commit 5c18e6525e34506e5498ee5bafbca52684aea0a4)

commit 08f31ecff9bc99ac0a6d391d31946164506bd135
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libtksu: Added depends libglade2 and gconf2. Bug 14882.
    
    (cherry-picked from commit 5ac45a274d9b01fe2aced20981d4d20bce105649)

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

    dhcp: fix the changing, but bad install path #14878
    
    (cherry-picked from commit be130dcff03cbbd1b73dbe43b2e54a5d8fbb9d52)

commit 6eb8130f41baff133bddfb01543d6c54a6363542
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xbindkeys: added tk and guile #14875
    
    (cherry-picked from commit edf8974b0b05790e2a409d2eb4310a133f65d913)

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

    wmtop: fix manpath #14817
    
    (cherry-picked from commit 43cc732dd8c00ebc56bc50bb3f00b86ccd82aaad)

commit 095e49527ad6052e41292023f24d30a4aa88879e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    dirac: Added upstream patch to fix problem with building
    without doxygen. Bug 14795.
    
    (cherry-picked from commit 87836c75bacf4026a671d810524cb7bbc124aec2)

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

    xcolor: Added depends ghostscript. Bug #14780
    
    (cherry-picked from commit 007adba9b0aabe8bb0513a07658b981abe48447b)

commit 652d6c0f8214660826c119438252840fd0eb0dde
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mp3info: use the correct man path #14702
    
    (cherry-picked from commit 4ad91f8bbf2f38d75c2087181d6e453253a2181d)

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

    glitz: added OPENGL #14646
    
    (cherry-picked from commit f6499c84b80977be2bf314d1d89ce0d484c87268)

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

    virtualbox 2.0.6
    
    (cherry-picked from commit 58a073f357e3e1a9e38e8981e1b22812a2e37500)

commit 076d3d2808fb305f5e596a33c6608a7715bc88d4
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virtualbox-module 2.0.6
    (cherry picked from commit a15e87ba47bd9b0354a72cbbfa85dd5dd4d36452)

commit 8c031953118b92a65ace7b5f46c9d7ff310a0af0
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libtabe: Updated to version 0.2.6. Added Debian patch to fix
    compile issues. Bug #9843
    (cherry picked from commit b5c3135e278fa6bad0c8ce324db1d8d0ebee26a5)

diff --git a/ChangeLog b/ChangeLog
index 48d5d4d..e2f4ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-27 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* config_query_multi.function: fixed two issues, patch by Fredrik
+	  Carlström #14914
+
 2008-11-01 Julien "_kaze_" ROZO <julien at rozo.org>
 	* kde4-apps/k9copy4: new spell, kde4 version of k9copy
 
diff --git a/VERSION b/VERSION
index 7ccc7fa..bd693c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.27-0
+0.27-1
diff --git a/audio-libs/sidplay-libs/BUILD b/audio-libs/sidplay-libs/BUILD
deleted file mode 100755
index bf9376c..0000000
--- a/audio-libs/sidplay-libs/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
-default_build
diff --git a/audio-libs/sidplay-libs/HISTORY b/audio-libs/sidplay-libs/HISTORY
index e5532f4..599a7bb 100644
--- a/audio-libs/sidplay-libs/HISTORY
+++ b/audio-libs/sidplay-libs/HISTORY
@@ -1,3 +1,9 @@
+2008-11-22 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Deleted. Patches should be in PRE_BUILD
+	* PRE_BUILD: Added to apply patches
+	* openmode.patch: Added gentoo patch for Bug 14905.
+	* gcc43.patch: Added patch to build with gcc 4.3.x
+
 2006-07-24 Unet <unet at sourcemage.org>
 	* BUILD: Added gcc4.patch 
 	* DETAILS: Updated to 2.1.1
diff --git a/audio-libs/sidplay-libs/PRE_BUILD b/audio-libs/sidplay-libs/PRE_BUILD
new file mode 100644
index 0000000..9023830
--- /dev/null
+++ b/audio-libs/sidplay-libs/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
+
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
+patch -p0 < $SCRIPT_DIRECTORY/openmode.patch
diff --git a/audio-libs/sidplay-libs/gcc43.patch b/audio-libs/sidplay-libs/gcc43.patch
new file mode 100644
index 0000000..6f336ba
--- /dev/null
+++ b/audio-libs/sidplay-libs/gcc43.patch
@@ -0,0 +1,31 @@
+--- builders/resid-builder/src/resid.cpp.old	2008-07-25 17:00:41.000000000 +0000
++++ builders/resid-builder/src/resid.cpp	2008-07-25 16:59:44.000000000 +0000
+@@ -16,6 +16,8 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstring>
++
+ #include "config.h"
+ 
+ #ifdef HAVE_EXCEPTIONS
+--- builders/resid-builder/src/resid-builder.cpp.old	2008-07-25 17:02:00.000000000 +0000
++++ builders/resid-builder/src/resid-builder.cpp	2008-07-25 17:01:47.000000000 +0000
+@@ -37,6 +37,7 @@
+  ***************************************************************************/
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #include "config.h"
+ #ifdef HAVE_EXCEPTIONS
+--- builders/hardsid-builder/src/hardsid-builder.cpp.old	2008-07-25 17:08:50.000000000 +0000
++++ builders/hardsid-builder/src/hardsid-builder.cpp	2008-07-25 17:08:17.000000000 +0000
+@@ -47,6 +47,7 @@
+  ***************************************************************************/
+ 
+ #include <stdio.h>
++#include <cstring>
+ #include "config.h"
+ 
+ #ifdef HAVE_EXCEPTIONS
diff --git a/audio-libs/sidplay-libs/openmode.patch b/audio-libs/sidplay-libs/openmode.patch
new file mode 100644
index 0000000..57c29a9
--- /dev/null
+++ b/audio-libs/sidplay-libs/openmode.patch
@@ -0,0 +1,38 @@
+--- libsidplay/src/sidtune/SidTune.cpp	2008-07-25 16:55:02.000000000 +0000
++++ libsidplay/src/sidtune/SidTune.cpp	2008-07-25 16:53:58.000000000 +0000
+@@ -283,7 +283,7 @@
+     uint_least32_t fileLen = 0;
+ 
+     // This sucks big time
+-    openmode createAtrr = std::ios::in;
++    std::_Ios_Openmode createAtrr = std::ios::in;
+ #ifdef HAVE_IOS_NOCREATE
+     createAtrr |= std::ios::nocreate;
+ #endif
+@@ -952,7 +952,7 @@
+     if ( status )
+     {
+         // Open binary output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
+@@ -1002,7 +1002,7 @@
+     if ( status )
+     {
+         // Open ASCII output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+         if ( overWriteFlag )
+             createAttr |= std::ios::trunc;
+         else
+@@ -1036,7 +1036,7 @@
+     if ( status )
+     {
+         // Open binary output file stream.
+-        openmode createAttr = std::ios::out;
++        std::_Ios_Openmode createAttr = std::ios::out;
+ #if defined(HAVE_IOS_BIN)
+         createAttr |= std::ios::bin;
+ #else
diff --git a/audio-soft/mp3info/HISTORY b/audio-soft/mp3info/HISTORY
index 688262f..d3e833d 100644
--- a/audio-soft/mp3info/HISTORY
+++ b/audio-soft/mp3info/HISTORY
@@ -1,3 +1,6 @@
+2008-11-24 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* INSTALL: use the correct man path #14702
+
 2007-07-19 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* BUILD: removing patch command
 	* DETAILS: Updating to version 8.0.5a
diff --git a/audio-soft/mp3info/INSTALL b/audio-soft/mp3info/INSTALL
index 4e76028..5b13b8a 100755
--- a/audio-soft/mp3info/INSTALL
+++ b/audio-soft/mp3info/INSTALL
@@ -1 +1 @@
-make prefix=/usr install
+make prefix="$INSTALL_ROOT"/usr mandir="$INSTALL_ROOT"/usr/share/man/man1 install
diff --git a/config_query_multi.function b/config_query_multi.function
index 56afd52..ca9d27f 100755
--- a/config_query_multi.function
+++ b/config_query_multi.function
@@ -49,6 +49,7 @@ function select_list_sub_multi() {
   local default=$4
 
   local __result=() j
+  local answer answer_parsed
 
   while [[ ! $__result ]] ; do
     message -n "$msgstr"
@@ -101,6 +102,7 @@ function real_config_query_multi () {
     echo -e "[[ ${QUERY_COLOR}${QUESTION}${DEFAULT_COLOR} -> '${QUERY_COLOR}$ANSWER${DEFAULT_COLOR}' ]]"
   else
     # if there was an answer before, find it
+    local stuff=(0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
     local defaults default default_num foo
     config_get_last_option "$VARIABLE" default
     [[ $default ]] || default="$1"
@@ -108,7 +110,7 @@ function real_config_query_multi () {
     let i=0
       for foo in "$@"; do
         if [[ "$defaults" == "$foo" ]] ; then
-          default_num="$default_num $i"
+          default_num="$default_num ${stuff[$i]}"
         fi
         let i++
       done
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 14dd4a3..f72e7b4 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2008-11-15 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: fixed installation of a dir if bash-completion is enabled
+
 2008-10-21 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.6.0.3
 
diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index 932474e..64dbd5b 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -30,6 +30,8 @@ case $GIT_DOC in
 esac &&
 
 if is_depends_enabled $SPELL bash-completion; then
+  install -vm 755 -d "$INSTALL_ROOT/etc/bash_completion.d" &&
+
   install -vm 755 "$SOURCE_DIRECTORY/contrib/completion/git-completion.bash" \
                   "$INSTALL_ROOT/etc/bash_completion.d/git-completion"
 fi &&
diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index f8c3cc4..01cfc93 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -53,6 +53,8 @@ optional_depends  pango                                      \
                   "--with-mylibgd=yes --with-pangocairo=no"  \
                   "Use pangocairo library?"                  &&
 
+if is_depends_enabled $SPELL pango; then depends -sub SVG cairo; fi &&
+
 optional_depends  gtk+2                                 \
                   "--with-gtk --with-gdk-pixbuf"        \
                   "--without-gtk --without-gdk-pixbuf"  \
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 05a6b0f..90c1488 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,7 @@
+2008-11-21 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Added check for cairo with librsvg2 if pango selected.
+	  Bug #14891
+
 2008-04-23 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Fix disabling pango (Bug #14249)
 	  Added missing && for expat
diff --git a/devel/recode/BUILD b/devel/recode/BUILD
deleted file mode 100755
index 0423ed9..0000000
--- a/devel/recode/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-patch -p 1 < $SCRIPT_DIRECTORY/recode.patch &&
-default_build
diff --git a/devel/recode/HISTORY b/devel/recode/HISTORY
index 7e04d2a..734943c 100644
--- a/devel/recode/HISTORY
+++ b/devel/recode/HISTORY
@@ -1,3 +1,7 @@
+2008-11-21 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Removed file. Patch was removed, but reference was not.
+	  Bug 14902.
+
 2008-10-21 Julien "_kaze_" ROZO <julien at rozo.org>
 	* gcc43.patch: added, to fix compilation issue with gcc 4.3
 	* PRE_BUILD: apply gcc43.patch
diff --git a/gnome2-libs/gnome-vfs2/FINAL b/gnome2-libs/gnome-vfs2/FINAL
index 764f2bd..8477a81 100755
--- a/gnome2-libs/gnome-vfs2/FINAL
+++ b/gnome2-libs/gnome-vfs2/FINAL
@@ -1 +1 @@
-update_desktop_database
+update_desktop_database || true
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index 102f447..329159b 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2008-11-20 George Sherwood <gsherwood at sourcemage.org>
+	* FINAL: Added || true to prevent failures. Bug #14883
+
 2008-09-28 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.24.0
 
diff --git a/graphics-libs/glitz/DEPENDS b/graphics-libs/glitz/DEPENDS
index efa6e13..1bd31fa 100755
--- a/graphics-libs/glitz/DEPENDS
+++ b/graphics-libs/glitz/DEPENDS
@@ -1 +1,2 @@
-depends  xorg-libs
+depends xorg-libs &&
+depends OPENGL
diff --git a/graphics-libs/glitz/HISTORY b/graphics-libs/glitz/HISTORY
index 6aec5c0..e3a6505 100644
--- a/graphics-libs/glitz/HISTORY
+++ b/graphics-libs/glitz/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: added OPENGL #14646
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/kernels/madwifi/DETAILS b/kernels/madwifi/DETAILS
index db62296..93c21fd 100755
--- a/kernels/madwifi/DETAILS
+++ b/kernels/madwifi/DETAILS
@@ -7,7 +7,7 @@ if  [[  "$MADWIFI_SVN"  ==  "y"  ]];  then
   fi
             SOURCE=$SPELL-svn.tar.bz2
       SOURCE_HINTS=old_svn_compat
-     SOURCE_URL[0]=svn://svn.madwifi.org/madwifi/trunk:madwifi
+     SOURCE_URL[0]=svn://svn.madwifi-project.org/madwifi/trunk:madwifi
      SOURCE_IGNORE=volatile
     FORCE_DOWNLOAD="on"
 else
diff --git a/kernels/madwifi/HISTORY b/kernels/madwifi/HISTORY
index 61b1ba0..cf1c076 100644
--- a/kernels/madwifi/HISTORY
+++ b/kernels/madwifi/HISTORY
@@ -1,3 +1,6 @@
+2008-11-22 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated subversion SOURCE_URL. Bug 14890
+
 2008-02-23 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 0.9.4
 
diff --git a/kernels/virtualbox-module/DETAILS b/kernels/virtualbox-module/DETAILS
index c0e3e30..6b2f9b9 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
            SPELL=virtualbox-module
-         VERSION=2.0.4
+         VERSION=2.0.6
           SOURCE=virtualbox-module-$VERSION.tar.gz
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY b/kernels/virtualbox-module/HISTORY
index c549c87..2f79dac 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2008-11-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.6
+
 2008-10-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.4
 
diff --git a/latex/xcolor/DEPENDS b/latex/xcolor/DEPENDS
index b320e82..4a95f93 100755
--- a/latex/xcolor/DEPENDS
+++ b/latex/xcolor/DEPENDS
@@ -1 +1,2 @@
-source $SECTION_DIRECTORY/TEX_DEPENDS
+source $SECTION_DIRECTORY/TEX_DEPENDS &&
+depends ghostscript
diff --git a/latex/xcolor/HISTORY b/latex/xcolor/HISTORY
index 036cfb8..d6c5a63 100644
--- a/latex/xcolor/HISTORY
+++ b/latex/xcolor/HISTORY
@@ -1,3 +1,6 @@
+2008-11-29 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Added depends ghostscript Bug #14780
+
 2008-03-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD, DETAILS, INSTALL: updated to  2.11
 2008-02-11 Dale E. Edmons <linuxfan at sourcemage.org>
diff --git a/libs/libgksu/DEPENDS b/libs/libgksu/DEPENDS
index 59b22ce..eb51d4a 100755
--- a/libs/libgksu/DEPENDS
+++ b/libs/libgksu/DEPENDS
@@ -1,5 +1,7 @@
 depends bison                 &&
 depends libgtop2              &&
+depends gconf2                &&
+depends libglade2             &&
 depends startup-notification  &&
 
 optional_depends  gtk-doc    \
diff --git a/libs/libgksu/HISTORY b/libs/libgksu/HISTORY
index 1fd5a0e..bb8300c 100644
--- a/libs/libgksu/HISTORY
+++ b/libs/libgksu/HISTORY
@@ -1,3 +1,6 @@
+2008-11-21 George Sherwoood <gsherwood at sourcemage.org>
+	* DEPENDS: depends libglade2, gconf2. Bug 14882.
+
 2008-10-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.7
 
diff --git a/libs/libtabe/BUILD b/libs/libtabe/BUILD
deleted file mode 100755
index f017157..0000000
--- a/libs/libtabe/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-patch  -p1  <  $SCRIPT_DIRECTORY/libtabe-db4.patch           &&
-patch  -p0  <  $SCRIPT_DIRECTORY/libtabe-db41.patch          &&
-patch  -p1  <  $SCRIPT_DIRECTORY/tsi-remove-annoyance.patch  &&
-
-default_build
-)  >  ${C_FIFO}  2>&1
diff --git a/libs/libtabe/DETAILS b/libs/libtabe/DETAILS
index 4142995..36b0a4c 100755
--- a/libs/libtabe/DETAILS
+++ b/libs/libtabe/DETAILS
@@ -1,13 +1,12 @@
            SPELL=libtabe
-         VERSION=0.2.5
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/$SOURCE
+         VERSION=0.2.6
+          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.orig
+   SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/libt/libtabe/$SOURCE
         WEB_SITE=http://libtabe.sourceforge.net/
-          MD5[0]=f15aa8d89427b1a8e2e9c4d0a96ec3b6
+     SOURCE_HASH=sha512:88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
       LICENSE[0]=GPL
          ENTERED=20021012
-         UPDATED=20030907
            SHORT="Chinese lexicons library."
 cat << EOF
 Chinese lexicons library for xcin-2.5's bimsphone input method.
diff --git a/libs/libtabe/HISTORY b/libs/libtabe/HISTORY
index a9fd730..a3c0aa3 100644
--- a/libs/libtabe/HISTORY
+++ b/libs/libtabe/HISTORY
@@ -1,3 +1,13 @@
+2008-11-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.2.6. Updated SOURCE & SOURCE_URL.
+	  Removed UPDATED. Fixes Bug 9843.
+	* BUILD: Removed.  Was only used for patching.
+	* PRE_BUILD: Added to apply patch
+	* libtabe_0.2.6-1.1.diff.bz2: Added Debian patch
+	* libtabe-db41.patch: Removed old patch.
+	* libtabe-db4.patch: Removed old patch
+	* tsi-remove-annoyance.patch: Removed old patch
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/libs/libtabe/PRE_BUILD b/libs/libtabe/PRE_BUILD
new file mode 100755
index 0000000..ec9e964
--- /dev/null
+++ b/libs/libtabe/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+cp $SCRIPT_DIRECTORY/libtabe_0.2.6-1.1.diff.bz2 $SOURCE_DIRECTORY &&
+bunzip2 libtabe_0.2.6-1.1.diff.bz2 &&
+
+patch -p1 < libtabe_0.2.6-1.1.diff
diff --git a/libs/libtabe/libtabe-db4.patch b/libs/libtabe/libtabe-db4.patch
deleted file mode 100644
index fc66c1a..0000000
--- a/libs/libtabe/libtabe-db4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr libtabe.orig/src/tabe_tsidbint.c libtabe/src/tabe_tsidbint.c
---- libtabe.orig/src/tabe_tsidbint.c	Tue Jan 29 09:52:05 2002
-+++ libtabe/src/tabe_tsidbint.c	Tue Jan 29 09:52:28 2002
-@@ -265,7 +265,7 @@
-   switch(tsidb->type) {
-   case DB_TYPE_DB:
-     dbp = (DB *)tsidb->dbp;
--    errno = dbp->stat(dbp, &sp, NULL, 0);
-+    errno = dbp->stat(dbp, &sp, 0);
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);
-diff -uNr libtabe.orig/src/tabe_tsiyindbint.c libtabe/src/tabe_tsiyindbint.c
---- libtabe.orig/src/tabe_tsiyindbint.c	Tue Jan 29 09:52:05 2002
-+++ libtabe/src/tabe_tsiyindbint.c	Tue Jan 29 09:52:46 2002
-@@ -268,7 +268,7 @@
-   switch(tsiyindb->type) {
-   case DB_TYPE_DB:
-     dbp = (DB *)tsiyindb->dbp;
--    errno = dbp->stat(dbp, &sp, NULL, 0);
-+    errno = dbp->stat(dbp, &sp, 0);
-     if (!errno) {
- #ifndef HAVE_DB3
-       return(sp->bt_nrecs);
diff --git a/libs/libtabe/libtabe-db41.patch b/libs/libtabe/libtabe-db41.patch
deleted file mode 100644
index 06de17c..0000000
--- a/libs/libtabe/libtabe-db41.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur src.orig/tabe_tsidbint.c src/tabe_tsidbint.c
---- src.orig/tabe_tsidbint.c	2003-05-26 02:16:15.000000000 +0800
-+++ src/tabe_tsidbint.c	2003-05-26 02:17:29.000000000 +0800
-@@ -85,7 +85,7 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
- #endif
-     }
-   }
-@@ -94,14 +94,14 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
- #endif
-     }
-     else {
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
- #endif
-     }
-   }
-diff -ur src.orig/tabe_tsiyindbint.c src/tabe_tsiyindbint.c
---- src.orig/tabe_tsiyindbint.c	2003-05-26 02:16:15.000000000 +0800
-+++ src/tabe_tsiyindbint.c	2003-05-26 02:16:54.000000000 +0800
-@@ -88,7 +88,7 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
- #endif
-     }
-   }
-@@ -97,14 +97,14 @@
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
- #endif
-     }
-     else {
- #ifndef HAVE_DB3
-       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
- #else
--      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
-+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
- #endif
-     }
-   }
diff --git a/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2 b/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2
new file mode 100644
index 0000000..dc7653c
Binary files /dev/null and b/libs/libtabe/libtabe_0.2.6-1.1.diff.bz2 differ
diff --git a/libs/libtabe/tsi-remove-annoyance.patch b/libs/libtabe/tsi-remove-annoyance.patch
deleted file mode 100644
index 36f07c9..0000000
--- a/libs/libtabe/tsi-remove-annoyance.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libtabe.orig/tsi-src/tsi.src	2003-02-08 16:51:29.000000000 +0800
-+++ libtabe/tsi-src/tsi.src	2003-02-08 16:50:50.000000000 +0800
-@@ -121226,7 +121226,6 @@
- �� 21		����4
- ���� 75		����4 �w��
- �� 596		����4
--���F 4		����4 �{��5
- ���� 49		����4 �z��3
- ���??� 3	����4 �z��3 ��2
- ���� 1		����4 ����2
diff --git a/net/dhcp/BUILD b/net/dhcp/BUILD
index 86c3780..2a81073 100755
--- a/net/dhcp/BUILD
+++ b/net/dhcp/BUILD
@@ -1,2 +1,4 @@
 ./configure &&
+# fix the (only) now bad man path
+sed -i 's,usr/man,usr/share/man,' */Makefile */*/Makefile &&
 make
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 7eb5323..c723808 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,6 @@
+2008-11-24 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* BUILD: fix the changing, but bad install path #14878
+
 2008-07-26 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: updated version to 3.1.1
 
diff --git a/net/ngrep/BUILD b/net/ngrep/BUILD
new file mode 100644
index 0000000..66b582c
--- /dev/null
+++ b/net/ngrep/BUILD
@@ -0,0 +1,4 @@
+#For Bug 14901
+OPTS="--with-pcap-includes=/usr/include/pcap $OPTS" &&
+
+default_build
diff --git a/net/ngrep/HISTORY b/net/ngrep/HISTORY
index 93b6dd9..b495787 100644
--- a/net/ngrep/HISTORY
+++ b/net/ngrep/HISTORY
@@ -1,3 +1,7 @@
+2008-11-21 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Added option --with-pcap-includes=/usr/include/pcap
+	  Bug #14901
+
 2006-11-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.45, removed UPDATED
 
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 570a1a7..b2cd8a4 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
            SPELL=samba
-         VERSION=3.2.4
+         VERSION=3.2.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://us5.samba.org/pub/samba-ftp/$SOURCE
    SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
    SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-     SOURCE_HASH=sha512:a5bfa89180ca78b69f7f6592976cc8e475bffc48cd0dcd6bbb77c1b691efa92f9079b05f5f4d6bf16fa92bf211b72179df940999ec889b07481f1165f3d22107
+     SOURCE_HASH=sha512:bad061a830bfb4a3ada6d783378508ee4ed6cf68efed2cfa77b20e7dcd9dcf702482c15178769912d40e9b9dc1c66d31f6497c6ec9797190866fd0f9f4a365a9
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6c-beta4
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
   SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2        
     SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
 fi
-  SECURITY_PATCH=9
+  SECURITY_PATCH=10
       LICENSE[0]=GPL
         WEB_SITE=http://www.samba.org/
         KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 499703f..37502fe 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2008-11-27 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: updated spell to 3.2.5. SECURITY_PATCH++
+	  See http://us6.samba.org/samba/history/samba-3.2.5.html
+
 2008-09-18 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.2.4
 
diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 481abe6..fd3e472 100755
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -1,6 +1,7 @@
 # need a comma separated list
-OPTS="--with-drivers=`echo ${GS_PRINTERS} |sed "s/^ *//;s/ /,/g"`,FILES \
-      --enable-dynamic ${GS_OMNI} ${OPTS}"  &&
+OPTS="--with-drivers=`echo ${GS_PRINTERS} | \
+      sed "s/  */ /g;s/^ *//;s/ *$/ /;s/^NONE //;s/ /,/g"`FILES \
+      --enable-dynamic ${GS_OMNI} ${OPTS}" &&
 
 make_single   &&
 default_build &&
diff --git a/printer/ghostscript/CONFIGURE b/printer/ghostscript/CONFIGURE
index 3cadc26..d1c202a 100755
--- a/printer/ghostscript/CONFIGURE
+++ b/printer/ghostscript/CONFIGURE
@@ -7,7 +7,7 @@ if [[ ${GS_SEL} == y ]]; then
   persistent_remove GS_PRINTERS
 fi
 config_query_multi GS_PRINTERS "Please select printer types" \
-              ALL APPLE BROTHER CANON EPSON HP IBM JAPAN LEXMARK OKI PCLXL
+              ALL NONE APPLE BROTHER CANON EPSON HP IBM JAPAN LEXMARK OKI PCLXL
 persistent_remove GS_SEL
 config_query_option GS_OMNI "Build Omni drivers?" n\
                             "--with-omni"         \
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 3117d70..1062224 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,7 @@
+2008-11-21 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Added ability to build no printer drivers. Bug 14889.
+	* CONFIGURE: Added choice for no printer drivers. Bug 14889.
+
 2008-08-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 8.63
 
diff --git a/utils/devtodo/HISTORY b/utils/devtodo/HISTORY
index 1501984..664ef47 100644
--- a/utils/devtodo/HISTORY
+++ b/utils/devtodo/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* gcc4.3.0_fix.diff: added for #14910
+
 2007-01-28 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* PRE_BUILD, gcc4 patch: added to fix compilation #13460
 
diff --git a/utils/devtodo/PRE_BUILD b/utils/devtodo/PRE_BUILD
index 64d7228..7843a8a 100755
--- a/utils/devtodo/PRE_BUILD
+++ b/utils/devtodo/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 patch -p1 <  $SPELL_DIRECTORY/devtodo-0.1.19-gcc4.diff &&
 # another gcc4 fix
-sed -i '/int TodoDB::markDone(Todo &todo);/ s,TodoDB::,,' src/TodoDB.h
+sed -i '/int TodoDB::markDone(Todo &todo);/ s,TodoDB::,,' src/TodoDB.h &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc4.3.0_fix.diff
diff --git a/utils/devtodo/gcc4.3.0_fix.diff b/utils/devtodo/gcc4.3.0_fix.diff
new file mode 100644
index 0000000..ebf4ed1
--- /dev/null
+++ b/utils/devtodo/gcc4.3.0_fix.diff
@@ -0,0 +1,10 @@
+--- src/todoterm.cc	2008-05-03 17:10:43.000000000 +0200
++++ src/todoterm.cc	2008-05-03 17:08:46.000000000 +0200
+@@ -4,6 +4,7 @@
+ #ifdef USETERMCAP
+ #include <iostream>
+ #include <string>
++#include <stdlib.h>
+ #include <stdexcept>
+ #include <curses.h>
+ #include <term.h>
diff --git a/utils/fcrontabs/DETAILS b/utils/fcrontabs/DETAILS
index 604e06f..90bb3ba 100755
--- a/utils/fcrontabs/DETAILS
+++ b/utils/fcrontabs/DETAILS
@@ -3,6 +3,7 @@
       LICENSE[0]=PD
          ENTERED=20030714
         KEYWORDS="utils"
+  STAGED_INSTALL=off
            SHORT="directories to put commands in to run regularly."
 cat << EOF
 The fcrontabs spell installs directories such as /etc/cron.daily where
diff --git a/utils/fcrontabs/HISTORY b/utils/fcrontabs/HISTORY
index 206754a..2a61644 100644
--- a/utils/fcrontabs/HISTORY
+++ b/utils/fcrontabs/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: turn off staging, as it runs fcron that doesn't like it #14911
+
 2008-10-01 Elisamuel Resto <ryuji at sourcemage.org>
 	* INSTALL: removed run-parts install; use install_config_file for fcrontab
 	* run-parts: removed.
diff --git a/utils/virtualbox/BUILD b/utils/virtualbox/BUILD
index 85f976b..66dd519 100755
--- a/utils/virtualbox/BUILD
+++ b/utils/virtualbox/BUILD
@@ -1,3 +1,5 @@
+# gcc34 is only used to compile the dynamic recompiler of virtualbox
+OPTS="--with-gcc-compat=${INSTALL_ROOT}/opt/gcc34/bin/gcc $OPTS"
 ./configure $OPTS  &&
 
 # patch to make this spell compiling with libxcursor from xorg-modular grimoire
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index 8bbe9e8..faf1de6 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -1,5 +1,6 @@
 suggest_depends  virtualbox-module  ""  ""  "for vboxdrv kernel module"  &&
 
+depends  gcc34    &&
 depends  dev86    &&
 depends  iasl     &&
 depends  libxslt  &&
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index e1a3923..3ff1557 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,12 +1,12 @@
            SPELL=virtualbox
-         VERSION=2.0.4
+         VERSION=2.0.6
 #     GCC_VERSION=3.4
       PATCHLEVEL=0
           SOURCE=VirtualBox-$VERSION-OSE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-$VERSION
    SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/$VERSION/$SOURCE
 #   SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:1e55641cca93b94a7f44bc5dac0e67c2634cad64410f953eec7ab471446d18195b190cdc03f86ceff5730f890a75ac5f954b6d0f9a3f3352983e14cfd3127691
+     SOURCE_HASH=sha512:609b5f2870f051472162b439287997de021e0a3f09cc22a2d4111ec7d04a6f2b63f4ce3aa1ec9e523cb69481c11fcf920ffc2564557660e280366cdebaa4beee
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 5e0c66e..522bc96 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,8 @@
+2008-11-25 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.6
+	* DEPENDS, BUILD: added gcc34, 2.0.6 needs it
+	* PRE_BUILD: added python2.6
+
 2008-10-24 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS, BUILD: removed gcc34
 
diff --git a/utils/virtualbox/PRE_BUILD b/utils/virtualbox/PRE_BUILD
index 2d633ea..1e90cdc 100755
--- a/utils/virtualbox/PRE_BUILD
+++ b/utils/virtualbox/PRE_BUILD
@@ -18,3 +18,5 @@ sedit "72d;73d;74d;76d" configure
 sedit "72iQT3DIR=\"$SOURCE_DIRECTORY/FAKEQTDIR\"" configure
 sedit "73iQT4DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
 sedit "74iQT4UIC3DIR=\"$SOURCE_DIRECTORY/FAKEQT4DIR\"" configure
+
+sedit "s:python2.5:python2.6 python2.5:" configure
diff --git a/video-libs/dirac/HISTORY b/video-libs/dirac/HISTORY
index 9b8b4c8..e0b6b70 100644
--- a/video-libs/dirac/HISTORY
+++ b/video-libs/dirac/HISTORY
@@ -1,3 +1,8 @@
+2008-11-22 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_BUILD: Added to patch and run bootstrap
+	* dirac.patch: Added upstream patch to allow building without
+	  doxygen. Bug 14795.
+
 2008-09-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.0
 
diff --git a/video-libs/dirac/PRE_BUILD b/video-libs/dirac/PRE_BUILD
new file mode 100644
index 0000000..bb01b46
--- /dev/null
+++ b/video-libs/dirac/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+patch -Np1 < $SPELL_DIRECTORY/doxygen.patch &&
+./bootstrap
diff --git a/video-libs/dirac/doxygen.patch b/video-libs/dirac/doxygen.patch
new file mode 100644
index 0000000..364f65e
--- /dev/null
+++ b/video-libs/dirac/doxygen.patch
@@ -0,0 +1,13 @@
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2008-09-16 06:23:55.000000000 +0200
++++ b/Makefile.am	2008-10-19 23:08:50.624497993 +0200
+@@ -15,9 +15,6 @@
+ DOC_DIR =
+ endif
+ 
+-if HAVE_LATEX
+-DOC_DIR = doc
+-endif
+ 
+ if HAVE_CPPUNIT
+ CPPUNITTESTS_DIR = unit_tests
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index 8400d3c..4526122 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* gcc-4.3.patch: added for #14913
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
index f1cb151..83214b0 100755
--- a/video/mjpegtools/PRE_BUILD
+++ b/video/mjpegtools/PRE_BUILD
@@ -5,4 +5,5 @@ sedit  '19i#include <cassert>'  y4mdenoise/Region2D.hh &&
 # configure of 1.8.0 is broken when providing without-quicktime!
 # check for fix if there is a new release; also remove automake/conf deps
 patch < ${SCRIPT_DIRECTORY}/mjpegtools-configure.ac-pkgconfig.diff &&
-./autogen.sh
+./autogen.sh &&
+patch -F3 -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc-4.3.patch
diff --git a/video/mjpegtools/gcc-4.3.patch b/video/mjpegtools/gcc-4.3.patch
new file mode 100644
index 0000000..84a5ebc
--- /dev/null
+++ b/video/mjpegtools/gcc-4.3.patch
@@ -0,0 +1,90 @@
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/encodertypes.h mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/encodertypes.h	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h	2008-04-04 18:20:59.000000000 +0300
+@@ -25,6 +25,8 @@
+  */
+ 
+ 
++#include <cstdlib>
++
+ class Parity
+ {
+ public:
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/macroblock.cc mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/macroblock.cc	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc	2008-04-04 18:20:49.000000000 +0300
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <cassert>
++#include <climits>
+ 
+ #include "macroblock.hh"
+ #include "mpeg2syntaxcodes.h"
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/picturereader.cc mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/picturereader.cc	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc	2008-04-04 18:20:49.000000000 +0300
+@@ -27,6 +27,7 @@
+ //#include <stdlib.h>
+ //#include <unistd.h>
+ //#include <string.h>
++#include <climits>
+ //#include <errno.h>
+ //#include "simd.h"
+ 
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/inputstrm.cpp mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/inputstrm.cpp	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp	2008-04-04 18:20:49.000000000 +0300
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <assert.h>
++#include <climits>
+ 
+ #include "mjpeg_types.h"
+ #include "inputstrm.hpp"
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/main.cpp mjpegtools-1.9.0rc3/mplex/main.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/main.cpp	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/main.cpp	2008-04-04 18:20:49.000000000 +0300
+@@ -31,6 +31,7 @@
+ #include <getopt.h>
+ #endif
+ #include <string>
++#include <string.h>
+ #include <memory>
+ #include <sys/stat.h>
+ #ifndef _WIN32
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/multiplexor.cpp mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/multiplexor.cpp	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp	2008-04-04 18:20:49.000000000 +0300
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/padstrm.cpp mjpegtools-1.9.0rc3/mplex/padstrm.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/padstrm.cpp	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp	2008-04-04 18:20:49.000000000 +0300
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <string.h>
+ #include "padstrm.hpp"
+ 
+ 
+diff -Nur mjpegtools-1.9.0rc3-old/y4mdenoise/SkipList.hh mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
+--- mjpegtools-1.9.0rc3-old/y4mdenoise/SkipList.hh	2008-04-04 18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh	2008-04-04 18:20:49.000000000 +0300
+@@ -57,7 +57,7 @@
+ 		// Will give good sorting for up to e^10 items.
+ 	
+ public:
+-	typedef Allocator<Node,HEADERCHUNK> Allocator;
++        typedef ::Allocator<Node,HEADERCHUNK> Allocator;
+ 		// The type of node allocator to use.
+ 
+ 	static Allocator sm_oNodeAllocator;
diff --git a/wm-addons/wmtop/HISTORY b/wm-addons/wmtop/HISTORY
index b2c7a66..4d5fa70 100644
--- a/wm-addons/wmtop/HISTORY
+++ b/wm-addons/wmtop/HISTORY
@@ -1,3 +1,6 @@
+2008-11-24 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PRE_BUILD: added to fix manpath #14817
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/wm-addons/wmtop/PRE_BUILD b/wm-addons/wmtop/PRE_BUILD
new file mode 100644
index 0000000..a78b357
--- /dev/null
+++ b/wm-addons/wmtop/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+
+sed -i 's,man/man1,share/&,' $SOURCE_DIRECTORY/Makefile
diff --git a/x11/gmrun/DETAILS b/x11/gmrun/DETAILS
index 1e1122b..c69c17f 100755
--- a/x11/gmrun/DETAILS
+++ b/x11/gmrun/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gmrun
-         VERSION=0.9
+         VERSION=0.9.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
         WEB_SITE=http://www.dynarch.com/mishoo/gmrun.epl
-     SOURCE_HASH=sha512:e7e3ed89009d6f390cf4434991c7f04f6c2373eeb930f2897121e84973ddd2c82de219f6a5d989a35fc7ec9aa821348ae846019df4ea3f82a66d57ab00a35836
+     SOURCE_HASH=sha512:3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
          ENTERED=20040921
         KEYWORDS="x11"
            SHORT="gmrun is a simple run-program window."
diff --git a/x11/gmrun/HISTORY b/x11/gmrun/HISTORY
index 43337ee..c929bc4 100644
--- a/x11/gmrun/HISTORY
+++ b/x11/gmrun/HISTORY
@@ -1,3 +1,7 @@
+2008-11-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.9.2 #14899
+	* PRE_BUILD, gmrun-0.9.2-gcc43.patch: added patch from Gentoo
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/x11/gmrun/PRE_BUILD b/x11/gmrun/PRE_BUILD
new file mode 100644
index 0000000..5eb6806
--- /dev/null
+++ b/x11/gmrun/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/gmrun-0.9.2-gcc43.patch
diff --git a/x11/gmrun/gmrun-0.9.2-gcc43.patch b/x11/gmrun/gmrun-0.9.2-gcc43.patch
new file mode 100644
index 0000000..5be3922
--- /dev/null
+++ b/x11/gmrun/gmrun-0.9.2-gcc43.patch
@@ -0,0 +1,40 @@
+--- gmrun-0.9.2/src/gtkcompletionline.cc.orig	2003-11-16 11:55:07.000000000 +0100
++++ gmrun-0.9.2/src/gtkcompletionline.cc	2008-05-08 08:51:22.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <set>
+ #include <sstream>
+ #include <string>
++#include <cstring>
+ #include <vector>
+ using namespace std;
+ 
+--- gmrun-0.9.2/src/ci_string.h.orig	2001-05-16 16:39:31.000000000 +0200
++++ gmrun-0.9.2/src/ci_string.h	2008-05-08 08:51:33.000000000 +0200
+@@ -7,6 +7,7 @@
+ #define __CI_STRING_H__
+ 
+ #include <string>
++#include <cstring>
+ #include <ctype.h>
+ 
+ struct ci_char_traits : public std::char_traits<char>
+--- gmrun-0.9.2/src/prefs.cc.orig	2002-08-16 12:48:22.000000000 +0200
++++ gmrun-0.9.2/src/prefs.cc	2008-05-08 08:51:54.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include <list>
+ 
+--- gmrun-0.9.2/src/main.cc.orig	2003-11-16 11:55:07.000000000 +0100
++++ gmrun-0.9.2/src/main.cc	2008-05-08 09:03:11.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include <vector>
diff --git a/x11/xbindkeys/DEPENDS b/x11/xbindkeys/DEPENDS
index 3526443..fcd0fe3 100755
--- a/x11/xbindkeys/DEPENDS
+++ b/x11/xbindkeys/DEPENDS
@@ -1,3 +1,8 @@
 depends xorg-libs &&
 depends automake &&
-depends autoconf
+depends autoconf &&
+
+optional_depends guile "--enable-guile" "--disable-guile" \
+  "disable scheme/guile configuration file style" &&
+
+optional_depends tk "--enable-tk" "--disable-tk" "for xbindkeys_show"
diff --git a/x11/xbindkeys/HISTORY b/x11/xbindkeys/HISTORY
index 47d8eec..335d09b 100644
--- a/x11/xbindkeys/HISTORY
+++ b/x11/xbindkeys/HISTORY
@@ -1,3 +1,6 @@
+2008-11-25 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DEPENDS: added tk and guile #14875
+
 2008-04-23 Ivan Lezhnjov Jr. <ivan.lezhnjov.jr at sourcemage.org>
 	* DETAILS: updated spell to 1.8.2
 
diff --git a/xfce/xfce4-dict/DETAILS b/xfce/xfce4-dict/DETAILS
index 7910b9b..e68fc93 100755
--- a/xfce/xfce4-dict/DETAILS
+++ b/xfce/xfce4-dict/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfce4-dict
-         VERSION=0.4.1
+         VERSION=0.5.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
diff --git a/xfce/xfce4-dict/HISTORY b/xfce/xfce4-dict/HISTORY
index d90f993..a96bff0 100644
--- a/xfce/xfce4-dict/HISTORY
+++ b/xfce/xfce4-dict/HISTORY
@@ -1,3 +1,6 @@
+2008-11-23 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.5.1
+
 2008-09-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: Changed SOURCE_URL[0] extension; updated spell to 0.4.1;
 	  quoting paths
diff --git a/xfce/xfce4-dict/xfce4-dict-0.4.1.tar.bz2.sig b/xfce/xfce4-dict/xfce4-dict-0.4.1.tar.bz2.sig
deleted file mode 100644
index 4ffe928..0000000
Binary files a/xfce/xfce4-dict/xfce4-dict-0.4.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfce4-dict/xfce4-dict-0.5.1.tar.bz2.sig b/xfce/xfce4-dict/xfce4-dict-0.5.1.tar.bz2.sig
new file mode 100644
index 0000000..ff73e92
Binary files /dev/null and b/xfce/xfce4-dict/xfce4-dict-0.5.1.tar.bz2.sig differ



More information about the SM-Commit mailing list