20110420.1 global branch merge.current-20110420.1

221 files changed, 2600 insertions, 922 deletions

diff --git a/README b/README
index fcef7b4f67..c0fea52009 100644
--- a/README
+++ b/README
@@ -1,3 +1,10 @@
+Check https://github.com/Ponce/slackbuilds/wiki for additional informations.
+
+See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg
+for instructions on how to use this repository with sbopkg.
+
+original README from slackbuilds.org follow:
+--------------------------------------------
 
 See http://slackbuilds.org/howto/ for instructions on 
 how to use the contents of this directory.
@@ -7,3 +14,4 @@ Access is also available via:
  git://slackbuilds.org/slackbuilds
  http://slackbuilds.org/gitweb/
  ftp://slackbuilds.org/
+
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index c4667546cd..2e16d299c7 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -30,7 +30,7 @@
 
 PRGNAM=audacity
 VERSION=1.3.12
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -94,10 +94,16 @@ find . \
  -exec chmod 644 {} \;
 
 # Fix ffmpeg support for version 0.6
-patch -p1 -i $CWD/audacity-src-1.3.12-beta-avformat-api-change.patch
+patch -p1 < $CWD/patches/audacity-1.3.12-ffmpeg.patch
+
+# http://bugs.gentoo.org/show_bug.cgi?id=322145
+# patch for the new gcc in current
+patch -p0 < $CWD/patches/audacity-1.3.12-gcc45.patch
+
+# avoid collisions
+patch -p1 < $CWD/patches/audacity-1.3.12-automagic.patch
 
 # Fix configure in lib-src/portmixer/
-patch -p1 -i $CWD/audacity-src-1.3.12-beta-configure-portmixer.patch
 cd lib-src/portmixer
 autoreconf
 cd -
diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info
index 0b0e76008d..2a434a2709 100644
--- a/audio/audacity/audacity.info
+++ b/audio/audacity/audacity.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="Niels Horn"
+APPROVED=""
diff --git a/audio/audacity/patches/audacity-1.3.12-automagic.patch b/audio/audacity/patches/audacity-1.3.12-automagic.patch
new file mode 100644
index 0000000000..92405e9413
--- /dev/null
+++ b/audio/audacity/patches/audacity-1.3.12-automagic.patch
@@ -0,0 +1,60 @@
+--- a/configure.in
++++ b/configure.in
+@@ -559,6 +559,8 @@ case "${host_os}" in
+ esac
+ 
+ dnl PortAudio configuration
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
+ 
+ LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
+@@ -575,13 +577,21 @@ case "${host_os}" in
+       ;;
+    *)
+       dnl Unix
+-      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-      if [[ $have_alsa = "yes" ]] ; then
+-         LIBS="$LIBS -lasound"
+-      fi
+-      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-      if [[ $have_jack = "yes" ]] ; then
+-         LIBS="$LIBS $JACK_LIBS"
++      if test "x$with_alsa" != "xno"; then
++         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++         if [[ $have_alsa = "yes" ]] ; then
++            LIBS="$LIBS -lasound"
++        else
++            AC_MSG_WARN([Support for alsa not available])
++         fi
++      fi        
++      if test "x$with_jack" != "xno"; then
++         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++         if [[ $have_jack = "yes" ]] ; then
++            LIBS="$LIBS $JACK_LIBS"
++        else
++            AC_MSG_WARN([Support for jack not available])
++         fi
+       fi
+       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+       if [[ $have_asihpi = "yes" ]] ; then
+--- a/lib-src/portmixer/configure.ac
++++ b/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@ AC_ARG_ENABLE([debug],
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
+ #
+ # Check for portaudio path
+ #
+@@ -107,7 +109,7 @@ if [[ $have_oss = "yes" ]] ; then
+    objects="$objects px_unix_oss.o"
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE(Including support for ALSA);
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"
diff --git a/audio/audacity/audacity-src-1.3.12-beta-avformat-api-change.patch b/audio/audacity/patches/audacity-1.3.12-ffmpeg.patch
index e6e8315598..22146bb1bb 100644
--- a/audio/audacity/audacity-src-1.3.12-beta-avformat-api-change.patch
+++ b/audio/audacity/patches/audacity-1.3.12-ffmpeg.patch
@@ -1,33 +1,52 @@
-diff -p -up audacity-src-1.3.12-beta/src/FFmpeg.cpp~ audacity-src-1.3.12-beta/src/FFmpeg.cpp
---- audacity-src-1.3.12-beta/src/FFmpeg.cpp~	2010-03-30 13:28:54.000000000 +0200
-+++ audacity-src-1.3.12-beta/src/FFmpeg.cpp	2010-05-07 11:17:29.000000000 +0200
-@@ -356,7 +356,7 @@ int ufile_fopen_input(AVFormatContext **
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.cpp	2010-03-30 04:28:54.000000000 -0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.cpp	2010-10-26 12:22:02.145695409 -0700
+@@ -204,7 +204,11 @@
+    return ret;
+ }
+ 
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
++static int ufile_write(URLContext *h, const unsigned char *buf, int size)
++#else
+ static int ufile_write(URLContext *h, unsigned char *buf, int size)
++#endif
+ {
+    return (int) ((wxFile *) h->priv_data)->Write(buf, size);
+ }
+@@ -356,7 +360,11 @@
           }
           // Otherwize, resort to extension matching if available
           else if (fmt1->extensions) {
--            if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
 +            if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
++#else
+             if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
++#endif
                 score = 50;
              }
           }
-@@ -829,7 +829,7 @@ bool FFmpegLibs::InitLibs(wxString libpa
+@@ -829,7 +837,11 @@
     INITDYN(avformat,av_open_input_file);
     INITDYN(avformat,av_open_input_stream);
     INITDYN(avformat,get_buffer);
--   INITDYN(avformat,match_ext);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
 +   INITDYN(avformat,av_match_ext);
++#else
+    INITDYN(avformat,match_ext);
++#endif
  
  #if FFMPEG_STABLE
     INITDYN(avformat,av_init_packet);
-diff -p -up audacity-src-1.3.12-beta/src/FFmpeg.h~ audacity-src-1.3.12-beta/src/FFmpeg.h
---- audacity-src-1.3.12-beta/src/FFmpeg.h~	2010-03-30 13:28:54.000000000 +0200
-+++ audacity-src-1.3.12-beta/src/FFmpeg.h	2010-05-07 11:17:45.000000000 +0200
-@@ -224,7 +224,7 @@ public:
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.h	2010-03-30 04:28:54.000000000 -0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.h	2010-10-26 12:23:02.618168997 -0700
+@@ -224,7 +224,11 @@
     AVStream*         (*av_new_stream)                 (AVFormatContext *s, int id);
     AVFormatContext*  (*av_alloc_format_context)       (void);
     AVOutputFormat*   (*guess_format)                  (const char *short_name, const char *filename, const char *mime_type);
--   int               (*match_ext)                     (const char *filename, const char *extensions);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
 +   int               (*av_match_ext)                  (const char *filename, const char *extensions);
++#else
+    int               (*match_ext)                     (const char *filename, const char *extensions);
++#endif
     int               (*av_write_trailer)              (AVFormatContext *s);
     int               (*av_interleaved_write_frame)    (AVFormatContext *s, AVPacket *pkt);
     int               (*av_write_frame)                (AVFormatContext *s, AVPacket *pkt);
diff --git a/audio/audacity/patches/audacity-1.3.12-gcc45.patch b/audio/audacity/patches/audacity-1.3.12-gcc45.patch
new file mode 100644
index 0000000000..198873c57f
--- /dev/null
+++ b/audio/audacity/patches/audacity-1.3.12-gcc45.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/322145
+http://bugzilla.audacityteam.org/show_bug.cgi?id=221
+
+--- lib-src/portmixer/configure.ac
++++ lib-src/portmixer/configure.ac
+@@ -49,34 +49,57 @@
+ fi
+ 
+ #
++# Check which APIs are available
++#
++
++have_oss=no
++AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
++
++AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
++AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
++AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
++
++#
+ # Make sure the support is there
+ #
+ have_support=yes
+-AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
+-		AC_MSG_WARN("Missing support in pa_win_ds.h");
+-fi
+-AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_alsa = "yes" ]] ; then
++	AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_linux_alsa.h");
++	fi
+ fi
+-AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
+-		AC_MSG_WARN("Missing support in pa_win_wmme.h");
+-fi
+-AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_coreaudio = "yes" ]] ; then
++	AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_mac_core.h");
++	fi
+ fi
+-AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_oss = "yes" ]] ; then
++	AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_unix_oss.h");
++	fi
+ fi
++
++if [[ $have_windows = "yes" ]] ; then
++	AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
++		AC_MSG_WARN("Missing support in pa_win_ds.h");
++	fi
++	AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
++		AC_MSG_WARN("Missing support in pa_win_wmme.h");
++	fi
++fi
++
+ AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no])
+ if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in portaudio.h");
+ fi
+-
+ if [[ $have_support = "no" ]] ; then
+    AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
+ fi
+@@ -88,16 +111,6 @@
+ AC_SUBST( objects, [px_mixer.o] )
+ 
+ #
+-# Check which APIs are available
+-#
+-
+-have_oss=no
+-AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
+-
+-AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
+-AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+-
+-#
+ # Set up to use the identified ones
+ #
+ AC_MSG_NOTICE(---------------------------------------);
diff --git a/audio/audacity/audacity-src-1.3.12-beta-configure-portmixer.patch b/audio/audacity/patches/audacity-src-1.3.12-beta-configure-portmixer.patch
index 8d97ac300f..8d97ac300f 100644
--- a/audio/audacity/audacity-src-1.3.12-beta-configure-portmixer.patch
+++ b/audio/audacity/patches/audacity-src-1.3.12-beta-configure-portmixer.patch
diff --git a/audio/id3/id3.SlackBuild b/audio/id3/id3.SlackBuild
index b3de0c065f..a6edf3680d 100644
--- a/audio/id3/id3.SlackBuild
+++ b/audio/id3/id3.SlackBuild
@@ -70,10 +70,8 @@ cp -a id3.man $PKG/usr/man/man1/id3.1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/audio/lxmusic/lxmusic.SlackBuild b/audio/lxmusic/lxmusic.SlackBuild
index 992e3e8509..4e47a132ea 100644
--- a/audio/lxmusic/lxmusic.SlackBuild
+++ b/audio/lxmusic/lxmusic.SlackBuild
@@ -7,16 +7,14 @@
 # generated by Grissiom's sbo-dev-helper
 
 PRGNAM=lxmusic
-VERSION=${VERSION:-20100906_885e460}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20110317_d9d0ea3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -71,8 +69,7 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING NEWS README \
+cp -a COPYING NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/lxmusic/lxmusic.info b/audio/lxmusic/lxmusic.info
index 376e2930b9..5f446db608 100644
--- a/audio/lxmusic/lxmusic.info
+++ b/audio/lxmusic/lxmusic.info
@@ -1,10 +1,10 @@
 PRGNAM="lxmusic"
-VERSION="20100906_885e460"
+VERSION="20110317_d9d0ea3"
 HOMEPAGE="http://wiki.lxde.org/en/LXMusic"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxmusic-20100906_885e460.tar.xz"
-MD5SUM="daf8afe7f079a49801962ed58ff9ff67"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxmusic-20110317_d9d0ea3.tar.xz"
+MD5SUM="f4a6da92c69c9ca8bee60db410fdfbce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild
index 1853840eee..6885ca3ca0 100644
--- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild
+++ b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ffmpegthumbnailer
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info
index 1075faaa48..a762ccaf64 100644
--- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info
+++ b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info
@@ -1,10 +1,10 @@
 PRGNAM="ffmpegthumbnailer"
-VERSION="2.0.2"
+VERSION="2.0.6"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer/"
-DOWNLOAD="http://ffmpegthumbnailer.googlecode.com/files/ffmpegthumbnailer-2.0.2.tar.gz"
-MD5SUM="ee473a26e7e8da216e64bbb33e87772c"
+DOWNLOAD="http://ffmpegthumbnailer.googlecode.com/files/ffmpegthumbnailer-2.0.6.tar.gz"
+MD5SUM="5003ceaadc1c5a1be1dbb34739a12bab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/desktop/lxde-common/lxde-common.SlackBuild b/desktop/lxde-common/lxde-common.SlackBuild
index 62e9f73e27..d591c7e2c7 100644
--- a/desktop/lxde-common/lxde-common.SlackBuild
+++ b/desktop/lxde-common/lxde-common.SlackBuild
@@ -39,6 +39,8 @@
 #             * fixed lxpanel and xinitrc
 # 20110313_736ded3: 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
 #             * updated to git version.
+# 20110328_87c368d: 05/apr/2011 by ponce <matteo.bernardini@gmail.com>
+#             * small version bump to fix an issue with pcmanfm conf.
 # 
 # Run 'sh lxde-common.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -47,7 +49,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxde-common
-VERSION=${VERSION:-20110313_736ded3}
+VERSION=${VERSION:-20110328_87c368d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -137,6 +139,9 @@ mkdir -p $PKG/usr/share/apps/kdm/sessions
 # Patch desktop.conf to use the Tango icon theme
 sed -i -e 's#nuoveXT2#Tango#' $PKG/etc/xdg/lxsession/LXDE/desktop.conf
 
+# Patch pcmanfm.conf to use gksu instead of xdg-su
+sed -i -e "s|su_cmd.*|su_cmd=gksu '%s'|" $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
+
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/lxde-common/lxde-common.info b/desktop/lxde-common/lxde-common.info
index e52fda5ce7..e0a399c4a5 100644
--- a/desktop/lxde-common/lxde-common.info
+++ b/desktop/lxde-common/lxde-common.info
@@ -1,10 +1,10 @@
 PRGNAM="lxde-common"
-VERSION="20110313_736ded3"
+VERSION="20110328_87c368d"
 HOMEPAGE="http://www.lxde.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxde-common-20110313_736ded3.tar.xz"
-MD5SUM="60a8b2049d02ff31bfb0de35a980c17b"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxde-common-20110328_87c368d.tar.xz"
+MD5SUM="7daebd8bab717d07c232fb6a4849f1e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/desktop/lxlauncher/lxlauncher.SlackBuild b/desktop/lxlauncher/lxlauncher.SlackBuild
index 9a56738a5c..6e74c7af6d 100644
--- a/desktop/lxlauncher/lxlauncher.SlackBuild
+++ b/desktop/lxlauncher/lxlauncher.SlackBuild
@@ -37,6 +37,10 @@
 # 20100903_3480629: 12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #             * Adapted to slackbuilds.org's autotools template.
 #             * updated to git snapshot.
+# 20110104_40ec3ca: 24/gen/2011 by ponce <matteo.bernardini@gmail.com>
+#             * updated to latest git snapshot.
+# 20110227_46274d1: 1/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#             * updated to latest git snapshot.
 # 
 # Run 'sh lxlauncher.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -45,16 +49,14 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxlauncher
-VERSION=${VERSION:-20100903_3480629}
+VERSION=${VERSION:-20110227_46274d1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/desktop/lxlauncher/lxlauncher.info b/desktop/lxlauncher/lxlauncher.info
index 847e82f12f..486ea87ba2 100644
--- a/desktop/lxlauncher/lxlauncher.info
+++ b/desktop/lxlauncher/lxlauncher.info
@@ -1,10 +1,10 @@
 PRGNAM="lxlauncher"
-VERSION="20100903_3480629"
+VERSION="20110227_46274d1"
 HOMEPAGE="http://www.lxde.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxlauncher-20100903_3480629.tar.xz"
-MD5SUM="57b4948abed467878eac58c41be9fe85"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxlauncher-20110227_46274d1.tar.xz"
+MD5SUM="d96e6b1dadd1bf838ea48789444f5bbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/desktop/lxmenu-data/lxmenu-data.SlackBuild b/desktop/lxmenu-data/lxmenu-data.SlackBuild
index 433c8f8585..6b61586f23 100644
--- a/desktop/lxmenu-data/lxmenu-data.SlackBuild
+++ b/desktop/lxmenu-data/lxmenu-data.SlackBuild
@@ -35,24 +35,26 @@
 # 20100825_5e1e8e1 12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #            * Adapted to slackbuilds.org's autotools template.
 #            * updated to git snapshot.
+# 20101206_802f38f 24/gen/2011 by ponce <matteo.bernardini@gmail.com>
+#            * updated to latest git snapshot.
+# 20110324_74c1d2b 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#            * updated to latest git snapshot.
 # 
 # Run 'sh lxmenu-data.SlackBuild' to build a Slackware package.
-# The package is created in /tmp .
+# The package is created in /tmp.
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxmenu-data
-VERSION=${VERSION:-20100825_5e1e8e1}
+VERSION=${VERSION:-20110324_74c1d2b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/desktop/lxmenu-data/lxmenu-data.info b/desktop/lxmenu-data/lxmenu-data.info
index 3004d3ca4d..4ef29b69bf 100644
--- a/desktop/lxmenu-data/lxmenu-data.info
+++ b/desktop/lxmenu-data/lxmenu-data.info
@@ -1,10 +1,10 @@
 PRGNAM="lxmenu-data"
-VERSION="20100825_5e1e8e1"
+VERSION="20110324_74c1d2b"
 HOMEPAGE="http://lxde.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxmenu-data-20100825_5e1e8e1.tar.xz"
-MD5SUM="e930dad25c9d3873678116394550ed7c"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxmenu-data-20110324_74c1d2b.tar.xz"
+MD5SUM="5a8423dfa244398174751457151a1a9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/desktop/lxpanel/battery-applet.patch b/desktop/lxpanel/battery-applet.patch
deleted file mode 100644
index c2f5b93007..0000000000
--- a/desktop/lxpanel/battery-applet.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 93d9373574fcb0ed63cc4be7807343b018daad1a Mon Sep 17 00:00:00 2001
-From: Marty Jack <martyj@linux.local>
-Date: Thu, 19 Aug 2010 22:52:44 -0400
-Subject: [PATCH] Battery percentage incorrectly always evaluates as 100 percent (Bug3006059)
-
----
- src/plugins/batt/batt_sys.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/batt/batt_sys.c b/src/plugins/batt/batt_sys.c
-index 3c325b8..2ece803 100644
---- a/src/plugins/batt/batt_sys.c
-+++ b/src/plugins/batt/batt_sys.c
-@@ -150,7 +150,7 @@ void battery_update( battery *b ) {
- 		    b->state = "available";
- 	    }
- 	    else if ( strcmp("energy_now", sys_file ) == 0 ) {
--		b->remaining_capacity = get_unit_value((gchar*) file_content) / 1000;
-+		b->remaining_energy = get_unit_value((gchar*) file_content) / 1000;
- 		if (!b->state)
- 		    b->state = "available";
- 	    }
-@@ -215,7 +215,7 @@ void battery_update( battery *b ) {
-     if (b->last_capacity < MIN_CAPACITY)
- 	b->percentage = 0;
-     else
--	b->percentage = b->remaining_capacity * 100 / b->last_capacity;
-+	b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit;
- 	    
-     if (b->percentage > 100)
- 	b->percentage = 100;
diff --git a/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch b/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch
deleted file mode 100644
index a38243b318..0000000000
--- a/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-@@ -, +, @@ 
- src/plugins/batt/batt.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
---- a/src/plugins/batt/batt.c	
-+++ a/src/plugins/batt/batt.c	
-@@ -95,7 +95,7 @@ typedef struct {
- typedef struct {
-     char *command;
-     sem_t *lock;
--} alarm;
-+} Alarm;
- 
- static void destructor(Plugin *p);
- static void update_display(lx_battery *lx_b, gboolean repaint);
-@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint);
- /* alarmProcess takes the address of a dynamically allocated alarm struct (which
-    it must free). It ensures that alarm commands do not run concurrently. */
- static void * alarmProcess(void *arg) {
--    alarm *a = (alarm *) arg;
-+    Alarm *a = (Alarm *) arg;
- 
-     sem_wait(a->lock);
-     system(a->command);
-@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
- 	/* Run the alarm command if it isn't already running */
- 	if (alarmCanRun) {
- 	    
--	    alarm *a = (alarm *) malloc(sizeof(alarm));
-+	    Alarm *a = (Alarm *) malloc(sizeof(Alarm));
- 	    a->command = lx_b->alarmCommand;
- 	    a->lock = &(lx_b->alarmProcessLock);
- 	    
diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild
index c014a4bcd0..28fbcc0323 100644
--- a/desktop/lxpanel/lxpanel.SlackBuild
+++ b/desktop/lxpanel/lxpanel.SlackBuild
@@ -24,16 +24,14 @@
 # Modified by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=lxpanel
-VERSION=0.5.6
-BUILD=${BUILD:-2}
+VERSION=20110317_a072a89
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -74,10 +72,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# fix a battery applet issue:
-patch -p1 < $CWD/battery-applet.patch
-# fix redefinition of alarm
-patch -p1 < $CWD/lxpanel-0.5.6-symbol-alarm.patch
+sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info
index fdbe8a2134..3f7c287f9c 100644
--- a/desktop/lxpanel/lxpanel.info
+++ b/desktop/lxpanel/lxpanel.info
@@ -1,10 +1,10 @@
 PRGNAM="lxpanel"
-VERSION="0.5.6"
+VERSION="20110317_a072a89"
 HOMEPAGE="http://wiki.lxde.org/en/LXPanel"
-DOWNLOAD="http://download.sourceforge.net/lxde/lxpanel-0.5.6.tar.gz"
-MD5SUM="3c6b5498b5f4109c3913b10a66809fe6"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpanel-20110317_a072a89.tar.xz"
+MD5SUM="c0a182e73ee71245f2719c0b0cd8621d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/desktop/lxshortcut/lxshortcut.SlackBuild b/desktop/lxshortcut/lxshortcut.SlackBuild
index 2cecb09cdb..3ede248c9a 100644
--- a/desktop/lxshortcut/lxshortcut.SlackBuild
+++ b/desktop/lxshortcut/lxshortcut.SlackBuild
@@ -35,6 +35,8 @@
 # 20100905_132b97e 12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #             * Adapted to slackbuilds.org's autotools template.
 #             * updated to git snapshot.
+# 20110314_d620ca8 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#             * updated to latest git snapshot.
 # 
 # Run 'sh lxshortcut.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -43,21 +45,19 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxshortcut
-VERSION=${VERSION:-20100905_132b97e}
+VERSION=${VERSION:-20110314_d620ca8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO"
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -111,10 +111,8 @@ make install-strip DESTDIR=$PKG
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/lxshortcut/lxshortcut.info b/desktop/lxshortcut/lxshortcut.info
index 5a004bfcad..25440c9110 100644
--- a/desktop/lxshortcut/lxshortcut.info
+++ b/desktop/lxshortcut/lxshortcut.info
@@ -1,10 +1,10 @@
 PRGNAM="lxshortcut"
-VERSION="20100905_132b97e"
+VERSION="20110314_d620ca8"
 HOMEPAGE="http://wiki.lxde.org/en/LXShortCut"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxshortcut-20100905_132b97e.tar.xz"
-MD5SUM="89d5dadb815c1cb93dbffe922f12a3a0"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxshortcut-20110314_d620ca8.tar.xz"
+MD5SUM="6b34f260bd5a5dd7be9d76bec8f84e9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild
index cbfeacbca8..db9f1aad0d 100644
--- a/desktop/openbox/openbox.SlackBuild
+++ b/desktop/openbox/openbox.SlackBuild
@@ -27,7 +27,7 @@
 # by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=openbox
-VERSION=${VERSION:-3.4.11}
+VERSION=${VERSION:-3.4.11.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -105,10 +105,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Add xinitrc.openbox so that openbox will show up as an option in xwmconfig
 install -D -m 0755 $CWD/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox
diff --git a/desktop/openbox/openbox.info b/desktop/openbox/openbox.info
index 39daad185d..7b5e72c285 100644
--- a/desktop/openbox/openbox.info
+++ b/desktop/openbox/openbox.info
@@ -1,10 +1,10 @@
 PRGNAM="openbox"
-VERSION="3.4.11"
-HOMEPAGE="http://icculus.org/openbox/"
-DOWNLOAD="http://icculus.org/openbox/releases/openbox-3.4.11.tar.gz"
-MD5SUM="bbbb93c1a4fc8048f2a8ceb4179882a5"
+VERSION="3.4.11.2"
+HOMEPAGE="http://openbox.org"
+DOWNLOAD="http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz"
+MD5SUM="30e669134fa81df810fe7d1dc59cd931"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/desktop/openbox/slack-desc b/desktop/openbox/slack-desc
index 361311c38a..0fe892e0d1 100644
--- a/desktop/openbox/slack-desc
+++ b/desktop/openbox/slack-desc
@@ -14,6 +14,6 @@ openbox: and to work properly.  Openbox is fully functional as a stand-alone
 openbox: working environment, or can be used as a drop-in replacement for
 openbox: the default window manager in the GNOME or KDE desktop environments.
 openbox:
-openbox: Homepage: http://www.icculus.org/openbox
+openbox: Homepage: http://openbox.org
 openbox:
 openbox:
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index bc068e5a62..b6b0e17be9 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.SlackBuild
@@ -66,10 +66,8 @@ cd -
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a BUGS CHANGES COPYING HINTS INSTALL README TODO \
diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild
index a1d9b95d06..31ed32ea0a 100644
--- a/desktop/wmMoonClock/wmMoonClock.SlackBuild
+++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild
@@ -67,10 +67,8 @@ cd -
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a BUGS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild
index db34d8dfd3..c54a059ec2 100644
--- a/desktop/wmSun/wmSun.SlackBuild
+++ b/desktop/wmSun/wmSun.SlackBuild
@@ -72,10 +72,8 @@ cd -
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a BUGS COPYING TODO \
diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild
index b6ea8d85fe..67ae4ac488 100644
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ b/desktop/wmakerconf/wmakerconf.SlackBuild
@@ -73,10 +73,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/desktop/wmswallow/README b/desktop/wmswallow/README
new file mode 100644
index 0000000000..df8422eab4
--- /dev/null
+++ b/desktop/wmswallow/README
@@ -0,0 +1,3 @@
+wmswallow (app docker)
+
+Dock any (!) application into the WindowMaker dock.
diff --git a/desktop/wmswallow/slack-desc b/desktop/wmswallow/slack-desc
new file mode 100644
index 0000000000..7f5463e8d1
--- /dev/null
+++ b/desktop/wmswallow/slack-desc
@@ -0,0 +1,14 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+wmswallow: wmswallow (app docker)
+wmswallow:
+wmswallow: Dock any (!) application into the WindowMaker dock.
+wmswallow:
+wmswallow: homepage: http://www.dockapps.org/file.php/id/102
+wmswallow:
diff --git a/desktop/wmswallow/wmswallow.SlackBuild b/desktop/wmswallow/wmswallow.SlackBuild
new file mode 100644
index 0000000000..0466bfd454
--- /dev/null
+++ b/desktop/wmswallow/wmswallow.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Slackware build script for wmswallow
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=wmswallow
+VERSION=${VERSION:-0.6.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM.tar.Z
+cd $PRGNAM
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+sed -i -e "s|CFLAGS=-Wall -g|CFLAGS=$SLKCFLAGS|" Makefile
+sed -i -e "s|\}/lib|}/lib$LIBDIRSUFFIX|" Makefile
+
+cat Makefile
+
+make xfree
+
+mkdir -p $PKG/usr/bin
+install -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENCE README todo $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmswallow/wmswallow.info b/desktop/wmswallow/wmswallow.info
new file mode 100644
index 0000000000..3a6a47f9bd
--- /dev/null
+++ b/desktop/wmswallow/wmswallow.info
@@ -0,0 +1,10 @@
+PRGNAM="wmswallow"
+VERSION="0.6.1"
+HOMEPAGE="http://www.dockapps.org/file.php/id/102"
+DOWNLOAD="http://www.dockapps.org/download.php/id/141/wmswallow.tar.Z"
+MD5SUM="7ab8efef879a0ad6b64980f346635841"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/desktop/zenity/zenity.SlackBuild b/desktop/zenity/zenity.SlackBuild
index 40b42bc4bc..608770e70c 100644
--- a/desktop/zenity/zenity.SlackBuild
+++ b/desktop/zenity/zenity.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=zenity
-VERSION=${VERSION:-2.24.1}
+VERSION=${VERSION:-2.32.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/desktop/zenity/zenity.info b/desktop/zenity/zenity.info
index 7ea6e05966..3f89d33dfa 100644
--- a/desktop/zenity/zenity.info
+++ b/desktop/zenity/zenity.info
@@ -1,10 +1,10 @@
 PRGNAM="zenity"
-VERSION="2.24.1"
+VERSION="2.32.1"
 HOMEPAGE="http://live.gnome.org/Zenity"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/zenity/2.24/zenity-2.24.1.tar.bz2"
-MD5SUM="a7ade5ff47716f4328d5e0547596dfb6"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/zenity/2.32/zenity-2.32.1.tar.bz2"
+MD5SUM="aa66ec35451b16e424519b4973082170"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/development/cgit/README b/development/cgit/README
new file mode 100644
index 0000000000..6c1281eb0b
--- /dev/null
+++ b/development/cgit/README
@@ -0,0 +1,8 @@
+cgit (web frontend for git repositories)
+
+cgit is a web interface (cgi) for git repositories, written in C.
+
+The folder /var/cache/cgit, must be owned by your webserver user.
+
+A sample /etc/cgitrc (you must provide one) is in the $DOCS folder,
+and so are some sample configuration files for apache and lighttpd.
diff --git a/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild
new file mode 100644
index 0000000000..590a0e7c6e
--- /dev/null
+++ b/development/cgit/cgit.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Slackware build script for cgit
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=cgit
+VERSION=${VERSION:-20101116}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="COPYING README $CWD/config/cgit-lighttpd.conf \
+  $CWD/config/cgit-httpd.conf $CWD/config/cgitrc.sample"
+
+GIT_TARBALL=$(grep \/git- $CWD/cgit.info | cut -d'/' -f8 | sed -e 's/\"//')
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# prepare sources
+sed -i -e "s|-g -Wall -Igit|-Wall ${SLKCFLAGS} -Igit|" Makefile
+sed -i -e "s|\/lib$|/lib${LIBDIRSUFFIX}|" Makefile
+sed -i -e "s|(libdir)|(prefix)/share|" Makefile
+cat $CWD/config/cgit.conf > cgit.conf
+
+# extract the git tarball
+rm -fR git
+tar xvf $CWD/$GIT_TARBALL
+mv git-* git
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# prepare the cache dir: default permissions are for the apache user and group
+mkdir -p $PKG/var/cache/cgit
+chown 80.80 $PKG/var/cache/cgit
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/cgit/cgit.info b/development/cgit/cgit.info
new file mode 100644
index 0000000000..a9a6e5d5f4
--- /dev/null
+++ b/development/cgit/cgit.info
@@ -0,0 +1,14 @@
+PRGNAM="cgit"
+VERSION="20101116"
+HOMEPAGE="http://hjemli.net/git/cgit/"
+DOWNLOAD="
+http://ponce.cc/slackware/sources/repo/cgit-20101116.tar.xz
+http://www.kernel.org/pub/software/scm/git/git-1.7.4.2.tar.bz2"
+MD5SUM="
+8088eadd232cbc7d5304124909bf1d28
+4b2df3f916061439ae105d7a27637925"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/development/cgit/config/cgit-httpd.conf b/development/cgit/config/cgit-httpd.conf
new file mode 100644
index 0000000000..a579174fd0
--- /dev/null
+++ b/development/cgit/config/cgit-httpd.conf
@@ -0,0 +1,44 @@
+# sample folder and virtual host configurations for httpd.
+# edit, move it to /etc/httpd/extra and include it in
+# /etc/httpd/httpd.conf with a line
+#
+# Include /etc/httpd/extra/cgit-httpd.conf
+#
+# uncomment also the line
+#
+# AddHandler cgi-script .cgi
+
+<Directory /var/www/cgi-bin>
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+## Version 1 (default): under /cgi-bin/cgit.cgi address
+#ScriptAlias /cgi-bin/cgit.cgi /var/www/cgi-bin/cgit.cgi
+#Alias /cgit/ /var/www/cgi-bin/
+#<Location /cgit/cgit.cgi>
+#    Options FollowSymlinks ExecCGI
+#    Allow from All
+#</Location>
+#RewriteEngine on
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteCond %{REQUEST_FILENAME} !-d
+#RewriteRule ^/cgit/(.*)$ /cgit/cgit.cgi?url=$1 [L,QSA]
+
+# Version 2: cgit as a handler to whole vhost:
+<VirtualHost *:80>
+     ServerName cgit.my.domain
+     SetEnv CGIT_CONFIG /etc/cgitrc
+     Options FollowSymlinks ExecCGI
+     DirectoryIndex cgit.cgi
+     DocumentRoot /var/www/cgi-bin
+     <Location />
+          Options ExecCGI
+          Allow from All
+     </Location>
+     RewriteEngine on
+     RewriteCond %{REQUEST_FILENAME} !-f
+     RewriteCond %{REQUEST_FILENAME} !-d
+     RewriteRule ^(.*)$ /cgit.cgi?url=$1 [L,QSA]
+</VirtualHost>
diff --git a/development/cgit/config/cgit-lighttpd.conf b/development/cgit/config/cgit-lighttpd.conf
new file mode 100644
index 0000000000..fc49e5763f
--- /dev/null
+++ b/development/cgit/config/cgit-lighttpd.conf
@@ -0,0 +1,20 @@
+# sample virtual host configuration for lighttpd.
+# edit,  move to /etc/lighttpd/ and include it in /etc/lighttpd/lighttpd.conf
+# with a line
+#
+# include "cgit-lighttpd.conf"
+
+$HTTP["host"] == "cgit.my.domain" {
+        alias.url = (
+                "/static/" => "/var/www/cgi-bin/",
+                "/cgit.cgi" => "/var/www/cgi-bin/cgit.cgi",
+        )
+        url.rewrite-once = (
+                "^/static/.*$" => "$0",
+                "^/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2",
+        )
+        cgi.assign = (
+                "/var/www/cgi-bin/cgit.cgi" => "",
+        )
+}
+
diff --git a/development/cgit/config/cgit.conf b/development/cgit/config/cgit.conf
new file mode 100644
index 0000000000..0b14322f11
--- /dev/null
+++ b/development/cgit/config/cgit.conf
@@ -0,0 +1,3 @@
+CGIT_VERSION = v0.8.3.4-115-g1759
+CGIT_SCRIPT_PATH = /var/www/cgi-bin
+CACHE_ROOT = /var/cache/cgit
diff --git a/development/cgit/config/cgitrc.sample b/development/cgit/config/cgitrc.sample
new file mode 100644
index 0000000000..84a2d277fa
--- /dev/null
+++ b/development/cgit/config/cgitrc.sample
@@ -0,0 +1,18 @@
+# sample /etc/cgitrc file: two repos are defined
+# you can see a demo here http://cgit.ponce.cc/
+
+root-title=ponce's repository browser
+root-desc=a fast interface to these git repositories
+virtual-root=/
+snapshots=tar.gz
+
+#css=/static/cgit.css
+#logo=/static/cgit.png
+
+# the default branch here is set to current (would have been master)
+repo.url=slackbuilds
+repo.path=/path/to/repo/.git
+repo.desc=slackbuilds.org fork for slackware-current
+repo.owner=my.address _at_ my.isp
+repo.defbranch=current
+repo.clone-url=git://github.com/Ponce/slackbuilds.git
diff --git a/development/cgit/slack-desc b/development/cgit/slack-desc
new file mode 100644
index 0000000000..8cafdd8902
--- /dev/null
+++ b/development/cgit/slack-desc
@@ -0,0 +1,14 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+cgit: cgit (web frontend for git repositories)
+cgit:
+cgit: cgit is a web interface (cgi) for git repositories, written in C.
+cgit:
+cgit: homepage: http://hjemli.net/git/cgit/
+cgit:
diff --git a/development/trac-gitplugin/README b/development/trac-gitplugin/README
new file mode 100644
index 0000000000..8a0780530a
--- /dev/null
+++ b/development/trac-gitplugin/README
@@ -0,0 +1,3 @@
+trac-gitplugin (git plugin for trac)
+
+This is a plugin for trac that enables git to be used instead of subversion for the trac:VersioningSystemBackend.
diff --git a/development/trac-gitplugin/slack-desc b/development/trac-gitplugin/slack-desc
new file mode 100644
index 0000000000..d235f4aaef
--- /dev/null
+++ b/development/trac-gitplugin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+trac-gitplugin: trac-gitplugin (git plugin for trac)
+trac-gitplugin:
+trac-gitplugin: This is a plugin for trac that enables git to be used instead of
+trac-gitplugin: subversion for the trac:VersioningSystemBackend.
+trac-gitplugin:
+trac-gitplugin:
+trac-gitplugin:
+trac-gitplugin:
+trac-gitplugin:
+trac-gitplugin: homepage: http://trac-hacks.org/wiki/GitPlugin
+trac-gitplugin:
diff --git a/development/trac-gitplugin/trac-gitplugin.SlackBuild b/development/trac-gitplugin/trac-gitplugin.SlackBuild
new file mode 100644
index 0000000000..f7d8e6041e
--- /dev/null
+++ b/development/trac-gitplugin/trac-gitplugin.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Slackware build script for trac-gitplugin
+
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=trac-gitplugin
+VERSION=${VERSION:-20101104_60cf7b8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/trac-gitplugin/trac-gitplugin.info b/development/trac-gitplugin/trac-gitplugin.info
new file mode 100644
index 0000000000..7a9a35811b
--- /dev/null
+++ b/development/trac-gitplugin/trac-gitplugin.info
@@ -0,0 +1,10 @@
+PRGNAM="trac-gitplugin"
+VERSION="20101104_60cf7b8"
+HOMEPAGE="http://trac-hacks.org/wiki/GitPlugin"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/trac-gitplugin-20101104_60cf7b8.tar.xz"
+MD5SUM="27c73b417a588a83200af09a347fc626"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/development/trac/trac.SlackBuild b/development/trac/trac.SlackBuild
index 9d686b204d..949041adbc 100644
--- a/development/trac/trac.SlackBuild
+++ b/development/trac/trac.SlackBuild
@@ -5,7 +5,7 @@
 
 PRGNAM="trac"
 SRCNAM="Trac"
-VERSION=${VERSION:-0.11.6}
+VERSION=${VERSION:-0.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/trac/trac.info b/development/trac/trac.info
index e161b6d879..99379b86e8 100644
--- a/development/trac/trac.info
+++ b/development/trac/trac.info
@@ -1,10 +1,10 @@
 PRGNAM="trac"
-VERSION="0.11.6"
+VERSION="0.12.1"
 HOMEPAGE="http://trac.edgewall.com/"
-DOWNLOAD="ftp://ftp.edgewall.com/pub/trac/Trac-0.11.6.tar.gz"
-MD5SUM="f5a9542d81d3d50c3d9e46d8e2344f38"
+DOWNLOAD="ftp://ftp.edgewall.com/pub/trac/Trac-0.12.1.tar.gz"
+MD5SUM="35a9c53ec35466b24a535d19bb6cdfa2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Eugene Suter"
 EMAIL="easuter@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index 4379542111..bc1d1f0166 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Niklas 'Nille' Åkerström for slackware64 and to use cmake.
 
 PRGNAM=digikam
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index 8e736c84c1..caaceaf6a5 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -1,10 +1,10 @@
 PRGNAM="digikam"
-VERSION="1.2.0"
+VERSION="1.7.0"
 HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-1.2.0.tar.bz2"
-MD5SUM="8f68022008cf1650924cc8688f176572"
+DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-1.7.0.tar.bz2"
+MD5SUM="ecc6ec563cc5309f21da9c4946397875"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="Nille dot kungen[AT]gmail dot com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/graphics/kipi-plugins/kipi-plugins.SlackBuild b/graphics/kipi-plugins/kipi-plugins.SlackBuild
index afaceafee8..f5c7a7d6f5 100644
--- a/graphics/kipi-plugins/kipi-plugins.SlackBuild
+++ b/graphics/kipi-plugins/kipi-plugins.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kipi-plugins
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch kipi-plugins so it compiles on KDE 4.2.x
-# http://www.digikam.org/drupal/node/492
-patch -p1 < $CWD/$PRGNAM-kde4.2.patch
-
 mkdir build && cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
diff --git a/graphics/kipi-plugins/kipi-plugins.info b/graphics/kipi-plugins/kipi-plugins.info
index 6aba163505..db7ef388cc 100644
--- a/graphics/kipi-plugins/kipi-plugins.info
+++ b/graphics/kipi-plugins/kipi-plugins.info
@@ -1,10 +1,10 @@
 PRGNAM="kipi-plugins"
-VERSION="1.0.0"
+VERSION="1.7.0"
 HOMEPAGE="http://www.kipi-plugins.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kipi/kipi-plugins-1.0.0.tar.bz2"
-MD5SUM="4ed822101f0023773361fbe035822934"
+DOWNLOAD="http://downloads.sourceforge.net/kipi/kipi-plugins-1.7.0.tar.bz2"
+MD5SUM="d1cc95109d826d651b1ca81e1ebbd6df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="michiel,rworkman"
+APPROVED=""
diff --git a/libraries/atkmm/atkmm.SlackBuild b/libraries/atkmm/atkmm.SlackBuild
index 180247212c..a1f56eecc1 100644
--- a/libraries/atkmm/atkmm.SlackBuild
+++ b/libraries/atkmm/atkmm.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=atkmm
-VERSION=${VERSION:-2.22.4}
+VERSION=${VERSION:-2.22.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/atkmm/atkmm.info b/libraries/atkmm/atkmm.info
index 87c484fdd2..4199e4ee30 100644
--- a/libraries/atkmm/atkmm.info
+++ b/libraries/atkmm/atkmm.info
@@ -1,10 +1,10 @@
 PRGNAM="atkmm"
-VERSION="2.22.4"
+VERSION="2.22.5"
 HOMEPAGE="http://www.gtkmm.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.22/atkmm-2.22.4.tar.bz2"
-MD5SUM="ad1ddcc707bf18a27968838a327195d7"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.22/atkmm-2.22.5.tar.bz2"
+MD5SUM="d56fe2b29d4c88fa270918e5572fc8cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild
index ec0085a7ef..541008c750 100644
--- a/libraries/frei0r/frei0r.SlackBuild
+++ b/libraries/frei0r/frei0r.SlackBuild
@@ -29,8 +29,8 @@
 #
 
 PRGNAM=frei0r
-VERSION=20100124
-BUILD=${BUILD:-2}
+VERSION=1.3
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz  || exit 1
+tar xvf $CWD/$PRGNAM-plugins-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -77,7 +77,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,9 +95,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+# move html doc and clean $PKG/usr/share
+#mv $PKG/usr/share/doc/$PRGNAM-plugins-$VERSION/html $PKG/usr/doc/$PRGNAM-$VERSION/
+#rm -fR $PKG/usr/share
 cp -a \
-  AUTHORS COPYING ChangeLog Doxyfile INSTALL NEWS README \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/frei0r/frei0r.info b/libraries/frei0r/frei0r.info
index b3ddc03144..813df91d61 100644
--- a/libraries/frei0r/frei0r.info
+++ b/libraries/frei0r/frei0r.info
@@ -1,10 +1,10 @@
 PRGNAM="frei0r"
-VERSION="20100124"
+VERSION="1.3"
 HOMEPAGE="http://www.piksel.org/frei0r"
-DOWNLOAD="http://www.slackbuilds.org/sources/13.0/frei0r-20100124.tar.gz"
-MD5SUM="a5bc4fe886c1b9915adae94559af143b"
+DOWNLOAD="http://www.piksel.no/frei0r/releases/frei0r-plugins-1.3.tar.gz"
+MD5SUM="a2eb63feeeb0c5cf439ccca276cbf70c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jonathan Larsen"
 EMAIL="agentc0re@learnix.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/genshi/genshi.SlackBuild b/libraries/genshi/genshi.SlackBuild
index 0d72a757a2..6d03e9319e 100644
--- a/libraries/genshi/genshi.SlackBuild
+++ b/libraries/genshi/genshi.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM="genshi"
 SRCNAM="Genshi"
-VERSION=${VERSION:-0.5.1}
+VERSION=${VERSION:-0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,7 +45,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find . \
diff --git a/libraries/genshi/genshi.info b/libraries/genshi/genshi.info
index 08d9e8780c..dc18440ca8 100644
--- a/libraries/genshi/genshi.info
+++ b/libraries/genshi/genshi.info
@@ -1,10 +1,10 @@
 PRGNAM="genshi"
-VERSION="0.5.1"
+VERSION="0.6"
 HOMEPAGE="http://genshi.edgewall.org/"
-DOWNLOAD="http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2"
-MD5SUM="822942bbc3109da9f6b472eb8ea4e3a4"
+DOWNLOAD="http://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz"
+MD5SUM="604e8b23b4697655d36a69c2d8ef7187"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Eugene Suter"
 EMAIL="easuter@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/glibmm/glibmm.SlackBuild b/libraries/glibmm/glibmm.SlackBuild
index 7644a5dc74..ec4efb4e3d 100644
--- a/libraries/glibmm/glibmm.SlackBuild
+++ b/libraries/glibmm/glibmm.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glibmm
-VERSION=2.27.99.2
+VERSION=2.28.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,6 +87,9 @@ rm -rf $PKG/usr/share/doc
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \;
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+
 # Remove the API docs
 rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/docs
 
diff --git a/libraries/glibmm/glibmm.info b/libraries/glibmm/glibmm.info
index 0ce054af9f..35574a64d5 100644
--- a/libraries/glibmm/glibmm.info
+++ b/libraries/glibmm/glibmm.info
@@ -1,10 +1,10 @@
 PRGNAM="glibmm"
-VERSION="2.27.99.2"
+VERSION="2.28.0"
 HOMEPAGE="http://www.gtkmm.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.27/glibmm-2.27.99.2.tar.bz2"
-MD5SUM="0b0cbed3779e0b85a9bf3fa7c9729741"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.28/glibmm-2.28.0.tar.bz2"
+MD5SUM="8cda9a84e6efdd8f35d2803432783325"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/lensfun/lensfun.SlackBuild b/libraries/lensfun/lensfun.SlackBuild
index bb27a5812e..7984ff95ef 100644
--- a/libraries/lensfun/lensfun.SlackBuild
+++ b/libraries/lensfun/lensfun.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lensfun
-VERSION=0.2.3
+VERSION=r127
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/lensfun/lensfun.info b/libraries/lensfun/lensfun.info
index 7a528fca1d..80cf368ac9 100644
--- a/libraries/lensfun/lensfun.info
+++ b/libraries/lensfun/lensfun.info
@@ -1,10 +1,10 @@
 PRGNAM="lensfun"
-VERSION="0.2.3"
+VERSION="r127"
 HOMEPAGE="http://lensfun.berlios.de/"
-DOWNLOAD="http://download.berlios.de/lensfun/lensfun-0.2.3.tar.bz2"
-MD5SUM="c5c04be4f53e3eef450ff4948d8f65b3"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lensfun-r127.tar.bz2"
+MD5SUM="1627a059f683707bff3a227acf244353"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Ricardson Williams"
 EMAIL="ricardsonwilliams@yahoo.com.br"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libatasmart/libatasmart.SlackBuild b/libraries/libatasmart/libatasmart.SlackBuild
index 6fc2517b71..e2e13c11f4 100644
--- a/libraries/libatasmart/libatasmart.SlackBuild
+++ b/libraries/libatasmart/libatasmart.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libatasmart
-VERSION=${VERSION:-0.17}
+VERSION=${VERSION:-20110405_cc60205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh bootstrap.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libatasmart/libatasmart.info b/libraries/libatasmart/libatasmart.info
index f25e5961d3..ba7a60c802 100644
--- a/libraries/libatasmart/libatasmart.info
+++ b/libraries/libatasmart/libatasmart.info
@@ -1,10 +1,10 @@
 PRGNAM="libatasmart"
-VERSION="0.17"
+VERSION="20110405_cc60205"
 HOMEPAGE="http://0pointer.de/"
-DOWNLOAD="http://0pointer.de/public/libatasmart-0.17.tar.gz"
-MD5SUM="dc36cadbbb7fa38f8af175713eda1a21"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/libatasmart-20110405_cc60205.tar.gz"
+MD5SUM="73ad2a85eb5af48060dd468a421ecdd5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/libbonobo/libbonobo.SlackBuild b/libraries/libbonobo/libbonobo.SlackBuild
index 1b45e65494..315741ffe1 100644
--- a/libraries/libbonobo/libbonobo.SlackBuild
+++ b/libraries/libbonobo/libbonobo.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libbonobo
-VERSION=2.24.3
+VERSION=2.32.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libbonobo/libbonobo.info b/libraries/libbonobo/libbonobo.info
index 4eb6eba249..337488a0f4 100644
--- a/libraries/libbonobo/libbonobo.info
+++ b/libraries/libbonobo/libbonobo.info
@@ -1,10 +1,10 @@
 PRGNAM="libbonobo"
-VERSION="2.24.3"
+VERSION="2.32.0"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-2.24.3.tar.bz2"
-MD5SUM="b217cef6a187505290c66c5bf8225d38"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-2.32.0.tar.bz2"
+MD5SUM="bc2b25b03ca57866a61e04852f2f53fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libbonoboui/libbonoboui.SlackBuild b/libraries/libbonoboui/libbonoboui.SlackBuild
index aebc793281..217f7f4102 100644
--- a/libraries/libbonoboui/libbonoboui.SlackBuild
+++ b/libraries/libbonoboui/libbonoboui.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libbonoboui
-VERSION=2.24.3
+VERSION=2.24.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libbonoboui/libbonoboui.info b/libraries/libbonoboui/libbonoboui.info
index 6713c81967..c8fdf1202a 100644
--- a/libraries/libbonoboui/libbonoboui.info
+++ b/libraries/libbonoboui/libbonoboui.info
@@ -1,10 +1,10 @@
 PRGNAM="libbonoboui"
-VERSION="2.24.3"
+VERSION="2.24.4"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/libbonoboui/2.24/libbonoboui-2.24.3.tar.bz2"
-MD5SUM="3a754b1df0a4d5fd4836a05020a0bb4a"
+DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/libbonoboui/2.24/libbonoboui-2.24.4.tar.bz2"
+MD5SUM="cc2fb47b79fb3bcc6816ff07d7496cf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libfm/README b/libraries/libfm/README
index 32c99a7613..cd11169053 100644
--- a/libraries/libfm/README
+++ b/libraries/libfm/README
@@ -1,4 +1,6 @@
 LibFM provides file management functions built on top of Glib/GIO, 
 giving a convenient higher-level API.
 
-This requires menu-cache, udisks, and upower.
+This requires menu-cache.
+udisks and upower are needed for automounting removable media and
+gvfs is needed for trash support.
diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild
index 9b55d14ce9..f47c195590 100644
--- a/libraries/libfm/libfm.SlackBuild
+++ b/libraries/libfm/libfm.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libfm
-VERSION=${VERSION:-20110316_c604674}
+VERSION=${VERSION:-20110412_7915d1f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +86,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# add handlers for terminal and archiver to the default config
+sed -i -e 's|\[ui\]|terminal=xterm -e %s\narchiver=xarchiver %s\n\n[ui]|' \
+  $PKG/etc/xdg/libfm/libfm.conf
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info
index 8d3c8bd54f..6be7663657 100644
--- a/libraries/libfm/libfm.info
+++ b/libraries/libfm/libfm.info
@@ -1,10 +1,10 @@
 PRGNAM="libfm"
-VERSION="20110316_c604674"
+VERSION="20110412_7915d1f"
 HOMEPAGE="http://pcmanfm.sourceforge.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/libfm-20110316_c604674.tar.xz"
-MD5SUM="d2973b01e62aa30223a270630e45d433"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/libfm-20110412_7915d1f.tar.xz"
+MD5SUM="b0b5fb788d3ec1bcc662772988581452"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libgnome/libgnome.SlackBuild b/libraries/libgnome/libgnome.SlackBuild
index b771755731..27d41cebad 100644
--- a/libraries/libgnome/libgnome.SlackBuild
+++ b/libraries/libgnome/libgnome.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libgnome
-VERSION=2.28.0
+VERSION=2.32.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libgnome/libgnome.info b/libraries/libgnome/libgnome.info
index e6dbfe1222..56fa761f1a 100644
--- a/libraries/libgnome/libgnome.info
+++ b/libraries/libgnome/libgnome.info
@@ -1,10 +1,10 @@
 PRGNAM="libgnome"
-VERSION="2.28.0"
+VERSION="2.32.0"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2"
-MD5SUM="5c7efe21dc28c137aa766a77a84c0c29"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.32/libgnome-2.32.0.tar.bz2"
+MD5SUM="b27a0c61918fad8492d84b407a72bd7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
index 3fb55ba36a..48bb585337 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
+++ b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild
@@ -10,7 +10,7 @@
 # Maintained by Erik Hanson <erik@slackbuilds.org>
 
 PRGNAM=libgnomecanvas
-VERSION=${VERSION:-2.30.1}
+VERSION=${VERSION:-2.30.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libgnomecanvas/libgnomecanvas.info b/libraries/libgnomecanvas/libgnomecanvas.info
index e110797da3..8758697659 100644
--- a/libraries/libgnomecanvas/libgnomecanvas.info
+++ b/libraries/libgnomecanvas/libgnomecanvas.info
@@ -1,10 +1,10 @@
 PRGNAM="libgnomecanvas"
-VERSION="2.30.1"
+VERSION="2.30.2"
 HOMEPAGE="http://directory.fsf.org/all/libgnomecanvas.html"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.1.tar.bz2"
-MD5SUM="362ab7b81024b3c3b4a712e7df01b169"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.2.tar.bz2"
+MD5SUM="7f7cb2348466616b034bd2265361455d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/libraries/libnice/libnice.SlackBuild b/libraries/libnice/libnice.SlackBuild
index de1f1961aa..0f41f234a2 100644
--- a/libraries/libnice/libnice.SlackBuild
+++ b/libraries/libnice/libnice.SlackBuild
@@ -26,7 +26,7 @@
 # YOUR DATA IS DESTROYED, YOUR HOUSE BURNS DOWN OR YOUR DOG RUNS OFF.
 
 PRGNAM=libnice
-VERSION=${VERSION:-0.0.13}
+VERSION=${VERSION:-0.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libnice/libnice.info b/libraries/libnice/libnice.info
index 5563687182..4622d4614c 100644
--- a/libraries/libnice/libnice.info
+++ b/libraries/libnice/libnice.info
@@ -1,10 +1,10 @@
 PRGNAM="libnice"
-VERSION="0.0.13"
+VERSION="0.1.0"
 HOMEPAGE="http://nice.freedesktop.org"
-DOWNLOAD="http://nice.freedesktop.org/releases/libnice-0.0.13.tar.gz"
-MD5SUM="e5b9f799a57cb939ea2658ec35253ab9"
+DOWNLOAD="http://nice.freedesktop.org/releases/libnice-0.1.0.tar.gz"
+MD5SUM="c077e2aa74c9afb4b4e157efc8a6ad9d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@dawoodfall.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/libvirt/README b/libraries/libvirt/README
index efc0370908..f9f31a698d 100644
--- a/libraries/libvirt/README
+++ b/libraries/libvirt/README
@@ -2,3 +2,6 @@ libvirt - The virtualization API
 
 libvirt is a toolkit to interact with the virtualization
 capabilities of recent versions of Linux (and other OSes).
+
+you can pass to the build script the qemu group you are
+using with the variable VIRTGROUP (defaults to 'libvirt').
diff --git a/libraries/libvirt/doinst.sh b/libraries/libvirt/doinst.sh
index a906638af4..3dcab35585 100644
--- a/libraries/libvirt/doinst.sh
+++ b/libraries/libvirt/doinst.sh
@@ -15,6 +15,8 @@ config() {
 config etc/libvirt/libvirtd.conf.new
 config etc/libvirt/qemu.conf.new
 config etc/libvirt/qemu/networks/default.xml.new
-config etc/logrotate.d/libvirtd.new
+config etc/logrotate.d/libvirtd.lxc.new
+config etc/logrotate.d/libvirtd.qemu.new
+config etc/logrotate.d/libvirtd.uml.new
 config etc/sasl2/libvirt.conf.new
 
diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index f47c3a922b..0c1e8ca9a4 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Michal Bialozor <bialyy@o2.pl>
 
 PRGNAM=libvirt
-VERSION=0.7.7
+VERSION=0.9.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,6 +35,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+VIRTGROUP=${VIRTGROUP:-libvirt}
+
 set -e
 
 rm -rf $PKG
@@ -59,9 +61,17 @@ CFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --enable-shared=yes \
   --without-xen \
+  --without-esx \
+  --without-polkit \
+  --without-avahi \
+  --without-openvz \
+  --without-storage-iscsi \
+  --without-hal \
+  --without-udev \
+  --with-qemu-group=$VIRTGROUP \
   --build=$ARCH-slackware-linux
 
-make \
+make -j2 \
   HTML_DIR=/usr/doc/$PRGNAM-$VERSION \
   EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples
 make \
@@ -74,7 +84,9 @@ mv $PKG/etc/libvirt/libvirtd.conf $PKG/etc/libvirt/libvirtd.conf.new
 mv $PKG/etc/libvirt/qemu.conf $PKG/etc/libvirt/qemu.conf.new
 mv $PKG/etc/libvirt/qemu/networks/default.xml \
    $PKG/etc/libvirt/qemu/networks/default.xml.new
-mv $PKG/etc/logrotate.d/libvirtd $PKG/etc/logrotate.d/libvirtd.new
+mv $PKG/etc/logrotate.d/libvirtd.lxc $PKG/etc/logrotate.d/libvirtd.lxc.new
+mv $PKG/etc/logrotate.d/libvirtd.qemu $PKG/etc/logrotate.d/libvirtd.qemu.new
+mv $PKG/etc/logrotate.d/libvirtd.uml $PKG/etc/logrotate.d/libvirtd.uml.new
 mv $PKG/etc/sasl2/libvirt.conf $PKG/etc/sasl2/libvirt.conf.new
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info
index 4bdadc593b..d3b894c280 100644
--- a/libraries/libvirt/libvirt.info
+++ b/libraries/libvirt/libvirt.info
@@ -1,10 +1,10 @@
 PRGNAM="libvirt"
-VERSION="0.7.7"
+VERSION="0.9.0"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="http://libvirt.org/sources/libvirt-0.7.7.tar.gz"
-MD5SUM="5f315b0bf20e3964f7657ba1e630cd67"
+DOWNLOAD="http://libvirt.org/sources/libvirt-0.9.0.tar.gz"
+MD5SUM="53d005e6f3732aba1fd6b2718f9cec99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michal Bialozor"
 EMAIL="bialyy@o2.pl"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/libraries/libvpx/libvpx.SlackBuild b/libraries/libvpx/libvpx.SlackBuild
index dd281cc643..dcd17d85cf 100644
--- a/libraries/libvpx/libvpx.SlackBuild
+++ b/libraries/libvpx/libvpx.SlackBuild
@@ -8,7 +8,7 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=libvpx
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,9 +48,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf ${PRGNAM}-v${VERSION}
 tar xvf $CWD/${PRGNAM}-v${VERSION}.tar.bz2
-cd $PRGNAM-$VERSION
+cd ${PRGNAM}-v${VERSION}
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,12 +71,16 @@ cd build-tmp
     --enable-postproc \
     --enable-vp8 \
     --enable-shared \
+    --enable-runtime-cpu-detect \
     $ARCHOPTS
 
   make
   make install DESTDIR=$PKG
 cd -
 
+# remove the static version
+rm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.a
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/libraries/libvpx/libvpx.info b/libraries/libvpx/libvpx.info
index 14852dc705..702d1a0b27 100644
--- a/libraries/libvpx/libvpx.info
+++ b/libraries/libvpx/libvpx.info
@@ -1,10 +1,10 @@
 PRGNAM="libvpx"
-VERSION="0.9.2"
+VERSION="0.9.6"
 HOMEPAGE="http://www.webmproject.org/"
-DOWNLOAD="http://webm.googlecode.com/files/libvpx-v0.9.2.tar.bz2"
-MD5SUM="609370925b274aeaa29e94fc34c74957"
+DOWNLOAD="http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2"
+MD5SUM="383f3f07a76099682abb43f79b692b72"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/opencv/libopencv-2.1.0-libdir.patch b/libraries/opencv/libopencv-2.1.0-libdir.patch
deleted file mode 100644
index 1e1600c1c6..0000000000
--- a/libraries/opencv/libopencv-2.1.0-libdir.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Naur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
---- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-11 10:51:39.694283320 +0200
-+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-04-11 10:56:06.674279640 +0200
-@@ -89,8 +89,8 @@
- INSTALL (
-     TARGETS flann  # flann_s
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
- )
- 
- # INSTALL (
-diff -Naur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
---- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-11 10:51:39.564279640 +0200
-+++ OpenCV-2.1.0/CMakeLists.txt	2010-04-11 10:55:04.824279480 +0200
-@@ -467,8 +467,8 @@
- 

-     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

-     if(UNIX)

--        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

--        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-+        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

-+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

-     endif()

-     if(WIN32)

-         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

-@@ -895,7 +895,7 @@
- #                       PROCESS SUBDIRECTORIES:

- # ----------------------------------------------------------------------------

- # Save libs and executables in the same place

--set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" )

-+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" )

- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )

- 

- if(WIN32)

-@@ -965,19 +965,19 @@
- #  Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"

- # prefix=/usr

- # exec_prefix=${prefix}

--# libdir=${exec_prefix}/lib

-+# libdir=${exec_prefix}/lib${LIB_SUFFIX}

- # includedir=${prefix}/include/opencv

- # -------------------------------------------------------------------------------------------

- set(prefix      ${CMAKE_INSTALL_PREFIX})

- set(exec_prefix     "\${prefix}")

--set(libdir      "\${exec_prefix}/lib")

-+set(libdir      "\${exec_prefix}/lib${LIB_SUFFIX}")

- set(includedir      "\${prefix}/include")

- set(VERSION             ${OPENCV_VERSION})

- 

- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)

- 

- if(UNIX)

--    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)

-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)

- endif()

- 

- 

-diff -Naur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
---- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-04-11 10:56:58.114279520 +0200
-@@ -40,6 +40,6 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-     )
-diff -Naur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-11 10:51:39.644283200 +0200
-+++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-04-11 10:58:19.664279600 +0200
-@@ -71,8 +71,8 @@
- 

- install(TARGETS ${the_target}

-     RUNTIME DESTINATION bin COMPONENT main

--    LIBRARY DESTINATION lib COMPONENT main

--    ARCHIVE DESTINATION lib COMPONENT main)

-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-     DESTINATION include/opencv

-diff -Naur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-04-11 10:58:43.064279480 +0200
-@@ -76,8 +76,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${aux_hdrs_ext}
-         DESTINATION include/opencv
-diff -Naur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-11 10:51:39.654284200 +0200
-+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-04-11 10:59:19.454279800 +0200
-@@ -71,8 +71,8 @@
- 

- install(TARGETS ${the_target}

-     RUNTIME DESTINATION bin COMPONENT main

--    LIBRARY DESTINATION lib COMPONENT main

--    ARCHIVE DESTINATION lib COMPONENT main)

-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- # install each module headers separately

- install(FILES ${lib_hdrs}

-diff -Naur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-11 10:51:39.634281600 +0200
-+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-04-11 11:00:25.174279600 +0200
-@@ -282,8 +282,8 @@
- 
- install(TARGETS ${the_target}
- 	RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${highgui_ext_hdrs}
-         DESTINATION include/opencv
-diff -Naur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
---- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-11 10:51:39.654284200 +0200
-+++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-04-11 11:00:43.714279320 +0200
-@@ -61,8 +61,8 @@
- 

- install(TARGETS ${the_target}

- 	RUNTIME DESTINATION bin COMPONENT main

--	LIBRARY DESTINATION lib COMPONENT main

--	ARCHIVE DESTINATION lib COMPONENT main)

-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

- 

- install(FILES ${lib_hdrs}

-         DESTINATION include/opencv

-diff -Naur OpenCV-2.1.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.1.0/tests/cxts/CMakeLists.txt
---- OpenCV-2.1.0.orig/tests/cxts/CMakeLists.txt	2010-04-11 10:51:39.724279600 +0200
-+++ OpenCV-2.1.0/tests/cxts/CMakeLists.txt	2010-04-11 11:01:36.324279440 +0200
-@@ -63,6 +63,6 @@
- if(WIN32)
- install(TARGETS ${the_target}
-     RUNTIME DESTINATION bin COMPONENT main
--	LIBRARY DESTINATION lib COMPONENT main
--	ARCHIVE DESTINATION lib COMPONENT main)
-+	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- endif()
diff --git a/libraries/opencv/libopencv-r3818-libdir.patch b/libraries/opencv/libopencv-r3818-libdir.patch
new file mode 100644
index 0000000000..2e9ae42b65
--- /dev/null
+++ b/libraries/opencv/libopencv-r3818-libdir.patch
@@ -0,0 +1,139 @@
+diff -Naur OpenCV-r3818.orig/CMakeLists.txt OpenCV-r3818/CMakeLists.txt
+--- OpenCV-r3818.orig/CMakeLists.txt	2010-10-22 14:02:39.000000000 +0200
++++ OpenCV-r3818/CMakeLists.txt	2010-10-24 10:14:30.504785501 +0200
+@@ -13,7 +13,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY

+ # to find libraries from these locations first

+ if(UNIX)

+-  set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)

++  set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})

+ endif()

+ # it _must_ go before PROJECT(OpenCV) in order to work

+ if (NOT CMAKE_INSTALL_PREFIX)

+@@ -24,7 +24,7 @@
+     endif()

+ endif()

+ 

+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")

+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

+ 

+ set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)

+@@ -494,8 +494,8 @@
+ 

+     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

+     if(UNIX)

+-        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

++        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

+     endif()

+     if(WIN32)

+         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

+@@ -1014,7 +1014,7 @@
+ #                       PROCESS SUBDIRECTORIES:

+ # ----------------------------------------------------------------------------

+ # Save libs and executables in the same place

+-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" )

++set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" )

+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )

+ 

+ if(WIN32)

+@@ -1054,7 +1054,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include")

+ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")

+ 

+-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")

++set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib{LIB_SUFFIX}")

+ 

+ #exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"")

+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"")

+@@ -1088,19 +1088,19 @@
+ #  Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"

+ # prefix=/usr

+ # exec_prefix=${prefix}

+-# libdir=${exec_prefix}/lib

++# libdir=${exec_prefix}/lib${LIB_SUFFIX}

+ # includedir=${prefix}/include/opencv

+ # -------------------------------------------------------------------------------------------

+ set(prefix      ${CMAKE_INSTALL_PREFIX})

+ set(exec_prefix     "\${prefix}")

+-set(libdir      "\${exec_prefix}/lib")

++set(libdir      "\${exec_prefix}/lib${LIB_SUFFIX}")

+ set(includedir      "\${prefix}/include")

+ set(VERSION             ${OPENCV_VERSION})

+ 

+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)

+ 

+ if(UNIX)

+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)

++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)

+ endif()

+ 

+ 

+diff -Naur OpenCV-r3818.orig/OpenCVModule.cmake OpenCV-r3818/OpenCVModule.cmake
+--- OpenCV-r3818.orig/OpenCVModule.cmake	2010-07-07 17:24:21.000000000 +0200
++++ OpenCV-r3818/OpenCVModule.cmake	2010-10-24 10:24:40.028783048 +0200
+@@ -75,8 +75,8 @@
+ 
+ 	install(TARGETS ${the_target}
+ 	    RUNTIME DESTINATION bin COMPONENT main
+-	    LIBRARY DESTINATION lib COMPONENT main
+-	    ARCHIVE DESTINATION lib COMPONENT main)
++	    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++	    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ 
+ 	install(FILES ${lib_hdrs}
+ 	    DESTINATION include/opencv2/${name}
+diff -Naur OpenCV-r3818.orig/modules/ffmpeg/CMakeLists.txt OpenCV-r3818/modules/ffmpeg/CMakeLists.txt
+--- OpenCV-r3818.orig/modules/ffmpeg/CMakeLists.txt	2010-08-05 19:24:41.000000000 +0200
++++ OpenCV-r3818/modules/ffmpeg/CMakeLists.txt	2010-10-24 09:25:01.718785911 +0200
+@@ -49,6 +49,6 @@
+ 
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-    ARCHIVE DESTINATION lib COMPONENT main
+-    LIBRARY DESTINATION lib COMPONENT main
++    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
++    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
+     )
+diff -Naur OpenCV-r3818.orig/modules/gpu/CMakeLists.txt OpenCV-r3818/modules/gpu/CMakeLists.txt
+--- OpenCV-r3818.orig/modules/gpu/CMakeLists.txt	2010-10-06 14:45:31.000000000 +0200
++++ OpenCV-r3818/modules/gpu/CMakeLists.txt	2010-10-24 09:25:01.718785911 +0200
+@@ -122,8 +122,8 @@
+ 

+ install(TARGETS ${the_target}

+ 	RUNTIME DESTINATION bin COMPONENT main

+-	LIBRARY DESTINATION lib COMPONENT main

+-	ARCHIVE DESTINATION lib COMPONENT main)

++	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main

++	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)

+ 

+ install(FILES ${lib_hdrs}

+ 	DESTINATION include/opencv2/${name}

+diff -Naur OpenCV-r3818.orig/modules/highgui/CMakeLists.txt OpenCV-r3818/modules/highgui/CMakeLists.txt
+--- OpenCV-r3818.orig/modules/highgui/CMakeLists.txt	2010-09-22 05:36:45.000000000 +0200
++++ OpenCV-r3818/modules/highgui/CMakeLists.txt	2010-10-24 09:25:01.718785911 +0200
+@@ -327,8 +327,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ 
+ install(FILES ${highgui_ext_hdrs}
+         DESTINATION include/opencv2/highgui
+diff -Naur OpenCV-r3818.orig/tests/cxts/CMakeLists.txt OpenCV-r3818/tests/cxts/CMakeLists.txt
+--- OpenCV-r3818.orig/tests/cxts/CMakeLists.txt	2010-05-11 19:44:00.000000000 +0200
++++ OpenCV-r3818/tests/cxts/CMakeLists.txt	2010-10-24 09:25:01.719785922 +0200
+@@ -64,6 +64,6 @@
+ if(WIN32)
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
++	ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
+ endif()
diff --git a/libraries/opencv/libpng-1.4.patch b/libraries/opencv/libpng-1.4.patch
deleted file mode 100644
index 8756f324c0..0000000000
--- a/libraries/opencv/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 
---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp        2010-01-21 01:08:46.000000000 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp     2010-01-21 01:13:11.000000000 -0500
-@@ -223,7 +223,7 @@
-                 png_set_palette_to_rgb( png_ptr );
- 
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                png_set_expand_gray_1_2_4_to_8( png_ptr );
- 
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild
index 27a795be87..700ff9a1d0 100644
--- a/libraries/opencv/opencv.SlackBuild
+++ b/libraries/opencv/opencv.SlackBuild
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# Slackware build script for cwp (customizable weather plasmoid)
+# Slackware build script for opencv (Open Source Computer Vision)
 
 # Written by M.Dinslage  contact: daedra1980@gmail.com
 # Big thanks to ponce for the patches.
 
 PRGNAM=opencv
 SRCNAM=OpenCV
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,12 +59,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch for libpng-1.4
-patch -p1 < $CWD/libpng-1.4.patch
-
 # Honor LIB_SUFFIX http://sourceforge.net/tracker/index.php?func=detail&aid=2876292&group_id=22870&atid=376679
-# rewritten by ponce for 2.1.0
-patch -p1 < $CWD/libopencv-2.1.0-libdir.patch
+# rewritten by ponce for r3818
+patch -p1 < $CWD/libopencv-r3818-libdir.patch
 
 mkdir -p build
 cd build
@@ -78,6 +75,9 @@ cd build
     -DBUILD_SHARED_LIBS=ON \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \
+    -DWITH_UNICAP=TRUE \
+    -DWITH_XINE=TRUE \
+    -DWITH_V4L=TRUE \
     ..
   make VERBOSE=1
   make install DESTDIR=$PKG
diff --git a/libraries/opencv/opencv.info b/libraries/opencv/opencv.info
index cc20d37486..880dc3408f 100644
--- a/libraries/opencv/opencv.info
+++ b/libraries/opencv/opencv.info
@@ -1,10 +1,10 @@
 PRGNAM="opencv"
-VERSION="2.1.0"
+VERSION="2.2.0"
 HOMEPAGE="http://opencv.willowgarage.com/wiki/"
-DOWNLOAD="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.1/OpenCV-2.1.0.tar.bz2"
-MD5SUM="1d71584fb4e04214c0085108f95e24c8"
+DOWNLOAD="http://downloads.sourceforge.net/opencvlibrary/OpenCV-2.2.0.tar.bz2"
+MD5SUM="122c9ac793a46854ef2819fedbbd6b1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/pangomm/pangomm.SlackBuild b/libraries/pangomm/pangomm.SlackBuild
index 94cfee8108..1002ca2dca 100644
--- a/libraries/pangomm/pangomm.SlackBuild
+++ b/libraries/pangomm/pangomm.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pangomm
-VERSION=${VERSION:-2.28.1}
+VERSION=${VERSION:-2.28.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/pangomm/pangomm.info b/libraries/pangomm/pangomm.info
index c4b0cb3ffd..3a377524eb 100644
--- a/libraries/pangomm/pangomm.info
+++ b/libraries/pangomm/pangomm.info
@@ -1,10 +1,10 @@
 PRGNAM="pangomm"
-VERSION="2.28.1"
+VERSION="2.28.2"
 HOMEPAGE="http://www.gtkmm.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.28/pangomm-2.28.1.tar.bz2"
-MD5SUM="03e6406bfb311e4018e69ab2a02b489b"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.28/pangomm-2.28.2.tar.bz2"
+MD5SUM="005a474863495d3c6267429a80da6cf2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/libraries/soundtouch/soundtouch.SlackBuild b/libraries/soundtouch/soundtouch.SlackBuild
index dae1738fc9..fd45539d63 100644
--- a/libraries/soundtouch/soundtouch.SlackBuild
+++ b/libraries/soundtouch/soundtouch.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=soundtouch
-VERSION=1.5.0
+VERSION=${VERSION:-r104}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,6 +71,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+./bootstrap
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/soundtouch/soundtouch.info b/libraries/soundtouch/soundtouch.info
index b4047e4299..b21a86ba46 100644
--- a/libraries/soundtouch/soundtouch.info
+++ b/libraries/soundtouch/soundtouch.info
@@ -1,10 +1,10 @@
 PRGNAM="soundtouch"
-VERSION="1.5.0"
+VERSION="r104"
 HOMEPAGE="http://www.surina.net/soundtouch"
-DOWNLOAD="http://www.surina.net/soundtouch/soundtouch-1.5.0.tar.gz"
-MD5SUM="5456481d8707d2a2c27466ea64a099cb"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/soundtouch-r104.tar.gz"
+MD5SUM="3255c207babb3824dee1895c6c65cffa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch b/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch
new file mode 100644
index 0000000000..5ad79fd7a9
--- /dev/null
+++ b/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch
@@ -0,0 +1,58 @@
+diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile
+--- wvstreams-4.6.1.orig/Makefile	2009-09-16 00:26:50.000000000 +0300
++++ wvstreams-4.6.1/Makefile	2010-01-04 18:06:15.000000000 +0200
+@@ -131,12 +131,19 @@
+ # libwvstreams: stream/event handling library
+ #
+ TARGETS += libwvstreams.so
+-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
++TARGETS += crypto/tests/ssltest                                                                                                                             
++crypto/tests/ssltest: $(LIBWVSTREAMS)                                                                                                                       
++
++TARGETS += ipstreams/tests/unixtest
++ipstreams/tests/unixtest: $(LIBWVSTREAMS)
++
+ TARGETS += crypto/tests/printcert
++crypto/tests/printcert: $(LIBWVSTREAMS)
+ 
+ ifndef _MACOS
+   ifneq ("$(with_readline)", "no")
+     TARGETS += ipstreams/tests/wsd
++    ipstreams/tests/wsd: $(LIBWVSTREAMS)
+     ipstreams/tests/wsd-LIBS += -lreadline
+   else
+     TEST_SKIP_OBJS += ipstreams/tests/wsd
+@@ -179,7 +186,11 @@
+ #
+ ifneq ("$(with_dbus)", "no")
+   TARGETS += libwvdbus.so
+-  TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
++  TARGETS += dbus/tests/wvdbus
++  dbus/tests/wvdbus: $(LIBWVDBUS)
++
++  TARGETS += dbus/tests/wvdbusd
++  dbus/tests/wvdbusd: $(LIBWVDBUS)
+   TESTS += $(call tests_cc,dbus/tests)
+   libwvdbus_OBJS += $(call objects,dbus)
+   libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
+diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk
+--- wvstreams-4.6.1.orig/wvrules-posix.mk	2008-10-21 18:31:58.000000000 +0300
++++ wvstreams-4.6.1/wvrules-posix.mk	2010-01-04 18:04:00.000000000 +0200
+@@ -85,12 +85,15 @@
+ 	$(AR) s $1
+ endef
+ 
+-CC: FORCE
++CC:
+ 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS)/gen-cc CC c
+ 
+-CXX: FORCE
++CXX:
+ 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS)/gen-cc CXX cc
+ 
++#All files must depend on the above two rules. This is a godawful hack.
++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
++
+ wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild
index ebe4b85968..b6b9ae0c3b 100644
--- a/libraries/wvstreams/wvstreams.SlackBuild
+++ b/libraries/wvstreams/wvstreams.SlackBuild
@@ -54,6 +54,9 @@ find . \
 # Fix a build error with glibc-2.12.x
 patch -p0 < $CWD/wvstreams-4.6.1-glibc212.patch
 
+# patch to allow parallel builds
+patch -p1 < $CWD/wvstreams-4.6.1-parallel-make.patch
+
 # configure doesn't support disabling static libraries
 # Don't manually remove them either, as wvdial won't build then :)
 CFLAGS="$SLKCFLAGS" \
diff --git a/misc/cksfv/cksfv.SlackBuild b/misc/cksfv/cksfv.SlackBuild
index d76ef63007..96c229b55c 100644
--- a/misc/cksfv/cksfv.SlackBuild
+++ b/misc/cksfv/cksfv.SlackBuild
@@ -82,10 +82,8 @@ make install
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man/
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL README TODO \
diff --git a/misc/lxappearance-obconf/README b/misc/lxappearance-obconf/README
new file mode 100644
index 0000000000..1c080fc674
--- /dev/null
+++ b/misc/lxappearance-obconf/README
@@ -0,0 +1,4 @@
+lxappearance-obconf (lxappearance openbox plugin)
+
+LXAppearance-obconf is an lxappearance plugin that implements openbox settings.
+It's based on obconf 2.0.3 code.
diff --git a/misc/lxappearance-obconf/lxappearance-obconf.SlackBuild b/misc/lxappearance-obconf/lxappearance-obconf.SlackBuild
new file mode 100644
index 0000000000..f5afdd51e5
--- /dev/null
+++ b/misc/lxappearance-obconf/lxappearance-obconf.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# Slackware build script for lxappearance-obconf
+
+# Written by ponce <matteo.bernardini@gmail.com>
+# based on slackbuilds.org default template
+# generated by Grissiom's sbo-dev-helper
+
+PRGNAM=lxappearance-obconf
+VERSION=${VERSION:-20110328_dc19455}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+sh autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-debug \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING CHANGELOG NEWS README README.transifex TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION || true
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/lxappearance-obconf/lxappearance-obconf.info b/misc/lxappearance-obconf/lxappearance-obconf.info
new file mode 100644
index 0000000000..37a6d1992c
--- /dev/null
+++ b/misc/lxappearance-obconf/lxappearance-obconf.info
@@ -0,0 +1,10 @@
+PRGNAM="lxappearance-obconf"
+VERSION="20110328_dc19455"
+HOMEPAGE="http://lxde.org/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxappearance-obconf-20110328_dc19455.tar.xz"
+MD5SUM="0a2563fbcae93ff89755e8fa5d5c0b8c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/misc/lxappearance-obconf/slack-desc b/misc/lxappearance-obconf/slack-desc
new file mode 100644
index 0000000000..1fceebbf48
--- /dev/null
+++ b/misc/lxappearance-obconf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+lxappearance-obconf: lxappearance-obconf (lxappearance openbox plugin)
+lxappearance-obconf:
+lxappearance-obconf: LXAppearance-obconf is an lxappearance plugin that implements
+lxappearance-obconf: openbox settings.
+lxappearance-obconf: It's based on obconf 2.0.3 code.
+lxappearance-obconf:
+lxappearance-obconf:
+lxappearance-obconf:
+lxappearance-obconf:
+lxappearance-obconf: lxappearance-obconf home: http://lxde.org/
+lxappearance-obconf:
diff --git a/misc/lxappearance/README b/misc/lxappearance/README
index b61853913f..d0a4c73dd0 100644
--- a/misc/lxappearance/README
+++ b/misc/lxappearance/README
@@ -1,2 +1,3 @@
 LXAppearance is the standard theme switcher of LXDE. Users are able to
 change the theme, icons, and fonts used by applications easily.
+It can be used also as a stand-alone gtk theme switcher.
diff --git a/misc/lxappearance/lxappearance.SlackBuild b/misc/lxappearance/lxappearance.SlackBuild
index fe13c42e99..b29b0455ed 100644
--- a/misc/lxappearance/lxappearance.SlackBuild
+++ b/misc/lxappearance/lxappearance.SlackBuild
@@ -1,11 +1,12 @@
 #!/bin/sh
 
 # Slackware build script for LXAppearance
-
 # Originally by "majk" <majk@konstelacioj.info>
+# submitted by dugan [underscore] c [at] fastmail [dot] fm for 13.1
+# modified by ponce <matteo.bernardini@gmail.com> for the new rewrite
 
 PRGNAM=lxappearance
-VERSION=${VERSION:-0.5.0}
+VERSION=${VERSION:-20110314_1d69da7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +43,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,12 +52,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
+  --disable-debug \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/misc/lxappearance/lxappearance.info b/misc/lxappearance/lxappearance.info
index 16891761b5..cc5fff3a1c 100644
--- a/misc/lxappearance/lxappearance.info
+++ b/misc/lxappearance/lxappearance.info
@@ -1,10 +1,10 @@
 PRGNAM="lxappearance"
-VERSION="0.5.0"
+VERSION="20110314_1d69da7"
 HOMEPAGE="http://lxde.org"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/lxappearance-0.5.0.tar.gz"
-MD5SUM="7eabab6f4a358dbc6a84e260a0e7f6c2"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxappearance-20110314_1d69da7.tar.xz"
+MD5SUM="6ac4d8ceb122640b67c13f9202d219b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Dugan Chen"
-EMAIL="dugan [underscore] c [at] fastmail [dot] fm"
-APPROVED="Erik Hanson"
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/misc/lxappearance/slack-desc b/misc/lxappearance/slack-desc
index 307e922543..6157fa9b7e 100644
--- a/misc/lxappearance/slack-desc
+++ b/misc/lxappearance/slack-desc
@@ -11,10 +11,6 @@ lxappearance:
 lxappearance: LXAppearance is the standard theme switcher of LXDE. Users are able
 lxappearance: to change the theme, icons, and fonts used by applications easily.
 lxappearance: 
-lxappearance:
-lxappearance:
-lxappearance: 
-lxappearance: 
 lxappearance: Homepage: http://lxde.org/
 lxappearance:
- 
\ No newline at end of file
+ 
diff --git a/multimedia/2ManDVD/2ManDVD.SlackBuild b/multimedia/2ManDVD/2ManDVD.SlackBuild
index 6c9d3f79e2..b0c078f45f 100644
--- a/multimedia/2ManDVD/2ManDVD.SlackBuild
+++ b/multimedia/2ManDVD/2ManDVD.SlackBuild
@@ -7,7 +7,7 @@
 # Modified by the slackbuilds.org project.
 
 PRGNAM=2ManDVD
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,7 +71,7 @@ qmake \
 make
 
 install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
-install -D -m 0644 Interface/mandvdico.png $PKG/usr/share/pixmaps/mandvdico.png
+install -D -m 0644 $CWD/acquia_marina_logo.png $PKG/usr/share/pixmaps/mandvdico.png
 
 mkdir -p $PKG/usr/share/$PRGNAM
 chmod -R 0755 Bibliotheque Interface
diff --git a/multimedia/2ManDVD/2ManDVD.info b/multimedia/2ManDVD/2ManDVD.info
index faed09e575..9ce28ab645 100644
--- a/multimedia/2ManDVD/2ManDVD.info
+++ b/multimedia/2ManDVD/2ManDVD.info
@@ -1,10 +1,10 @@
 PRGNAM="2ManDVD"
-VERSION="1.3.5"
+VERSION="1.5.5"
 HOMEPAGE="http://2mandvd.tuxfamily.org/"
-DOWNLOAD="http://mirrors.kernel.org/gentoo/distfiles/2ManDVD-1.3.5.tar.gz"
-MD5SUM="864cd202972e233383ecbdb0d9a08a71"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/2ManDVD-1.5.5.tar.gz"
+MD5SUM="99802936142cf84edd431f93d0277caa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/multimedia/2ManDVD/README b/multimedia/2ManDVD/README
index 1273c3e822..a75aef6e11 100644
--- a/multimedia/2ManDVD/README
+++ b/multimedia/2ManDVD/README
@@ -2,8 +2,5 @@
 qt interface written by Stéphane Gibault.  It's the successor of ManDVD
 written for qt4 and webkit.
 
-for a faster gui the author suggests try launching it from command line 
-with option "-graphicssystem raster" or "-graphicssystem opengl"
-
-This requires webkit, ffmpeg, transcode, dvdauthor, mjpegtools, and 
+This requires ffmpeg, transcode, dvdauthor, exif, mjpegtools and 
 ffmpegthumbnailer.
diff --git a/multimedia/2ManDVD/acquia_marina_logo.png b/multimedia/2ManDVD/acquia_marina_logo.png
new file mode 100644
index 0000000000..1f95f0b9c9
--- /dev/null
+++ b/multimedia/2ManDVD/acquia_marina_logo.png
diff --git a/multimedia/LiVES/LiVES.SlackBuild b/multimedia/LiVES/LiVES.SlackBuild
index 15326cda85..1f7510e6ae 100644
--- a/multimedia/LiVES/LiVES.SlackBuild
+++ b/multimedia/LiVES/LiVES.SlackBuild
@@ -63,6 +63,9 @@ CFLAGS="$SLKCFLAGS" \
 make docdir=/usr/doc/$PRGNAM-$VERSION
 make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 
+# fix link to lives exec
+( cd $PKG/usr/bin ; rm lives ; ln -s lives-exe lives )
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch
deleted file mode 100644
index 956bbd1921..0000000000
--- a/multimedia/avidemux/avidemux-2.5.1-i18n.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-index 4cce636..b875528 100644
---- a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-+++ b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-@@ -73,7 +73,7 @@ void loadTranslator(void)
- #ifdef __APPLE__

- 	QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";

- #else

--	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";

-+	QString appdir = "/usr/share/avidemux/i18n/";

- #endif

- 

- 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());

-@@ -164,4 +164,4 @@ const char* getNativeRendererDesc(void)
- 	}

- 

- 	return "Qt";

--}
-\ No newline at end of file
-+}

-diff --git a/cmake/Ts.cmake b/cmake/Ts.cmake
-index 15eb89b..e40f078 100644
---- a/cmake/Ts.cmake
-+++ b/cmake/Ts.cmake
-@@ -64,7 +64,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdir _sources)
-                 

-             SET(qm_files ${qm_files} ${_outXml} ${_out})

- 

--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")

-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

-         ENDFOREACH(ts_input ${ts_files})

- 

-         SET(${_sources} ${${_sources}} ${qm_files})

-@@ -95,7 +95,7 @@ MACRO(COMPILE_QT_TS_FILES ts_subdir _sources)
-                 

-             SET(qm_files ${qm_files} ${_out})

- 

--			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")

-+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

-         ENDFOREACH(ts_input ${ts_files})

- 

-         SET(${_sources} ${${_sources}} ${qm_files})

diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 7b1f78efaa..6fe0b95c17 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -26,7 +26,7 @@
 # project will use in the future.   No additional license terms added
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.5.2}
+VERSION=${VERSION:-2.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,9 +71,6 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-#Patch that installs i18n in the correct place even if we compile with qt4 support
-cat $CWD/avidemux-2.5.1-i18n.patch | patch -p1 --verbose --backup --suffix=.orig
-
 if [ "$ARCH" = "x86_64" ]; then
   # Some paths are incorrectly hardcoded to "lib":
   sed -i -e "s/Dir=\"lib\"/Dir=\"lib${LIBDIRSUFFIX}\"/" $(grep -lr 'Dir="lib"' .)
@@ -148,13 +145,23 @@ cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz
 
 cd $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-gtk.desktop
-cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-qt.desktop
-cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png
-#patch avidemux2_qt.desktop to exec avidemux2_qt4 instead of avidemux2_gtk
-sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2-qt.desktop
-sed -i 's/GTK+/Qt/g' $PKG/usr/share/applications/avidemux2-qt.desktop
-sed -i 's/GTK/Qt/' $PKG/usr/share/applications/avidemux2-qt.desktop
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
+# If the qt4 binary was built, we prefer to use that over the gtk version:
+if [ -x $PKG/usr/bin/avidemux2_qt4 ]; then
+  cat avidemux2.desktop | sed -e 's/_gtk/_qt4/' \
+    > $PKG/usr/share/applications/avidemux2.desktop
+else
+  install -m644 avidemux2.desktop $PKG/usr/share/applications/avidemux2.desktop
+fi
+install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png 
+install -m644 avidemux_icon.png \
+  ${PKG}/usr/share/icons/hicolor/64x64/apps/avidemux.png
+convert avidemux_icon.png -resize 16x16 \
+  ${PKG}/usr/share/icons/hicolor/16x16/apps/avidemux.png
+convert avidemux_icon.png -resize 32x32 \
+  ${PKG}/usr/share/icons/hicolor/32x32/apps/avidemux.png
+convert avidemux_icon.png -resize 48x48 \
+  ${PKG}/usr/share/icons/hicolor/48x48/apps/avidemux.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README TODO \
@@ -168,6 +175,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
-if [ "$1" = "--cleanup" ]; then
-	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 719779c8a0..92601ab7ce 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,9 +1,9 @@
 PRGNAM="avidemux"
-VERSION="2.5.2"
+VERSION="2.5.4"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.2.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.4.tar.gz"
 DOWNLOAD_x86_64=""
-MD5SUM="9027e1324c06e833e6c3c22298503cc7"
+MD5SUM="b849460f6480df92bfd72d1a3dc288d4"
 MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="Nille.kungen[AT]gmail.com"
diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild
index 37b8c6370b..75073af847 100644
--- a/multimedia/dvgrab/dvgrab.SlackBuild
+++ b/multimedia/dvgrab/dvgrab.SlackBuild
@@ -88,10 +88,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
diff --git a/multimedia/farsight2/Makefile_am_and_gtk-doc.patch b/multimedia/farsight2/Makefile_am_and_gtk-doc.patch
deleted file mode 100644
index 2cc5db25c8..0000000000
--- a/multimedia/farsight2/Makefile_am_and_gtk-doc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru ../farsight2-0.0.21.orig/common/gtk-doc.mak ./common/gtk-doc.mak
---- ../farsight2-0.0.21.orig/common/gtk-doc.mak	2010-06-24 00:20:40.000000000 +0200
-+++ ./common/gtk-doc.mak	2010-09-08 01:37:27.036523000 +0200
-@@ -232,6 +232,6 @@
- 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- 	cd $(distdir) && rm -f $(DISTCLEANFILES)
--        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
- 
- .PHONY : dist-hook-local docs
-diff -ru ../farsight2-0.0.21.orig/python/Makefile.am ./python/Makefile.am
---- ../farsight2-0.0.21.orig/python/Makefile.am	2009-05-08 23:34:14.000000000 +0200
-+++ ./python/Makefile.am	2010-09-08 01:40:08.948271000 +0200
-@@ -1,5 +1,5 @@
--PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
--[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`]
-+PYDEFS=`pkg-config --variable=defsdir pygobject-2.0 || \
-+			pkg-config --variable=defsdir pygtk-2.0`
- GSTPYDEFS=`pkg-config --variable=defsdir gst-python-0.10`
- 
- AM_CPPFLAGS =						\
diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild
index 9bdbd3dcc8..25c294609c 100644
--- a/multimedia/farsight2/farsight2.SlackBuild
+++ b/multimedia/farsight2/farsight2.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=farsight2
-VERSION=${VERSION:-0.0.21}
+VERSION=${VERSION:-0.0.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,9 +68,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch --verbose -p1 < $CWD/Makefile_am_and_gtk-doc.patch
-automake
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
diff --git a/multimedia/farsight2/farsight2.info b/multimedia/farsight2/farsight2.info
index c2ea7e2ae9..d06bd923f6 100644
--- a/multimedia/farsight2/farsight2.info
+++ b/multimedia/farsight2/farsight2.info
@@ -1,10 +1,10 @@
 PRGNAM="farsight2"
-VERSION="0.0.21"
+VERSION="0.0.26"
 HOMEPAGE="http://farsight.freedesktop.org/wiki/"
-DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.21.tar.gz"
-MD5SUM="5898612c389f3538a4160e677c03087a"
+DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.26.tar.gz"
+MD5SUM="7756d910687dd2abd455fd68e83f125c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@dawoodfall.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index a81ebfcdc1..3d00d47ff8 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -7,8 +7,9 @@
 # Modified by Heinz Wiesinger <pprkut@liwjatan.org>
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-0.6.1}
-BUILD=${BUILD:-2}
+SRC_VERSION=0.6.90-rc0
+VERSION=$(echo $SRC_VERSION | tr - _)
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -138,9 +139,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRC_VERSION
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.bz2
+cd $PRGNAM-$SRC_VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index bb5ada4129..656a0bb66f 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,10 +1,10 @@
 PRGNAM="ffmpeg"
-VERSION="0.6.1"
+VERSION="0.6.90_rc0"
 HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2"
-MD5SUM="4f5d732d25eedfb072251b5314ba2093"
+DOWNLOAD="http://git.ffmpeg.org/releases/ffmpeg-0.6.90-rc0.tar.bz2"
+MD5SUM="d2e701a363c6ecebc47fdb917a164bb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="Michiel van Wessem"
+APPROVED=""
diff --git a/multimedia/gpac/README b/multimedia/gpac/README
index d5a8876668..0515d3bb9a 100644
--- a/multimedia/gpac/README
+++ b/multimedia/gpac/README
@@ -4,7 +4,7 @@ various audio and video codecs into mp4 container
 
 Dependencies:
 REQUIRED: ffmpeg xvidcore faad2 a52dec
-OPTIONAL: wxGTK
+OPTIONAL: wxGTK xulrunner
 
-wxGTK is disabled by default, can be turned on by passing WX_SUPPORT=yes 
-to the script
\ No newline at end of file
+wxGTK and xulrunner support are disabled by default, can be turned on by
+passing WX_SUPPORT=yes and XULRUNNER=yes to the script
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index e78141d982..1293fd32cc 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -23,10 +23,12 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# modified by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=gpac
-VERSION=0.4.5
-BUILD=${BUILD:-3}
+VERSION=r2820
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -65,13 +67,19 @@ else
   wx_option="--enable-wx"
 fi
 
+### xulrunner support
+if [ "${XULRUNNER:-no}" = "no" ]; then
+  xulrunner_option=""
+else
+  xulrunner_option="--xulsdk-path=/usr/lib${LIBDIRSUFFIX}/xulrunner-devel/include"
+fi
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-mv $TMP/$PRGNAM $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,21 +87,19 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-( cd src/media_tools; patch -p0 < $CWD/libpng-infopp-null.patch )
-
-### fix configure script perms
-chmod u+x configure
-
 ./configure --prefix=/usr \
   --mandir=/usr/man \
   --disable-opt \
   --cpu=${ARCH} \
   --extra-cflags="$SLKCFLAGS" \
   --disable-ipv6 \
+  $xulrunner_option \
   $wx_option
 
 make -j1 # Parallel build seems to fail
 make install DESTDIR=$PKG
+# install the sdk too
+make install-lib DESTDIR=$PKG
 
 ### remove $PKG/usr/share/gpac directory
 ### only contains gpac.mp4 file which
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 79d4851c6d..4e9928c68e 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,10 +1,10 @@
 PRGNAM="gpac"
-VERSION="0.4.5"
+VERSION="r2820"
 HOMEPAGE="http://gpac.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gpac/gpac-0.4.5.tar.gz"
-MD5SUM="755e8c438a48ebdb13525dd491f5b0d1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/gpac-r2820.tar.xz"
+MD5SUM="2067312b3e953a7d7aed944386928c31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/multimedia/gpac/libpng-infopp-null.patch b/multimedia/gpac/libpng-infopp-null.patch
deleted file mode 100644
index 58205fd769..0000000000
--- a/multimedia/gpac/libpng-infopp-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- img.c.orig	2010-05-27 22:20:32.758633643 -0500
-+++ img.c	2010-05-27 22:21:49.263633070 -0500
-@@ -551,7 +551,7 @@
- 	/* Allocate/initialize the image information data.  REQUIRED */
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if (info_ptr == NULL) {
--		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+		png_destroy_write_struct(&png_ptr, NULL);
- 		return GF_IO_ERR;
- 	}
- 	
diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
index 280855242d..7dd99b28a2 100644
--- a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
+++ b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gst-ffmpeg
-VERSION=0.10.10
+VERSION=0.10.11
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.info b/multimedia/gst-ffmpeg/gst-ffmpeg.info
index d32499357c..0921426f93 100644
--- a/multimedia/gst-ffmpeg/gst-ffmpeg.info
+++ b/multimedia/gst-ffmpeg/gst-ffmpeg.info
@@ -1,10 +1,10 @@
 PRGNAM="gst-ffmpeg"
-VERSION="0.10.10"
+VERSION="0.10.11"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.10.tar.gz"
-MD5SUM="2222134a34f6b60071f3f03f8d0d01d2"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.11.tar.gz"
+MD5SUM="41c6e16b5b171736241fb01f72d9bf9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Juan Valencia Escalante"
 EMAIL="jvalenciae@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
index e6db04b82e..22c2a0aa79 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gst-plugins-bad
-VERSION=${VERSION:-0.10.19}
+VERSION=${VERSION:-0.10.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info
index ea85617357..e416a316d4 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.info
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.info
@@ -1,10 +1,10 @@
 PRGNAM="gst-plugins-bad"
-VERSION="0.10.19"
+VERSION="0.10.21"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.19.tar.bz2"
-MD5SUM="368f72e2a1c7a6e8fe60394e4315259b"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.21.tar.bz2"
+MD5SUM="f501336ab1d18d2565f47c36ce653a82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index 7ca71c44bb..30f6a4808e 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-0.10.16}
+VERSION=${VERSION:-0.10.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index b442af5c15..703871443b 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,10 +1,10 @@
 PRGNAM="gst-plugins-ugly"
-VERSION="0.10.16"
+VERSION="0.10.17"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.16.tar.bz2"
-MD5SUM="989e1b0fab010f73f76912f70ec5f62a"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.17.tar.bz2"
+MD5SUM="504ed6508c3a8f035a2002ed69d68506"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index e2566c373a..d42ea23cd5 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -91,10 +91,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
diff --git a/multimedia/mpgtx/mpgtx.SlackBuild b/multimedia/mpgtx/mpgtx.SlackBuild
index 4f5ffaaf72..a838ae5a4f 100644
--- a/multimedia/mpgtx/mpgtx.SlackBuild
+++ b/multimedia/mpgtx/mpgtx.SlackBuild
@@ -7,15 +7,13 @@
 
 PRGNAM=mpgtx
 VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -25,6 +23,16 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -40,15 +48,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$ARCH" = "i486" ]; then
- sed -i "s|-O3|-O2 -march=i486 -mtune=i686|g" configure
-elif [ "$ARCH" = "i686" ]; then
- sed -i "s|-O3|-O2 -march=i686 -mtune=i686|g" configure
-elif [ "$ARCH" = "x86_64" ]; then
- sed -i "s|-O3|-O2 -fPIC|g" configure
-fi
+# Various fixes from Timothy Redaelli <drizzt@gentoo.org>
+patch -p0 < $CWD/patches/mpgtx-1.3.1-configure.patch
+patch -p1 < $CWD/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
 
-./configure --prefix=/usr
+CXXFLAGS=$SLKCFLAGS ./configure --prefix=/usr
 
 make
 cd man
@@ -69,10 +73,8 @@ mkdir -p $PKG/usr/man/de/man1
 cp -a man/*.1 $PKG/usr/man/man1
 cp -a man/de/*.1 $PKG/usr/man/de/man1
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch
new file mode 100644
index 0000000000..ec36e76ba6
--- /dev/null
+++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch
@@ -0,0 +1,69 @@
+--- configure.old	2006-12-07 19:51:08.000000000 +0100
++++ configure	2006-12-07 19:51:02.000000000 +0100
+@@ -9,7 +9,6 @@
+ prefix="/usr/local"
+ manprefix='$(PREFIX)'
+ #compiler flags
+-CC="g++"
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+ optimization_cflags="-O3"
+@@ -36,7 +35,6 @@
+ 
+ if [ "${HOSTNAME}" = "powerpc-apple-darwin6.0" ]; then
+ #compiler flags
+-CC="c++"
+ common_cflags="-pedantic -Wall"
+ #devel_cflags="-g -Werror -fno-builtin"
+ devel_cflags="-g -fno-builtin"
+@@ -153,8 +151,15 @@
+     if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then
+ 	optimization_cflags="-O2";
+     fi
++    if test "$gcc_minor" -ge 4; then
++	optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
++    fi
++elif test "$gcc_major" -ge "4"; then
++	optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
+ fi
+ 
++
++
+ # Now check if the system handles large file support
+ # unless user has specified not to do so
+ if test $LFS = "yes"; then
+@@ -165,7 +170,7 @@
+ 		return (int)(fseeko(stdin,0,SEEK_SET));
+ 		}
+ EOF
+-	$CC __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
++	${CXX:-c++} __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
+ 	if test -f __LFStestPASSED; then
+ 		echo "PASSED";
+ 		cflags="$cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE";
+@@ -211,7 +211,6 @@
+ fi
+ 
+ if test $devel = "no" -a $debug = "no"; then
+-lflags="$lflags -s";
+ cflags="$cflags $optimization_cflags";
+ fi
+
+@@ -293,15 +298,15 @@
+ 	@echo ""
+ 
+ mpgtx : commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) \$(LDFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
+ mpegOut.o : mpegOut.cxx mpegOut.hh mpeg.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx 
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx 
+ mpeg.o : mpeg.cxx mpeg.hh mpegOut.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx 
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx 
+ chunkTab.o : chunkTab.cxx chunkTab.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
+ id3command.o : id3command.cxx id3command.hh common.hh
+-	$CC \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
++	\$(CXX) \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
new file mode 100644
index 0000000000..dc53dfd7e6
--- /dev/null
+++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
@@ -0,0 +1,12 @@
+diff -Naur mpgtx-1.3.1.orig/configure mpgtx-1.3.1/configure
+--- mpgtx-1.3.1.orig/configure	2010-11-28 11:58:58.000000000 +0100
++++ mpgtx-1.3.1/configure	2010-11-28 12:00:00.000000000 +0100
+@@ -11,7 +11,7 @@
+ #compiler flags
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+-optimization_cflags="-O3"
++optimization_cflags="${CXXFLAGS}"
+ release_cflags=$optimization_cflags
+ OFLAGS="-ansi"
+ cflags=$common_cflags
diff --git a/network/cherokee/ChangeLog.txt b/network/cherokee/ChangeLog.txt
index 94c24d33a9..13e779b425 100644
--- a/network/cherokee/ChangeLog.txt
+++ b/network/cherokee/ChangeLog.txt
@@ -1,3 +1,6 @@
+Sat 12 Mar 2011 - ponce (matteo.bernardini@gmail.com)
+- SlackBuild script for Cherokee 1.2.1
+
 Mon 07 Sep 2009 - Pablo Hernan Saro (pablosaro@gmail.com)
 - SlackBuild script for Cherokee 0.99.24
 - Cherokee rc script updated
diff --git a/network/cherokee/README b/network/cherokee/README
index c0424311d2..0155294dbb 100644
--- a/network/cherokee/README
+++ b/network/cherokee/README
@@ -35,6 +35,16 @@ Notes about using this SlackBuild
    to the script.
 5) If you want to build Cherokee with debugging options, enable trace
    facility by passing TRACE=yes to the script.
+6) The $WWWGROUP group and/or $WWWUSER user account are set to root.
+   To run cherokee as a different user/group specify them passing the options
+   options WWWUSER/WWWGROUP to the slackbuild, like
+
+     WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild
+
+   You may want to create first a dedicated user/group.
+
+     groupadd -g 249 cherokee
+     useradd -u 249 -g cherokee -d /var/www cherokee
 
 Comments, suggestions or bug reports
 ------------------------------------
diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild
index caff2d9f11..fbb2251bfa 100644
--- a/network/cherokee/cherokee.SlackBuild
+++ b/network/cherokee/cherokee.SlackBuild
@@ -3,13 +3,21 @@
 # Slackware build script for cherokee
 
 # Written by Pablo Hernan Saro (pablosaro@gmail.com)
+# updated  by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=cherokee
-VERSION=${VERSION:-0.99.24}
-ARCH=${ARCH:-i686}
+VERSION=${VERSION:-r6381}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -24,11 +32,20 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 # Set the WWW root directory
 WWWROOT=${WWWROOT:-/var/www}
 
+# Set the WWW user - defaulted to root, but apache is better
+WWWUSER=${WWWUSER:-apache}
+
+# Set the WWW group - defaulted to root, but apache is better
+WWWGROUP=${WWWGROUP:-apache}
+
 # Enable/Disable IPv6 support
 IPV6=${IPV6:-no}
 
@@ -41,13 +58,27 @@ MYSQL=${MYSQL:-yes}
 # Enable/Disable trace facility (debugging options)
 TRACE=${TRACE:-no}
 
+## you can optionally specify to run as a cherokee user
+# See http://slackbuilds.org/uid_gid.txt for current recomendations.
+hintz() {
+  printf "         The cherokee group and/or the cherokee user account
+         are set to "apache". To run cherokee as a different
+         user/group specify them passing the options
+         WWWUSER/WWWGROUP to the slackbuild, like
+         WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild
+
+         You may want to create first a dedicated user/group.
+           groupadd -g 249 cherokee
+           useradd -u 249 -g cherokee -d /var/www cherokee\n"
+}
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -56,6 +87,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$WWWUSER" = "apache" ] ; then
+  hintz
+elif [ "$WWWGROUP" = "apache" ] ; then
+  hintz
+fi
+
+sh autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -67,9 +106,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --with-wwwroot=$WWWROOT \
+  --with-wwwuser=$WWWUSER \
+  --with-wwwgroup=$WWWGROUP \
   --with-mysql=$MYSQL \
   --enable-ipv6=$IPV6 \
   --enable-admin=$ADMIN \
+  --disable-pam \
   --enable-trace=$TRACE
 
 make
@@ -78,10 +120,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -99,4 +139,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
-
diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info
index 427929e9cc..20f5c4d5e1 100644
--- a/network/cherokee/cherokee.info
+++ b/network/cherokee/cherokee.info
@@ -1,10 +1,10 @@
 PRGNAM="cherokee"
-VERSION="0.99.24"
+VERSION="r6381"
 HOMEPAGE="http://www.cherokee-project.com"
-DOWNLOAD="http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz"
-MD5SUM="5afed8bdd6020dc5bf0ba9ec83b947f1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-r6381.tar.xz"
+MD5SUM="7f0a25cc4a04fc4fd8ba058c84965c60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pablo Hernan Saro"
 EMAIL="pablosaro@gmail.com" 
-APPROVED="dsomero"
+APPROVED=""
diff --git a/network/darkstat/darkstat.SlackBuild b/network/darkstat/darkstat.SlackBuild
index 3b585e000a..62508a77ef 100644
--- a/network/darkstat/darkstat.SlackBuild
+++ b/network/darkstat/darkstat.SlackBuild
@@ -70,10 +70,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/grsync/README b/network/grsync/README
new file mode 100644
index 0000000000..e471a95abd
--- /dev/null
+++ b/network/grsync/README
@@ -0,0 +1,6 @@
+grsync (rsync GUI)
+
+grsync is a GUI (Graphical User Interface) for rsync, the commandline
+directory synchronization tool.
+It can be effectively used to synchronize local directories and
+it supports remote targets as well.
diff --git a/network/grsync/doinst.sh b/network/grsync/doinst.sh
new file mode 100644
index 0000000000..51b4303ede
--- /dev/null
+++ b/network/grsync/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications > /dev/null 2>&1
+fi
+
diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild
new file mode 100644
index 0000000000..116db37a40
--- /dev/null
+++ b/network/grsync/grsync.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Slackware build script for grsync
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=grsync
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/grsync/grsync.info b/network/grsync/grsync.info
new file mode 100644
index 0000000000..e4129d29d7
--- /dev/null
+++ b/network/grsync/grsync.info
@@ -0,0 +1,10 @@
+PRGNAM="grsync"
+VERSION="1.1.1"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+DOWNLOAD="http://www.opbyte.it/release/grsync-1.1.1.tar.gz"
+MD5SUM="81d3b6a1827fa1b06d87491f9bb1c8b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/network/grsync/slack-desc b/network/grsync/slack-desc
new file mode 100644
index 0000000000..7fecc7eb6c
--- /dev/null
+++ b/network/grsync/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+grsync: grsync (rsync GUI)
+grsync: 
+grsync: grsync is a GUI (Graphical User Interface) for rsync, the commandline
+grsync: directory synchronization tool.
+grsync: It can be effectively used to synchronize local directories and
+grsync: it supports remote targets as well.
+grsync:
+grsync: Homepage: http://www.opbyte.it/grsync/
+grsync:
+grsync:
+grsync:
diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild
index a80574dfec..71c8ec4ec4 100644
--- a/network/hping3/hping3.SlackBuild
+++ b/network/hping3/hping3.SlackBuild
@@ -108,10 +108,8 @@ install -m 0644 docs/hping3.8 $PKG/usr/man/man8/
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd docs ; cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION )
diff --git a/network/lighttpd/08-ssl-retval-fix.patch b/network/lighttpd/08-ssl-retval-fix.patch
deleted file mode 100644
index 712f158a23..0000000000
--- a/network/lighttpd/08-ssl-retval-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c
---- orig/src/network.c	2010-01-28 10:43:33.829209750 -0500
-+++ lighttpd-1.4.25/src/network.c	2010-01-28 10:44:22.639208732 -0500
-@@ -525,7 +525,7 @@ int network_init(server *srv) {
- 
- 		if (!s->ssl_use_sslv2) {
- 			/* disable SSLv2 */
--			if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+			if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
- 						ERR_error_string(ERR_get_error(), NULL));
- 				return -1;
diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild
index 7b796c48a0..efc9d9252f 100644
--- a/network/lighttpd/lighttpd.SlackBuild
+++ b/network/lighttpd/lighttpd.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lighttpd
-VERSION=1.4.26
+VERSION=r2780
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,8 +87,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# apply ssl related bug fix (rm in 1.4.27)
-patch -p1 < ${CWD}/08-ssl-retval-fix.patch
+sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info
index 1cdfe69b0e..e745022502 100644
--- a/network/lighttpd/lighttpd.info
+++ b/network/lighttpd/lighttpd.info
@@ -1,10 +1,10 @@
 PRGNAM="lighttpd"
-VERSION="1.4.26"
+VERSION="r2780"
 HOMEPAGE="http://www.lighttpd.net/"
-DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.26.tar.bz2"
-MD5SUM="a682c8efce47a2f4263a247ba0813c9b"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd-r2780.tar.bz2"
+MD5SUM="fbb55c1e7c836a93b446bfdc6d731c73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/network/rekonq/rekonq-CVE-2010-2536-fix.patch b/network/rekonq/rekonq-CVE-2010-2536-fix.patch
deleted file mode 100644
index c9dce8e357..0000000000
--- a/network/rekonq/rekonq-CVE-2010-2536-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/webpage.cpp b/src/webpage.cpp
-index a63940b..ea2add6 100644
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -577,8 +577,8 @@ QString WebPage::errorPage(QNetworkReply *reply)
-         return QString("Couldn't open the rekonqinfo.html file");
-     }
- 
--    QString title = i18n("Error loading: %1", reply->url().toString());
--    QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery);
-+    QString title = i18n("There was a problem while loading the page");
-+    QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery | QUrl::RemovePath);
- 
-     QString iconPath = QString("file://") + KIconLoader::global()->iconPath("dialog-warning" , KIconLoader::Small);
-     iconPath.replace(QL1S("16"), QL1S("128"));
-
diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild
index f5435663b0..15a4846a0b 100644
--- a/network/rekonq/rekonq.SlackBuild
+++ b/network/rekonq/rekonq.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Branko Grubic <branko.grubic@gmail.com>
 
 PRGNAM=rekonq
-VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.95}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,9 +51,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-## patch to fix Multiple cross-site scripting (XSS) vulnerabilities (CVE-2010-2536)
-patch -p1 <$CWD/rekonq-CVE-2010-2536-fix.patch
-
 mkdir -p build
 cd build
   cmake .. \
diff --git a/network/rekonq/rekonq.info b/network/rekonq/rekonq.info
index 2629986a3d..588e3d7958 100644
--- a/network/rekonq/rekonq.info
+++ b/network/rekonq/rekonq.info
@@ -1,10 +1,10 @@
 PRGNAM="rekonq"
-VERSION="0.5.0"
+VERSION="0.6.95"
 HOMEPAGE="http://rekonq.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-0.5.0.tar.bz2"
-MD5SUM="ffa227236b9e4aa6cca6851cc05855fb"
+DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-0.6.95.tar.bz2"
+MD5SUM="9b97e113775e9b4cd12b4003c7d0710b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Branko Grubic"
 EMAIL="branko.grubic@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild
index 239d9e540d..84d322f0e3 100644
--- a/network/urlgrabber/urlgrabber.SlackBuild
+++ b/network/urlgrabber/urlgrabber.SlackBuild
@@ -25,7 +25,7 @@
 # modified by Javier Rojas to fit urlgrabber
 
 PRGNAM=urlgrabber
-VERSION=3.1.0
+VERSION=3.9.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info
index a29cbed0fa..bc84bd0aab 100644
--- a/network/urlgrabber/urlgrabber.info
+++ b/network/urlgrabber/urlgrabber.info
@@ -1,10 +1,10 @@
 PRGNAM="urlgrabber"
-VERSION="3.1.0"
+VERSION="3.9.1"
 HOMEPAGE="http://urlgrabber.baseurl.org/"
-DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.1.0.tar.gz"
-MD5SUM="2a92d8ce0d89c5e772a98e9b8dcd5b73"
+DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.9.1.tar.gz"
+MD5SUM="00c8359bf71062d0946bacea521f80b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Javier Rojas"
 EMAIL="jerojasro@devnull.li"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/perl/perl-Net-SMTP-SSL/README b/perl/perl-Net-SMTP-SSL/README
new file mode 100644
index 0000000000..2d440c0465
--- /dev/null
+++ b/perl/perl-Net-SMTP-SSL/README
@@ -0,0 +1,5 @@
+perl-Net-SMTP-SSL (SSL support for Net::SMTP)
+
+perl-Net-SMTP-SSL is a perl module that implements the same API as Net::SMTP, but uses IO::Socket::SSL for its network operations.
+
+it requires perl-IO-Socket-SSL, available at slackbuilds.org.
diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild
new file mode 100644
index 0000000000..88becfa246
--- /dev/null
+++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for perl-Net-SMTP-SSL
+# Written by ponce <matteo.bernardini@gmail.com>
+# based on slackbuilds.org perl template
+
+SRCNAM=Net-SMTP-SSL
+PRGNAM=perl-$SRCNAM
+VERSION=${VERSION:-1.01}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+DOCS="Changes MANIFEST README"
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info
new file mode 100644
index 0000000000..0cf826e59a
--- /dev/null
+++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info
@@ -0,0 +1,10 @@
+PRGNAM="perl-Net-SMTP-SSL"
+VERSION="1.01"
+HOMEPAGE="http://search.cpan.org/~cwest/Net-SMTP-SSL-1.01/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/Net-SMTP-SSL-1.01.tar.gz"
+MD5SUM="ba039288ebf7a343feecacd374da8c1a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/perl/perl-Net-SMTP-SSL/slack-desc b/perl/perl-Net-SMTP-SSL/slack-desc
new file mode 100644
index 0000000000..922cb66e73
--- /dev/null
+++ b/perl/perl-Net-SMTP-SSL/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+perl-Net-SMTP-SSL: perl-Net-SMTP-SSL (SSL support for Net::SMTP)
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL: perl-Net-SMTP-SSL is a perl module that implements the same API as
+perl-Net-SMTP-SSL: Net::SMTP, but uses IO::Socket::SSL for its network operations.
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL:
+perl-Net-SMTP-SSL: homepage: http://search.cpan.org/~cwest/Net-SMTP-SSL-1.01/
+perl-Net-SMTP-SSL:
diff --git a/python/MySQL-python/MySQL-python.SlackBuild b/python/MySQL-python/MySQL-python.SlackBuild
new file mode 100644
index 0000000000..9b2ed4fcb1
--- /dev/null
+++ b/python/MySQL-python/MySQL-python.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Slackware build script for MySQL-python.
+
+# Written by Jick Nan (jick.nan@gmail.com)
+
+PRGNAM=MySQL-python
+VERSION=1.2.3
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+# patch MANIFEST.in
+patch -p1 < $CWD/docs.patch
+
+python setup.py install --root=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a HISTORY PKG-INFO README doc/*.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/MySQL-python/MySQL-python.info b/python/MySQL-python/MySQL-python.info
new file mode 100644
index 0000000000..2f4b2aeafd
--- /dev/null
+++ b/python/MySQL-python/MySQL-python.info
@@ -0,0 +1,10 @@
+PRGNAM="MySQL-python"
+VERSION="1.2.3"
+HOMEPAGE="http://cheeseshop.python.org/pypi/MySQL-python/"
+DOWNLOAD="http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.3.tar.gz"
+MD5SUM="215eddb6d853f6f4be5b4afc4154292f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Jick Nan"
+EMAIL="jick.nan@gmail.com"
+APPROVED=""
diff --git a/python/MySQL-python/README b/python/MySQL-python/README
new file mode 100644
index 0000000000..545bf819fa
--- /dev/null
+++ b/python/MySQL-python/README
@@ -0,0 +1,12 @@
+MySQL-python (Python interface to MySQL)
+
+MySQLdb is an interface to the popular MySQL database server for Python.
+The design goals are:
+
+    * Compliance with Python database API version 2.0 [PEP-0249]
+    * Thread-safety
+    * Thread-friendliness (threads will not block each other)
+
+MySQL-3.23 through 5.1 and Python-2.3 through 2.6 are currently supported.
+
+This requires the Python setuptools (pysetuptools on SlackBuilds.org).
diff --git a/python/MySQL-python/docs.patch b/python/MySQL-python/docs.patch
new file mode 100644
index 0000000000..9c624b3547
--- /dev/null
+++ b/python/MySQL-python/docs.patch
@@ -0,0 +1,14 @@
+--- MySQL-python-1.2.3/MANIFEST.in.orig	2010-11-20 17:45:00.000000000 +0100
++++ MySQL-python-1.2.3/MANIFEST.in	2010-11-20 17:45:30.000000000 +0100
+@@ -1,10 +1,8 @@
+ recursive-include doc *.txt
+ recursive-include tests *.py
+ include MANIFEST.in
+-include MANIFEST
+-include ChangeLog
+ include HISTORY
+-include GPL
++include README
+ include pymemcompat.h
+ include metadata.cfg
+ include site.cfg
diff --git a/python/MySQL-python/slack-desc b/python/MySQL-python/slack-desc
new file mode 100644
index 0000000000..3bdaf5389e
--- /dev/null
+++ b/python/MySQL-python/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+MySQL-python: MySQL-python (Python interface to MySQL)
+MySQL-python: 
+MySQL-python: MySQLdb is an interface to the popular MySQL database server
+MySQL-python: for Python.  The design goals are:
+MySQL-python: * Compliance with Python database API version 2.0 [PEP-0249]
+MySQL-python: * Thread-safety
+MySQL-python: * Thread-friendliness (threads will not block each other)
+MySQL-python: 
+MySQL-python: MySQL-3.23 through 5.0 and Python-2.3 through 2.5 are currently
+MySQL-python: supported.
+MySQL-python: 
diff --git a/python/babel/README b/python/babel/README
new file mode 100644
index 0000000000..1e8cba91ba
--- /dev/null
+++ b/python/babel/README
@@ -0,0 +1,6 @@
+babel (python internationalization tools)
+
+Babel is a collection of tools for internationalizing Python applications.
+It's composed of two major parts:
+- tools to build and work with gettext message catalogs;
+- a Python interface to the CLDR (Common Locale Data Repository), providing access to various locale display names, localized number and date formatting, etc.
diff --git a/python/babel/babel.SlackBuild b/python/babel/babel.SlackBuild
new file mode 100644
index 0000000000..aab533bd87
--- /dev/null
+++ b/python/babel/babel.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Slackware build script for babel
+
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=babel
+SRCNAM=Babel
+VERSION=${VERSION:-0.9.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a COPYING ChangeLog README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/python/babel/babel.info b/python/babel/babel.info
new file mode 100644
index 0000000000..bb208bf8f5
--- /dev/null
+++ b/python/babel/babel.info
@@ -0,0 +1,10 @@
+PRGNAM="babel"
+VERSION="0.9.5"
+HOMEPAGE="http://babel.edgewall.org/"
+DOWNLOAD="http://ftp.edgewall.com/pub/babel/Babel-0.9.5.tar.gz"
+MD5SUM="05603f058644f81b9b5f75d0161a14dd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/python/babel/slack-desc b/python/babel/slack-desc
new file mode 100644
index 0000000000..7165a5b745
--- /dev/null
+++ b/python/babel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+babel: babel (python internationalization tools)
+babel:
+babel: Babel is a collection of tools for internationalizing Python apps.
+babel: It's composed of two major parts:
+babel: - tools to build and work with gettext message catalogs;
+babel: - a Python interface to the CLDR (Common Locale Data Repository),
+babel:   providing access to various locale display names, localized number
+babel:   and date formatting, etc.
+babel:
+babel: homepage: http://babel.edgewall.org/
+babel:
diff --git a/python/gnome-python/gnome-python.SlackBuild b/python/gnome-python/gnome-python.SlackBuild
index 2b2aaf0036..f27cb002c4 100644
--- a/python/gnome-python/gnome-python.SlackBuild
+++ b/python/gnome-python/gnome-python.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnome-python
-VERSION=2.22.3
+VERSION=2.28.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/gnome-python/gnome-python.info b/python/gnome-python/gnome-python.info
index f128dc30e9..1a70c01461 100644
--- a/python/gnome-python/gnome-python.info
+++ b/python/gnome-python/gnome-python.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-python"
-VERSION="2.22.3"
+VERSION="2.28.1"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.3.tar.bz2"
-MD5SUM="ab12d94954a57de39b25eb7903d8429c"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2"
+MD5SUM="a17ad952813ed86f520de8e07194a2bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/python/gst-python/gst-python.SlackBuild b/python/gst-python/gst-python.SlackBuild
index 0bef59981b..6d8854f253 100644
--- a/python/gst-python/gst-python.SlackBuild
+++ b/python/gst-python/gst-python.SlackBuild
@@ -9,7 +9,7 @@
 # from version 0.10.19
 
 PRGNAM=gst-python
-VERSION=${VERSION:-0.10.19}
+VERSION=${VERSION:-0.10.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/python/gst-python/gst-python.info b/python/gst-python/gst-python.info
index 408feccbe4..534812a08d 100644
--- a/python/gst-python/gst-python.info
+++ b/python/gst-python/gst-python.info
@@ -1,10 +1,10 @@
 PRGNAM="gst-python"
-VERSION="0.10.19"
+VERSION="0.10.21"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-python.html"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.19.tar.bz2"
-MD5SUM="ddcef7d00bd88b0591cd6d910c36ec4b"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.21.tar.bz2"
+MD5SUM="31340ae3e877797a10d088a226d74b16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Binh Nguyen"
 EMAIL="binhnguyen@fastmail.fm"
-APPROVED="Niels Horn"
+APPROVED=""
diff --git a/python/python-twisted/python-twisted.SlackBuild b/python/python-twisted/python-twisted.SlackBuild
index 5e70ceeea6..b0161eb416 100644
--- a/python/python-twisted/python-twisted.SlackBuild
+++ b/python/python-twisted/python-twisted.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=python-twisted
 SRCNAM=Twisted
-VERSION=${VERSION:-8.2.0}
+VERSION=${VERSION:-10.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,12 +77,6 @@ python setup.py install --root=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc
diff --git a/python/python-twisted/python-twisted.info b/python/python-twisted/python-twisted.info
index 7443cd969b..011b36d2c4 100644
--- a/python/python-twisted/python-twisted.info
+++ b/python/python-twisted/python-twisted.info
@@ -1,10 +1,10 @@
 PRGNAM="python-twisted"
-VERSION="8.2.0"
+VERSION="10.2.0"
 HOMEPAGE="http://twistedmatrix.com/"
-DOWNLOAD="http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2"
-MD5SUM="c85f151999df3ecf04c49a781b4438d2"
+DOWNLOAD="http://twistedmatrix.com/Releases/Twisted/10.2/Twisted-10.2.0.tar.bz2"
+MD5SUM="73da62c793269eade8121da336b01ba5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index 2376ce656d..693d9acd63 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -24,9 +24,10 @@
 # Modified to SBo format with the help of Yalla-One
 # Version bump and various other changes by Robby Workman
 # No additional license terms added
+# version bump by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=clamav
-VERSION=0.95.2
+VERSION=0.97
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index da3ba08f27..590d1896e8 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,10 +1,10 @@
 PRGNAM="clamav"
-VERSION="0.95.2"
+VERSION="0.97"
 HOMEPAGE="http://www.clamav.net/"
-DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.95.2.tar.gz"
-MD5SUM="930362397d30e01ba81b5f24c1046d48"
+DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.tar.gz"
+MD5SUM="605ed132b2f8e89df11064adea2b183b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Yalla-One"
 EMAIL="yallaone@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/clamav/config/clamd.conf.patch b/system/clamav/config/clamd.conf.patch
index a18ff49d88..172b4f3d4e 100644
--- a/system/clamav/config/clamd.conf.patch
+++ b/system/clamav/config/clamd.conf.patch
@@ -1,6 +1,6 @@
-diff -Nur clamav-0.95.2.orig/etc/clamd.conf clamav-0.95.2/etc/clamd.conf
---- clamav-0.95.2.orig/etc/clamd.conf	2009-04-07 05:32:06.000000000 -0500
-+++ clamav-0.95.2/etc/clamd.conf	2009-08-10 10:56:05.791514384 -0500
+diff -Naur clamav-0.96.5.orig/etc/clamd.conf clamav-0.96.5/etc/clamd.conf
+--- clamav-0.96.5.orig/etc/clamd.conf	2010-11-05 15:25:19.000000000 +0100
++++ clamav-0.96.5/etc/clamd.conf	2010-12-03 16:58:46.242000015 +0100
 @@ -5,7 +5,7 @@
  
  
@@ -25,7 +25,7 @@ diff -Nur clamav-0.95.2.orig/etc/clamd.conf clamav-0.95.2/etc/clamd.conf
  
  # Enable verbose logging.
  # Default: no
-@@ -54,7 +54,7 @@
+@@ -58,7 +58,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -34,13 +34,23 @@ diff -Nur clamav-0.95.2.orig/etc/clamd.conf clamav-0.95.2/etc/clamd.conf
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -69,11 +69,11 @@
+@@ -77,19 +77,19 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
--LocalSocket /tmp/clamd.socket
+-#LocalSocket /tmp/clamd.socket
 +LocalSocket /var/run/clamav/clamd.socket
  
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+-#LocalSocketGroup virusgroup
++LocalSocketGroup clamav
+ 
+ # Sets the permissions on the unix socket to the specified mode.
+ # Default: disabled (socket is world accessible)
+-#LocalSocketMode 660
++LocalSocketMode 660
+ 
  # Remove stale socket after unclean shutdown.
  # Default: yes
 -#FixStaleSocket yes
@@ -48,7 +58,7 @@ diff -Nur clamav-0.95.2.orig/etc/clamd.conf clamav-0.95.2/etc/clamd.conf
  
  # TCP port address.
  # Default: no
-@@ -167,14 +167,14 @@
+@@ -187,14 +187,14 @@
  
  # Run as another user (clamd must be started by root for this option to work)
  # Default: don't drop privileges
diff --git a/system/clamav/config/freshclam.conf.patch b/system/clamav/config/freshclam.conf.patch
index a55c90cd9a..478a7184c2 100644
--- a/system/clamav/config/freshclam.conf.patch
+++ b/system/clamav/config/freshclam.conf.patch
@@ -1,6 +1,6 @@
-diff -Nur clamav-0.95.2.orig/etc/freshclam.conf clamav-0.95.2/etc/freshclam.conf
---- clamav-0.95.2.orig/etc/freshclam.conf	2009-03-16 13:43:35.000000000 -0500
-+++ clamav-0.95.2/etc/freshclam.conf	2009-08-10 10:53:12.146515711 -0500
+diff -Naur clamav-0.96.5.orig/etc/freshclam.conf clamav-0.96.5/etc/freshclam.conf
+--- clamav-0.96.5.orig/etc/freshclam.conf	2010-11-25 12:15:46.000000000 +0100
++++ clamav-0.96.5/etc/freshclam.conf	2010-12-03 16:57:28.314000014 +0100
 @@ -5,7 +5,7 @@
  
  
@@ -41,16 +41,16 @@ diff -Nur clamav-0.95.2.orig/etc/freshclam.conf clamav-0.95.2/etc/freshclam.conf
  
  # Use DNS to verify virus database version. Freshclam uses DNS TXT records
  # to verify database and software versions. With this directive you can change
-@@ -64,7 +64,7 @@
- 
+@@ -65,7 +65,7 @@
  # Uncomment the following line and replace XY with your country
  # code. See http://www.iana.org/cctld/cctld-whois.htm for the full list.
+ # You can use db.XY.ipv6.clamav.net for IPv6 connections.
 -#DatabaseMirror db.XY.clamav.net
-+#DatabaseMirror db.@COUNTRY@.clamav.net
++DatabaseMirror db.@COUNTRY@.clamav.net
  
  # database.clamav.net is a round-robin record which points to our most 
  # reliable mirrors. It's used as a fall back in case db.XY.clamav.net is 
-@@ -111,7 +111,7 @@
+@@ -118,7 +118,7 @@
  
  # Send the RELOAD command to clamd.
  # Default: no
diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild
index 11f71a1d12..3f444ae3ec 100644
--- a/system/gnome-vfs/gnome-vfs.SlackBuild
+++ b/system/gnome-vfs/gnome-vfs.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnome-vfs
-VERSION=2.24.3
+VERSION=2.24.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/gnome-vfs/gnome-vfs.info b/system/gnome-vfs/gnome-vfs.info
index faf71a102f..7358e3ebff 100644
--- a/system/gnome-vfs/gnome-vfs.info
+++ b/system/gnome-vfs/gnome-vfs.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-vfs"
-VERSION="2.24.3"
+VERSION="2.24.4"
 HOMEPAGE="http://www.gnome.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.3.tar.bz2"
-MD5SUM="646a2672c6e7e4ebff6a798b0fb7cc90"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2"
+MD5SUM="a05fab03eeef10a47dd156b758982f2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/gnomint/README b/system/gnomint/README
new file mode 100644
index 0000000000..474ff17fd2
--- /dev/null
+++ b/system/gnomint/README
@@ -0,0 +1,7 @@
+gnomint (gui for certification authorities)
+
+gnomint is a tool for an easy creation and management of Certification
+Authorities. It allows a fancy visualization of all the pieces that
+conform a CA: x509 certificates, CSRs, CRLs...
+
+This requires GConf and ORBit2, available on slackware/extra.
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
new file mode 100644
index 0000000000..d751095340
--- /dev/null
+++ b/system/gnomint/doinst.sh
@@ -0,0 +1,18 @@
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database /usr/share/mime &> /dev/null
+fi
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database &> /dev/null
+fi
+
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache  -f -q /usr/share/icons/hicolor &> /dev/null
+fi
+
+if [ -x usr/bin/gconftool-2 ]; then
+  ( cd $PKG/etc/gconf/schemas
+  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+  usr/bin/gconftool-2 --makefile-install-rule \
+  etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 )
+fi
diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild
new file mode 100644
index 0000000000..448d163468
--- /dev/null
+++ b/system/gnomint/gnomint.SlackBuild
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Slackware build script for gnomint
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=gnomint
+VERSION=${VERSION:-1.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO"
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+autoreconf -i
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gnomint/gnomint.info b/system/gnomint/gnomint.info
new file mode 100644
index 0000000000..032a819750
--- /dev/null
+++ b/system/gnomint/gnomint.info
@@ -0,0 +1,10 @@
+PRGNAM="gnomint"
+VERSION="1.2.1"
+HOMEPAGE="http://sourceforge.net/projects/gnomint/"
+DOWNLOAD="http://downloads.sf.net/gnomint/gnomint-1.2.1.tar.gz"
+MD5SUM="f09f55abe094232fbea2a2d13ef600e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/system/gnomint/slack-desc b/system/gnomint/slack-desc
new file mode 100644
index 0000000000..24c4375145
--- /dev/null
+++ b/system/gnomint/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler----------------------------------------------------|
+gnomint: gnomint (gui for certification authorities)
+gnomint:
+gnomint: gnomint is a tool for an easy creation and management of Certification
+gnomint: Authorities. It allows a fancy visualization of all the pieces that
+gnomint: conform a CA: x509 certificates, CSRs, CRLs...
+gnomint:
+gnomint: http://sourceforge.net/projects/gnomint/
+gnomint:
+gnomint:
+gnomint:
+gnomint:
+
diff --git a/system/gvfs/gvfs.SlackBuild b/system/gvfs/gvfs.SlackBuild
index e0db4e4b6c..1f49e76c2b 100644
--- a/system/gvfs/gvfs.SlackBuild
+++ b/system/gvfs/gvfs.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Luis Henrique <lmello.009@gmail.com>
 
 PRGNAM=gvfs
-VERSION=${VERSION:-1.6.7}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,6 +60,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --disable-static \
+  --disable-hal \
   --build=$ARCH-slackware-linux
 
 make
@@ -73,6 +75,8 @@ cp -a \
   AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \;
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/gvfs/gvfs.info b/system/gvfs/gvfs.info
index a7ef633fc2..a0b394b86b 100644
--- a/system/gvfs/gvfs.info
+++ b/system/gvfs/gvfs.info
@@ -1,10 +1,10 @@
 PRGNAM="gvfs"
-VERSION="1.6.7"
+VERSION="1.8.0"
 HOMEPAGE="ftp://ftp.gnome.org"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gvfs/1.6/gvfs-1.6.7.tar.bz2"
-MD5SUM="ac249ae10e38cf3d5f779624b81ad3b0"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gvfs/1.8/gvfs-1.8.0.tar.bz2"
+MD5SUM="db09c9edcdde9b1166562a4ca54bbaa8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Luis Henrique"
 EMAIL="lmello.009@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/lxpolkit/README b/system/lxpolkit/README
index bad115f98e..368bb0ea14 100644
--- a/system/lxpolkit/README
+++ b/system/lxpolkit/README
@@ -1,3 +1,10 @@
 lxpolkit (policykit agent for LXDE)
 
 LXPolkit is a minimalized policykit authentication agent for the LXDE desktop.
+This is an alternative to polkit-gnome in stock slackware and disables it
+under LXDE during install. If, after having installed this version, a rollback to
+polkit-gnome for LXDE is preferred, remove lxpolkit and run this sed command
+that re-enables polkit-gnome for LXDE (reverting doinst.sh):
+
+sed -i -e 's|KDE;LXDE;|KDE;|' \
+  /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
diff --git a/system/lxpolkit/doinst.sh b/system/lxpolkit/doinst.sh
new file mode 100644
index 0000000000..281fea83d9
--- /dev/null
+++ b/system/lxpolkit/doinst.sh
@@ -0,0 +1,6 @@
+# use lxpolkit by default in LXDE disabling polkit-gnome under this DE
+# thanks to ricky cardo of LQ
+ALREADY=$(grep LXDE /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop)
+if [ ! $ALREADY ]; then
+  sed -i -e 's|KDE|KDE;LXDE|' /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+fi
diff --git a/system/lxpolkit/lxpolkit.SlackBuild b/system/lxpolkit/lxpolkit.SlackBuild
index 0cae05303a..48025c34df 100644
--- a/system/lxpolkit/lxpolkit.SlackBuild
+++ b/system/lxpolkit/lxpolkit.SlackBuild
@@ -7,16 +7,14 @@
 # generated by Grissiom's sbo-dev-helper
 
 PRGNAM=lxpolkit
-VERSION=${VERSION:-20100726_0ce3d64}
+VERSION=${VERSION:-20110317_bd22da9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -26,6 +24,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -69,19 +69,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHOR COPYING ChangeLog NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lxpolkit/lxpolkit.info b/system/lxpolkit/lxpolkit.info
index 73fbaa6f83..c844093862 100644
--- a/system/lxpolkit/lxpolkit.info
+++ b/system/lxpolkit/lxpolkit.info
@@ -1,10 +1,10 @@
 PRGNAM="lxpolkit"
-VERSION="20100726_0ce3d64"
+VERSION="20110317_bd22da9"
 HOMEPAGE="http://lxde.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde-git/lxpolkit-20100726_0ce3d64.tar.xz"
-MD5SUM="fe70c6206bad9ccfc01ba08b1120920c"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpolkit-20110317_bd22da9.tar.xz"
+MD5SUM="bcb761a2377f1d7d0d0d65176c9c9b85"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="michiel"
+APPROVED=""
diff --git a/system/lxrandr/lxrandr.SlackBuild b/system/lxrandr/lxrandr.SlackBuild
index 9ba31b9cb1..058a5bade4 100644
--- a/system/lxrandr/lxrandr.SlackBuild
+++ b/system/lxrandr/lxrandr.SlackBuild
@@ -37,6 +37,8 @@
 # 20100906_9aaca42 12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #            * Adapted to slackbuilds.org's autotools template.
 #            * updated to git snapshot.
+# 20110317_0a3a7fc 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#            * updated to git snapshot.
 # 
 # Run 'sh lxrandr.SlackBuild --cleanup' to build a Slackware package.
 # The package is created in /tmp .
@@ -45,16 +47,14 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxrandr
-VERSION=${VERSION:-20100906_9aaca42}
+VERSION=${VERSION:-20110317_0a3a7fc}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -114,10 +114,8 @@ make install-strip DESTDIR=$PKG
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/lxrandr/lxrandr.info b/system/lxrandr/lxrandr.info
index 47bf8cc750..3abfc0b4b0 100644
--- a/system/lxrandr/lxrandr.info
+++ b/system/lxrandr/lxrandr.info
@@ -1,10 +1,10 @@
 PRGNAM="lxrandr"
-VERSION="20100906_9aaca42"
+VERSION="20110317_0a3a7fc"
 HOMEPAGE="http://wiki.lxde.org/en/LXRandr"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxrandr-20100906_9aaca42.tar.xz"
-MD5SUM="a214fbf54a9ee4d5aad94018d1f6e982"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxrandr-20110317_0a3a7fc.tar.xz"
+MD5SUM="6ca23ed0f63188f7d7b6c82e6226ccb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/lxsession-edit/lxsession-edit.SlackBuild b/system/lxsession-edit/lxsession-edit.SlackBuild
index a5edd2dbfe..0d4866615b 100644
--- a/system/lxsession-edit/lxsession-edit.SlackBuild
+++ b/system/lxsession-edit/lxsession-edit.SlackBuild
@@ -7,18 +7,16 @@
 # generated by Grissiom's sbo-dev-helper
 
 PRGNAM=lxsession-edit
-VERSION=${VERSION:-20100906_0ed54f3}
+VERSION=${VERSION:-20110317_df43387}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-DOCS="AUTHOR COPYING ChangeLog NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -78,7 +76,7 @@ sed -i -e 's/_Name/Name/' $PKG/usr/share/applications/lxsession-edit.desktop
 sed -i -e 's/_Comment/Comment/' $PKG/usr/share/applications/lxsession-edit.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/lxsession-edit/lxsession-edit.info b/system/lxsession-edit/lxsession-edit.info
index d9b913f3a5..2afd0a94c5 100644
--- a/system/lxsession-edit/lxsession-edit.info
+++ b/system/lxsession-edit/lxsession-edit.info
@@ -1,10 +1,10 @@
 PRGNAM="lxsession-edit"
-VERSION="20100906_0ed54f3"
+VERSION="20110317_df43387"
 HOMEPAGE="http://wiki.lxde.org/en/LXSession_Edit"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxsession-edit-20100906_0ed54f3.tar.xz"
-MD5SUM="74c113200648b2a5d0aae97909d286e5"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxsession-edit-20110317_df43387.tar.xz"
+MD5SUM="d5b69b7122d574b0029d8e9159d627e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild
index 675fc158b0..681e97ed89 100644
--- a/system/lxsession/lxsession.SlackBuild
+++ b/system/lxsession/lxsession.SlackBuild
@@ -40,6 +40,8 @@
 # 0.4.4-1:    12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #            * Adapted to slackbuilds.org's autotools template.
 #            * updated.
+# 20110317_fa5b18b 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#            * updated to latest git snapshot.
 # 
 # Run 'sh lxsession.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -48,16 +50,14 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxsession
-VERSION=${VERSION:-0.4.4}
+VERSION=${VERSION:-20110317_fa5b18b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -98,7 +98,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# sh autogen.sh
+sh autogen.sh
 
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
@@ -123,8 +123,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info
index 9d193b426d..0e38001706 100644
--- a/system/lxsession/lxsession.info
+++ b/system/lxsession/lxsession.info
@@ -1,10 +1,10 @@
 PRGNAM="lxsession"
-VERSION="0.4.4"
+VERSION="20110317_fa5b18b"
 HOMEPAGE="http://wiki.lxde.org/en/LXSession"
-DOWNLOAD="http://download.sourceforge.net/lxde/lxsession-0.4.4.tar.gz"
-MD5SUM="9d433e1219eac07862c0d725ab58444f"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxsession-20110317_fa5b18b.tar.xz"
+MD5SUM="a2f304a8feba0bfb336d7d31fc4b0edc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild
index 7365e23b1e..ef7a66a5de 100644
--- a/system/lxtask/lxtask.SlackBuild
+++ b/system/lxtask/lxtask.SlackBuild
@@ -37,6 +37,8 @@
 # 0.1.3-1:    12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #             * Adapted to slackbuilds.org's autotools template.
 #             * updated to latest version.
+# 20110325_626fdf6 29/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#             * updated to latest git snapshot.
 # 
 # Run 'sh lxtask.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -45,21 +47,19 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=lxtask
-VERSION=${VERSION:-0.1.3}
+VERSION=${VERSION:-20110325_626fdf6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -95,6 +95,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
+
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -105,16 +107,15 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
+  --disable-debug \
   --build=$ARCH-slackware-linux
 make
 make install-strip DESTDIR=$PKG
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/lxtask/lxtask.info b/system/lxtask/lxtask.info
index 19026341e1..3f7d44c952 100644
--- a/system/lxtask/lxtask.info
+++ b/system/lxtask/lxtask.info
@@ -1,10 +1,10 @@
 PRGNAM="lxtask"
-VERSION="0.1.3"
+VERSION="20110325_626fdf6"
 HOMEPAGE="http://wiki.lxde.org/en/LXTask"
-DOWNLOAD="http://download.sourceforge.net/lxde/lxtask-0.1.3.tar.gz"
-MD5SUM="eccfb69ee1a209248b22a5f0a34a4734"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxtask-20110325_626fdf6.tar.xz"
+MD5SUM="e8d4e9e6efcc87ffe1555b881f0a26d6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild
index aae24b4088..b095e9df9f 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -46,6 +46,8 @@
 #             * Update.
 # 0.1.9-1:    12/sep/2010 by ponce <matteo.bernardini@gmail.com>
 #             * Update.
+# 20110328_63caa93 1/mar/2011 by ponce <matteo.bernardini@gmail.com>
+#             * Updated to latest git snapshot.
 # 
 # Run 'sh lxterminal.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -56,16 +58,14 @@
 # Set initial variables:
 
 PRGNAM=lxterminal
-VERSION=${VERSION:-0.1.9}
+VERSION=${VERSION:-20110328_63caa93}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -106,6 +106,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
+
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -114,6 +116,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --enable-man \
+  --disable-debug \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
@@ -123,10 +126,8 @@ make install-strip DESTDIR=$PKG
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index ed7f036c0d..f757484938 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,10 +1,10 @@
 PRGNAM="lxterminal"
-VERSION="0.1.9"
+VERSION="20110328_63caa93"
 HOMEPAGE="http://wiki.lxde.org/en/LXTerminal"
-DOWNLOAD="http://download.sourceforge.net/lxde/lxterminal-0.1.9.tar.gz"
-MD5SUM="cb10cc667611dce3c141294712049c43"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxterminal-20110328_63caa93.tar.xz"
+MD5SUM="c8769bbb62045d570ffd544d76c9a1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild
index b8d61e7c86..737ccc084d 100644
--- a/system/pcmanfm/pcmanfm.SlackBuild
+++ b/system/pcmanfm/pcmanfm.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcmanfm
-VERSION=20110316_9c4603d
+VERSION=${VERSION:-20110411_ff8faeb}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -96,9 +96,6 @@ make install-strip DESTDIR=$PKG
 # A minor polish
 sed -i 's/Name=File\ Manager/Name=PCMan\ File\ Manager/' $PKG/usr/share/applications/pcmanfm.desktop
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info
index 83038d7f8b..1e9d546042 100644
--- a/system/pcmanfm/pcmanfm.info
+++ b/system/pcmanfm/pcmanfm.info
@@ -1,10 +1,10 @@
 PRGNAM="pcmanfm"
-VERSION="20110316_9c4603d"
+VERSION="20110411_ff8faeb"
 HOMEPAGE="http://pcmanfm.sourceforge.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20110316_9c4603d.tar.xz"
-MD5SUM="0b3ce79e27ad0c8e6db58861750f0eb7"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20110411_ff8faeb.tar.xz"
+MD5SUM="2943c110d2af60fb37f495bcc57d0714"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
 EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/qemu-kvm/qemu-kvm.SlackBuild b/system/qemu-kvm/qemu-kvm.SlackBuild
index c67b6c6eaa..16c2d05399 100644
--- a/system/qemu-kvm/qemu-kvm.SlackBuild
+++ b/system/qemu-kvm/qemu-kvm.SlackBuild
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qemu-kvm
-VERSION=${VERSION:-0.13.0}
+VERSION=${VERSION:-0.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# The script is set to build all possible Linux Target CPU emulators by default.
+# The script is set to NOT build all possible Linux Target CPU emulators by default.
 # Available Linux Target CPUs for full system emulation are:
 #     i386 x86_64 arm cris m68k microblaze mips mipsel mips64 mips64el
 #     ppc ppcemb ppc64 sh4 sh4eb sparc sparc64
@@ -44,11 +44,11 @@ fi
 #     i386 x86_64 alpha arm armeb cris m68k microblaze mips mipsel
 #     ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc64 sparc32plus
 #
-# To reduce compile time and package size modify the BUILD ARCH line below
-# from BUILD_ARCH="" to BUILD_ARCH="x86_64" if you DO NOT need to emulate
-# all target CPUs.  This works fine for 32-bit or 64-bit QEMU-KVM hosts
-# providing full system emulation supporting Linux, BSD and Windows guests.
-BUILD_ARCH=""
+# To increase compile time and package size, pass BUILD ARCH="" to the build script
+# if you NEED to emulate all target CPUs.
+# The default works fine for 32-bit or 64-bit QEMU-KVM hosts providing
+# full system emulation supporting Linux, BSD and Windows guests.
+BUILD_ARCH=${BUILD_ARCH:-x86_64}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/system/qemu-kvm/qemu-kvm.info b/system/qemu-kvm/qemu-kvm.info
index 10959e8333..b9a5e1a705 100644
--- a/system/qemu-kvm/qemu-kvm.info
+++ b/system/qemu-kvm/qemu-kvm.info
@@ -1,10 +1,10 @@
 PRGNAM="qemu-kvm"
-VERSION="0.13.0"
+VERSION="0.14.0"
 HOMEPAGE="http://www.linux-kvm.org/page/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/project/kvm/qemu-kvm/0.13.0/qemu-kvm-0.13.0.tar.gz"
-MD5SUM="68d100da381284a3dee486d3b9690e6d"
+DOWNLOAD="http://downloads.sourceforge.net/kvm/qemu-kvm-0.14.0.tar.gz"
+MD5SUM="4ea6f412d85a826e0b0690f5c4c59f13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Stu Miller"
 EMAIL="slackbuilds@go4it2day.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/rsyslog/README b/system/rsyslog/README
new file mode 100644
index 0000000000..83896875e5
--- /dev/null
+++ b/system/rsyslog/README
@@ -0,0 +1,21 @@
+rsyslog (enhanced syslogd)
+
+rsyslog is an enhanced syslogd supporting, among others, MySQL, PostgreSQL,
+failover log destinations, syslog/tcp, fine grain output format control,
+high precision timestamps, queued operations and the ability to filter on
+any message part.
+It is quite compatible to stock sysklogd and can be used as a drop-in
+replacement (remove sysklogd before installing).
+It has a default config taken from the standard slackware sysklogd one and
+is setted up to emulate it.
+
+available build time switches (pass the variables to the build script):
+- MYSQL=yes for mysql support;
+- PGSQL=yes for postgresql support (you'll need postgresql, available on
+slackbuilds.org, installed);
+- LIBDBI=yes for libdbi support (you'll need libdbi and libdbi-drivers,
+available on slackbuilds.org, installed);
+- GNUTLS=yes for gnutls support.
+you can see more options if you run "./configure --help" in the uncompressed
+sources folder.
+
diff --git a/system/rsyslog/config/rc.rsyslogd b/system/rsyslog/config/rc.rsyslogd
new file mode 100644
index 0000000000..6318d7f8ed
--- /dev/null
+++ b/system/rsyslog/config/rc.rsyslogd
@@ -0,0 +1,55 @@
+#!/bin/sh
+# Start/stop/restart the system logging daemons.
+#
+# Written for Slackware Linux by Patrick J. Volkerding <volkerdi@slackware.com>.
+# Modded for rsyslogd by Chris Elvidge <chris@lowe.ae> Sept 2005
+# slightly modified by ponce <matteo.bernardini@sns.it> Oct 2010
+
+create_xconsole()
+{
+    if [ ! -e /dev/xconsole ]; then
+      mknod -m 640 /dev/xconsole p
+    else
+      chmod 0640 /dev/xconsole
+    fi
+    chown 0:0 /dev/xconsole
+}
+
+rsyslogd_start() {
+  if [ -x /usr/sbin/rsyslogd ]; then
+    echo "Starting rsyslogd daemon:  "
+    echo "/usr/sbin/rsyslogd -i $pidfile1"
+    /usr/sbin/rsyslogd -i "$pidfile1"
+    cp "$pidfile1" "$pidfile2"
+  fi
+}
+
+rsyslogd_stop() {
+  killall rsyslogd 2> /dev/null
+  /usr/bin/rm "$pidfile1" 2> /dev/null
+  /usr/bin/rm "$pidfile2" 2> /dev/null
+}
+
+rsyslogd_restart() {
+  rsyslogd_stop
+  sleep 1
+  rsyslogd_start
+}
+
+pidfile1=/var/run/rsyslogd.pid
+pidfile2=/var/run/syslogd.pid
+
+case "$1" in
+'start')
+  create_xconsole
+  rsyslogd_start
+  ;;
+'stop')
+  rsyslogd_stop
+  ;;
+'restart')
+  rsyslogd_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/system/rsyslog/config/rsyslog.conf b/system/rsyslog/config/rsyslog.conf
new file mode 100644
index 0000000000..1b88783343
--- /dev/null
+++ b/system/rsyslog/config/rsyslog.conf
@@ -0,0 +1,76 @@
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
+# look also into /usr/doc/rsyslog-*/html/rsyslog-example.conf
+
+# rsyslog v3: load input modules
+# If you do not load inputs, nothing happens!
+# You may need to set the module load path if modules are not found.
+
+$ModLoad immark   # provides --MARK-- message capability
+$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
+$ModLoad imklog   # kernel logging (formerly provided by rklogd)
+
+# maintain the sysklogd output format
+$ActionFileDefaultTemplate      RSYSLOG_TraditionalFileFormat
+
+# backward compatibility with klogd -c 3 behaviour, thanks to Rodrigo L. Fernandez
+$klogConsoleLogLevel 3
+
+# Uncomment this to see kernel messages on the console.
+#kern.*							/dev/console
+
+# Log anything 'info' or higher, but lower than 'warn'.
+# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+*.info;*.!warn;\
+	authpriv.none;cron.none;mail.none;news.none	-/var/log/messages
+
+# Log anything 'warn' or higher.
+# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+*.warn;\
+	authpriv.none;cron.none;mail.none;news.none	-/var/log/syslog
+
+# Debugging information is logged here.
+*.=debug						-/var/log/debug
+
+# Private authentication message logging:
+authpriv.*						-/var/log/secure
+
+# Cron related logs:
+cron.*							-/var/log/cron
+
+# Mail related logs:
+mail.*							-/var/log/maillog
+
+# Emergency level messages go to all users:
+*.emerg							*
+
+# This log is for news and uucp errors:
+uucp,news.crit						-/var/log/spooler
+
+# Uncomment these if you'd like INN to keep logs on everything.
+# You won't need this if you don't run INN (the InterNetNews daemon).
+#news.=crit					-/var/log/news/news.crit
+#news.=err					-/var/log/news/news.err
+#news.notice					-/var/log/news/news.notice
+
+# Remote Logging (we use TCP for reliable delivery)
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$WorkDirectory /rsyslog/spool # where to place spool files
+#$ActionQueueFileName uniqName # unique name prefix for spool files
+#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinite retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host:514
+
+# ######### Receiving Messages from Remote Hosts ########## 
+# TCP Syslog Server:
+# provides TCP syslog reception and GSS-API (if compiled to support it)
+#$ModLoad imtcp.so  # load module
+#$InputTCPServerRun 514 # start up TCP listener at port 514
+
+# UDP Syslog Server:
+#$ModLoad imudp.so  # provides UDP syslog reception
+#$UDPServerRun 514 # start a UDP syslog server at standard port 514
diff --git a/system/rsyslog/config/rsyslog.logrotate b/system/rsyslog/config/rsyslog.logrotate
new file mode 100644
index 0000000000..67001c527a
--- /dev/null
+++ b/system/rsyslog/config/rsyslog.logrotate
@@ -0,0 +1,6 @@
+/var/log/cron /var/log/debug /var/log/maillog /var/log/messages /var/log/secure /var/log/spooler /var/log/syslog {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/rsyslogd.pid 2>/dev/null` 2>/dev/null || true
+    endscript
+}
diff --git a/system/rsyslog/doinst.sh b/system/rsyslog/doinst.sh
new file mode 100644
index 0000000000..845bb35fa7
--- /dev/null
+++ b/system/rsyslog/doinst.sh
@@ -0,0 +1,36 @@
+if [ -f /etc/rc.d/rc.syslog ]; then
+  mv /etc/rc.d/rc.syslog /etc/rc.d/rc.syslog.orig
+fi
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/logrotate.d/rsyslog.new
+config etc/rsyslog.conf.new
+config etc/rc.d/rc.rsyslogd.new
+config var/log/cron.new
+config var/log/debug.new
+config var/log/maillog.new
+config var/log/messages.new
+config var/log/secure.new
+config var/log/spooler.new
+config var/log/syslog.new
+
+# Remove any leftover empty files:
+rm -f var/log/cron.new
+rm -f var/log/debug.new
+rm -f var/log/maillog.new
+rm -f var/log/messages.new
+rm -f var/log/secure.new
+rm -f var/log/spooler.new
+rm -f var/log/syslog.new
+
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
new file mode 100644
index 0000000000..4bd4ba606c
--- /dev/null
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+# Slackware build script for rsyslog
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=rsyslog
+VERSION=${VERSION:-5.6.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+if [ "${MYSQL:-no}" = "no" ]; then
+  mysql_option=""
+else
+  mysql_option="--enable-mysql"
+fi
+
+if [ "${PGSQL:-no}" = "no" ]; then
+  pgsql_option=""
+else
+  pgsql_option="--enable-pgsql"
+fi
+
+if [ "${LIBDBI:-no}" = "no" ]; then
+  libdbi_option=""
+else
+  libdbi_option="--enable-libdbi"
+fi
+
+if [ "${GNUTLS:-no}" = "no" ]; then
+  gnutls_option=""
+else
+  gnutls_option="--enable-gnutls"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-debug \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  $mysql_option \
+  $pgsql_option \
+  $libdbi_option \
+  $gnutls_option \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+# add the html documentation
+cp doc/*.{png,jpg,html,conf} $PKG/usr/doc/$PRGNAM-$VERSION/html
+
+# add a default config, the startup script and a logrotate entry
+mkdir -p $PKG/etc/{rc.d,logrotate.d}
+cat $CWD/config/rsyslog.conf > $PKG/etc/rsyslog.conf.new
+cat $CWD/config/rc.rsyslogd > $PKG/etc/rc.d/rc.rsyslogd.new
+chmod 0755 $PKG/etc/rc.d/rc.rsyslogd.new
+cat $CWD/config/rsyslog.logrotate > $PKG/etc/logrotate.d/rsyslog.new
+
+mkdir -p $PKG/var/log
+for i in cron debug maillog messages secure spooler syslog ; 
+  do touch $PKG/var/log/$i.new ;
+done
+
+# create backward compatibility links
+( cd $PKG/usr/sbin ; ln -s rsyslogd syslogd )
+( cd $PKG/etc/rc.d ; ln -s rc.rsyslogd rc.syslog )
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
new file mode 100644
index 0000000000..35728158f0
--- /dev/null
+++ b/system/rsyslog/rsyslog.info
@@ -0,0 +1,10 @@
+PRGNAM="rsyslog"
+VERSION="5.6.4"
+HOMEPAGE="http://www.rsyslog.com"
+DOWNLOAD="http://rsyslog.com/files/download/rsyslog/rsyslog-5.6.4.tar.gz"
+MD5SUM="0530db8ca71575ef23a027e9d514aa7e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/system/rsyslog/slack-desc b/system/rsyslog/slack-desc
new file mode 100644
index 0000000000..1145369c79
--- /dev/null
+++ b/system/rsyslog/slack-desc
@@ -0,0 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+rsyslog: rsyslog (enhanced syslogd)
+rsyslog:
+rsyslog: rsyslog is an enhanced syslogd supporting, among others, MySQL,
+rsyslog: PostgreSQL, failover log destinations, syslog/tcp, fine grain output
+rsyslog: format control, high precision timestamps, queued operations and the
+rsyslog: ability to filter on any message part. It is quite compatible to
+rsyslog: stock sysklogd and can be used as a drop-in replacement.
+rsyslog:
+rsyslog: ryslog homepage: http://www.rsyslog.com/
+rsyslog:
diff --git a/system/udisks/udisks.SlackBuild b/system/udisks/udisks.SlackBuild
index 672a3c26b5..05e5080bc0 100644
--- a/system/udisks/udisks.SlackBuild
+++ b/system/udisks/udisks.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=udisks
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-20110405_8f01c26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sh autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/udisks/udisks.info b/system/udisks/udisks.info
index 02c72641ad..26243917e6 100644
--- a/system/udisks/udisks.info
+++ b/system/udisks/udisks.info
@@ -1,10 +1,10 @@
 PRGNAM="udisks"
-VERSION="1.0.2"
+VERSION="20110405_8f01c26"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-DOWNLOAD="http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz"
-MD5SUM="f630eefa51b95d6485eb3246bc1bea9a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/udisks-20110405_8f01c26.tar.gz"
+MD5SUM="45dff4a8c3190558ed3760c2904cfb4e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/vice/patches/vice-2.1-64bit.patch b/system/vice/patches/vice-2.2-64bit.patch
index eadf9b64e5..55f7a820c7 100644
--- a/system/vice/patches/vice-2.1-64bit.patch
+++ b/system/vice/patches/vice-2.2-64bit.patch
@@ -1,7 +1,7 @@
-diff -urpN vice-2.1/configure vice-2.1-64/configure
---- vice-2.1/configure	2008-12-15 21:18:47.000000000 +0100
-+++ vice-2.1-64/configure	2009-10-11 00:02:00.763205494 +0200
-@@ -960,7 +960,7 @@ htmldir='${docdir}'
+diff -Naur vice-2.2.orig/configure vice-2.2/configure
+--- vice-2.2.orig/configure	2010-08-29 22:14:17.444876650 +0200
++++ vice-2.2/configure	2010-08-29 22:15:39.214874952 +0200
+@@ -989,7 +989,7 @@
  dvidir='${docdir}'
  pdfdir='${docdir}'
  psdir='${docdir}'
@@ -10,7 +10,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
  localedir='${datarootdir}/locale'
  mandir='${datarootdir}/man'
  
-@@ -1445,7 +1445,7 @@ Installation directories:
+@@ -1474,7 +1474,7 @@
  			  [PREFIX]
  
  By default, \`make install' will install all the files in
@@ -19,7 +19,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
  an installation prefix other than \`$ac_default_prefix' using \`--prefix',
  for instance \`--prefix=\$HOME'.
  
-@@ -1458,7 +1458,7 @@ Fine tuning of the installation director
+@@ -1487,7 +1487,7 @@
    --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
    --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
@@ -28,7 +28,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
    --includedir=DIR       C header files [PREFIX/include]
    --oldincludedir=DIR    C header files for non-gcc [/usr/include]
    --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-@@ -5583,7 +5583,7 @@ if test -z "$CPP"; then
+@@ -4416,7 +4416,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
        # Double quotes because CPP needs to be expanded
@@ -37,7 +37,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
      do
        ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -6369,7 +6369,7 @@ if test -z "$CPP"; then
+@@ -7173,7 +7173,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
        # Double quotes because CPP needs to be expanded
@@ -46,7 +46,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
      do
        ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -8652,7 +8652,7 @@ if test -z "$CXXCPP"; then
+@@ -9411,7 +9411,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
        # Double quotes because CXXCPP needs to be expanded
@@ -55,7 +55,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
      do
        ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
-@@ -8911,7 +8911,7 @@ _ACEOF
+@@ -9683,7 +9683,7 @@
    else
          no_recursion=yes
  
@@ -64,7 +64,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
      CPPFLAGS="$CPPFLAGS -I$with_resid/include"
  
  
-@@ -9131,7 +9131,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -9903,7 +9903,7 @@
  _ACEOF
  
      RESID_DIR=
@@ -73,7 +73,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
      RESID_INCLUDES="-I$with_resid/include"
    fi
  
-@@ -23284,7 +23284,7 @@ _ACEOF
+@@ -26810,7 +26810,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
@@ -82,7 +82,7 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
      esac
    fi
-@@ -28704,7 +28704,7 @@ fi
+@@ -32598,7 +32598,7 @@
  
      ;;
    *)
@@ -91,15 +91,15 @@ diff -urpN vice-2.1/configure vice-2.1-64/configure
  
  
  if false; then
-diff -urpN vice-2.1/src/arch/unix/archdep.h vice-2.1-64/src/arch/unix/archdep.h
---- vice-2.1/src/arch/unix/archdep.h	2008-10-10 21:08:31.000000000 +0200
-+++ vice-2.1-64/src/arch/unix/archdep.h	2009-10-11 00:03:04.366722924 +0200
-@@ -116,7 +116,7 @@ extern const char *archdep_pref_path;
+diff -Naur vice-2.2.orig/src/arch/unix/archdep.h vice-2.2/src/arch/unix/archdep.h
+--- vice-2.2.orig/src/arch/unix/archdep.h	2010-08-29 22:14:17.406871942 +0200
++++ vice-2.2/src/arch/unix/archdep.h	2010-08-29 22:16:37.424874831 +0200
+@@ -123,7 +123,7 @@
  #ifdef __NetBSD__
- #define LIBDIR          PREFIX "/share/vice"
+ #define LIBDIR PREFIX "/share/vice"
  #else
--#define LIBDIR          PREFIX "/lib/vice"
-+#define LIBDIR          PREFIX "/lib64/vice"
+-#define LIBDIR PREFIX "/lib/vice"
++#define LIBDIR PREFIX "/lib64/vice"
  #endif
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/system/vice/patches/vice-gcc-4.4.patch b/system/vice/patches/vice-gcc-4.4.patch
deleted file mode 100644
index 505d736943..0000000000
--- a/system/vice/patches/vice-gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/unix/joy.c
-+++ src/arch/unix/joy.c
-@@ -124,7 +124,7 @@
- #define JS_DATA_TYPE joystick
- #define JS_RETURN    sizeof(struct joystick)
- int     use_old_api=1;
--#elif
-+#else
- #error Unknown Joystick
- #endif
- 
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index ea0180229a..59dba2159b 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -21,9 +21,11 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# slightly modified by ponce <matteo.bernardini@gmail.com>
 
 PRGNAM=vice
-VERSION=2.1
+VERSION=2.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,10 +78,7 @@ find . \
 patch -p1 <$CWD/patches/vice-fix-help.patch
 
 # Use /usr/lib64 on 64-bit Slackware
-[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.1-64bit.patch
-
-# patch for gcc 4.4
-patch -p0 < $CWD/patches/vice-gcc-4.4.patch
+[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.2-64bit.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -97,9 +96,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
diff --git a/system/vice/vice.info b/system/vice/vice.info
index 8cc210ab46..60b028e572 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,10 +1,10 @@
 PRGNAM="vice"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="http://www.viceteam.org/"
-DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz"
-MD5SUM="a4cca1aad12e12ac7f37d6c85310ade8"
+DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz"
+MD5SUM="6737f540806205384e9129026898b0a1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Mauro Giachero"
 EMAIL="mauro dot giachero at gmail dot com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index 82c77d36f4..d41606a521 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -7,7 +7,7 @@
 # Lots of fixes by Robby Workman
 
 PRGNAM=virt-manager		
-VERSION=${VERSION:-0.8.3}	
+VERSION=${VERSION:-0.8.7}	
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}	 
 
@@ -72,10 +72,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index e2e16c322a..918429bab4 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="virt-manager"
-VERSION="0.8.3"
+VERSION="0.8.7"
 HOMEPAGE="http://virt-manager.et.redhat.com"
-DOWNLOAD="http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-0.8.3.tar.gz"
-MD5SUM="2994055bd83b7fe621f0258089e171f4"
+DOWNLOAD="http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-0.8.7.tar.gz"
+MD5SUM="9b1f3ead125d53bf506216c4bc7c4a84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Ash Wiren"
 EMAIL="ash@spooksoftware.com"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/system/virtinst/virtinst.SlackBuild b/system/virtinst/virtinst.SlackBuild
index ddaa354a1c..9a1b0bcc70 100644
--- a/system/virtinst/virtinst.SlackBuild
+++ b/system/virtinst/virtinst.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PRGNAM=virtinst
-VERSION=${VERSION:-0.500.2}
+VERSION=${VERSION:-0.500.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,10 +56,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 # Move and compress man pages
 mv $PKG/usr/share/man $PKG/usr
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/system/virtinst/virtinst.info b/system/virtinst/virtinst.info
index 67e23a1789..091af2bdb6 100644
--- a/system/virtinst/virtinst.info
+++ b/system/virtinst/virtinst.info
@@ -1,10 +1,10 @@
 PRGNAM="virtinst"
-VERSION="0.500.2"
+VERSION="0.500.6"
 HOMEPAGE="http://virt-manager.et.redhat.com"
-DOWNLOAD="http://virt-manager.et.redhat.com/download/sources/virtinst/virtinst-0.500.2.tar.gz"
-MD5SUM="8259de5523ba01b6398343b7c4545977"
+DOWNLOAD="http://virt-manager.et.redhat.com/download/sources/virtinst/virtinst-0.500.6.tar.gz"
+MD5SUM="5cad9ee9b8f64d700b3d1bbe644a58d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Ash Wiren"
 EMAIL="ash@spooksoftware.com"
-APPROVED="dsomero"
+APPROVED=""