43 files changed, 1184 insertions, 176 deletions
diff --git a/system/dconf/dconf.SlackBuild b/system/dconf/dconf.SlackBuild
index b54dcaa008..6196c58bd5 100644
--- a/system/dconf/dconf.SlackBuild
+++ b/system/dconf/dconf.SlackBuild
@@ -27,7 +27,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dconf
-VERSION=${VERSION:-0.7.3}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,6 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --disable-editor \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
diff --git a/system/dconf/dconf.info b/system/dconf/dconf.info
index 07fbc16dc7..6d81f1dc6d 100644
--- a/system/dconf/dconf.info
+++ b/system/dconf/dconf.info
@@ -1,10 +1,10 @@
 PRGNAM="dconf"
-VERSION="0.7.3"
+VERSION="0.8.0"
 HOMEPAGE="http://live.gnome.org/dconf"
-DOWNLOAD="http://download.gnome.org/sources/dconf/0.7/dconf-0.7.3.tar.bz2"
-MD5SUM="f541db70d0623d109b1866c732f1a51c"
+DOWNLOAD="http://download.gnome.org/sources/dconf/0.8/dconf-0.8.0.tar.bz2"
+MD5SUM="4c5c61a619ea27ffa15f88d142d20663"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
-APPROVED="nobody"
-\ No newline at end of file
+APPROVED=""
diff --git a/system/gnome-disk-utility/README b/system/gnome-disk-utility/README
new file mode 100644
index 0000000000..db7b507c95
--- /dev/null
+++ b/system/gnome-disk-utility/README
@@ -0,0 +1,7 @@
+gnome-disk-utility (storage device library and toolset)
+
+gnome-disk-utility provides libraries and
+applications for dealing with storage devices.
+
+To enable avahi support (needs avahi) pass the parameter
+AVAHI=yes when launching the script.
diff --git a/system/gnome-disk-utility/doinst.sh b/system/gnome-disk-utility/doinst.sh
new file mode 100644
index 0000000000..17b18ef350
--- /dev/null
+++ b/system/gnome-disk-utility/doinst.sh
@@ -0,0 +1,23 @@
+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...
+}
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
new file mode 100644
index 0000000000..ea06d96cb5
--- /dev/null
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for gnome-disk-utility
+
+# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.
+
+PRGNAM=gnome-disk-utility
+VERSION=${VERSION:-2.32.0}
+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}
+OUTPUT=${OUTPUT:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+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
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+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 {} \;
+
+cat $CWD/patches/remove_scrollkeeper_trash.diff | patch -p1 || exit 1
+cat $CWD/patches/autostart-in-all-but-kde.patch | patch -p1 || exit 1
+cat $CWD/patches/gdu_use_xdg-open_not_nautilus.patch | patch -p1 || exit 1
+
+if [ "${AVAHI:-no}" = "no" ]; then
+  patch -p1 < $CWD/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --disable-scrollkeeper \
+  --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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+
+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:-txz}
diff --git a/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch b/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch
new file mode 100644
index 0000000000..c82db2bcc4
--- /dev/null
+++ b/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch
@@ -0,0 +1,24 @@
+diff -Nur gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in
+--- gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in	2010-09-15 10:30:28.000000000 -0500
++++ gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in	2010-12-19 22:41:07.448844795 -0600
+@@ -6,7 +6,7 @@
+ Terminal=false
+ Type=Application
+ Categories=
+-OnlyShowIn=GNOME;
++NotShowIn=KDE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-disk-utility
+ X-GNOME-Bugzilla-Component=notifications
+diff -Nur gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in.in.in gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in.in.in
+--- gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in.in.in	2010-08-05 12:03:57.000000000 -0500
++++ gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in.in.in	2010-12-19 22:40:47.961099327 -0600
+@@ -6,7 +6,7 @@
+ Terminal=false
+ Type=Application
+ Categories=
+-OnlyShowIn=GNOME;
++NotShowIn=KDE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-disk-utility
+ X-GNOME-Bugzilla-Component=notifications
diff --git a/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch b/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch
new file mode 100644
index 0000000000..48b95e2a44
--- /dev/null
+++ b/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch
@@ -0,0 +1,25 @@
+diff -Nur gnome-disk-utility-2.32.0.orig//src/palimpsest/gdu-section-volumes.c gnome-disk-utility-2.32.0/src/palimpsest/gdu-section-volumes.c
+--- gnome-disk-utility-2.32.0.orig//src/palimpsest/gdu-section-volumes.c	2010-08-05 12:03:58.000000000 -0500
++++ gnome-disk-utility-2.32.0/src/palimpsest/gdu-section-volumes.c	2011-01-17 14:07:57.960802673 -0600
+@@ -1375,16 +1375,19 @@
+         /* We want to use nautilus instead of gtk_show_uri() because
+          * the latter doesn't handle automatically mounting the mount
+          * - maybe gtk_show_uri() should do that though...
++         * 
++         * Well, then there's this: 
++         * https://bugzilla.gnome.org/show_bug.cgi?id=638938#c1 
+          */
+ 
+-        s = g_strdup_printf ("nautilus \"%s\"", uri);
++        s = g_strdup_printf ("xdg-open \"%s\"", uri);
+ 
+         error = NULL;
+         if (!g_spawn_command_line_async (s, &error)) {
+                 GtkWidget *dialog;
+                 dialog = gdu_error_dialog_new (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))),
+                                                gdu_section_get_presentable (GDU_SECTION (section)),
+-                                               _("Error spawning nautilus: %s"),
++                                               _("Error spawning file manager: %s"),
+                                                error);
+                 gtk_widget_show_all (dialog);
+                 gtk_window_present (GTK_WINDOW (dialog));
diff --git a/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch b/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch
new file mode 100644
index 0000000000..479aa6511c
--- /dev/null
+++ b/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch
@@ -0,0 +1,178 @@
+diff -Naur gnome-disk-utility-2.32.0.orig/configure gnome-disk-utility-2.32.0/configure
+--- gnome-disk-utility-2.32.0.orig/configure	2010-09-15 17:27:20.000000000 +0200
++++ gnome-disk-utility-2.32.0/configure	2011-12-07 18:06:00.883885910 +0100
+@@ -11427,7 +11427,6 @@
+ UNIQUE_REQUIRED=1.0
+ LIBNOTIFY_REQUIRED=0.3.0
+ NAUTILUS_REQUIRED=2.24.0
+-AVAHI_UI_REQUIRED=0.6.25
+ 
+ UDISKS_REQUIRED=1.0.0
+ UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
+@@ -12466,92 +12465,6 @@
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+-fi
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_UI" >&5
+-$as_echo_n "checking for AVAHI_UI... " >&6; }
+-
+-if test -n "$AVAHI_UI_CFLAGS"; then
+-    pkg_cv_AVAHI_UI_CFLAGS="$AVAHI_UI_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= \$AVAHI_UI_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_AVAHI_UI_CFLAGS=`$PKG_CONFIG --cflags "avahi-ui >= $AVAHI_UI_REQUIRED" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$AVAHI_UI_LIBS"; then
+-    pkg_cv_AVAHI_UI_LIBS="$AVAHI_UI_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= \$AVAHI_UI_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_AVAHI_UI_LIBS=`$PKG_CONFIG --libs "avahi-ui >= $AVAHI_UI_REQUIRED" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED" 2>&1`
+-        else
+-	        AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$AVAHI_UI_PKG_ERRORS" >&5
+-
+-	as_fn_error "Package requirements (avahi-ui >= $AVAHI_UI_REQUIRED) were not met:
+-
+-$AVAHI_UI_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables AVAHI_UI_CFLAGS
+-and AVAHI_UI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
+-elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables AVAHI_UI_CFLAGS
+-and AVAHI_UI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
+-else
+-	AVAHI_UI_CFLAGS=$pkg_cv_AVAHI_UI_CFLAGS
+-	AVAHI_UI_LIBS=$pkg_cv_AVAHI_UI_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	:
+ fi
+ 
+ # *************
+diff -Naur gnome-disk-utility-2.32.0.orig/src/gdu-gtk/gdu-connect-to-server-dialog.c gnome-disk-utility-2.32.0/src/gdu-gtk/gdu-connect-to-server-dialog.c
+--- gnome-disk-utility-2.32.0.orig/src/gdu-gtk/gdu-connect-to-server-dialog.c	2010-09-15 16:12:21.000000000 +0200
++++ gnome-disk-utility-2.32.0/src/gdu-gtk/gdu-connect-to-server-dialog.c	2011-12-07 18:00:55.884882658 +0100
+@@ -24,7 +24,6 @@
+ 
+ #include "config.h"
+ #include <glib/gi18n-lib.h>
+-#include <avahi-ui/avahi-ui.h>
+ 
+ #include "gdu-connect-to-server-dialog.h"
+ 
+@@ -144,37 +143,6 @@
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+ static void
+-on_dns_sd_clicked (GtkButton *button,
+-                   gpointer   user_data)
+-{
+-        GduConnectToServerDialog *dialog = GDU_CONNECT_TO_SERVER_DIALOG (user_data);
+-        GtkWidget *service_dialog;
+-        gint response;
+-
+-        service_dialog = aui_service_dialog_new (_("Choose Server"),
+-                                                 gtk_window_get_transient_for (GTK_WINDOW (dialog)),
+-                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+-                                                 NULL);
+-
+-        aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (service_dialog),
+-                                                     "_udisks-ssh._tcp",
+-                                                     NULL);
+-        gtk_widget_show_all (service_dialog);
+-        response = gtk_dialog_run (GTK_DIALOG (service_dialog));
+-
+-        if (response == GTK_RESPONSE_OK) {
+-                const gchar *hostname;
+-                hostname = aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (service_dialog));
+-                gtk_entry_set_text (GTK_ENTRY (dialog->priv->hostname_entry), hostname);
+-        }
+-
+-        gtk_widget_destroy (service_dialog);
+-}
+-
+-/* ---------------------------------------------------------------------------------------------------- */
+-
+-static void
+ on_hostname_entry_changed (GtkEditable *editable,
+                            gpointer     user_data)
+ {
+@@ -217,24 +185,6 @@
+                                         GTK_STOCK_CONNECT,
+                                         GTK_RESPONSE_OK);
+ 
+-        button = gtk_button_new_with_mnemonic (_("_Browse..."));
+-        image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
+-        gtk_button_set_image (GTK_BUTTON (button), image);
+-        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
+-                            button,
+-                            FALSE,
+-                            FALSE,
+-                            0);
+-        gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
+-                                            button,
+-                                            TRUE);
+-        /* Translators: this is the tooltip for the "Browse..." button */
+-        gtk_widget_set_tooltip_text (button, _("Browse servers discovered via the DNS-SD protocol"));
+-        g_signal_connect (button,
+-                          "clicked",
+-                          G_CALLBACK (on_dns_sd_clicked),
+-                          dialog);
+-
+         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ 
+         vbox = content_area;
diff --git a/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff b/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff
new file mode 100644
index 0000000000..115b86e884
--- /dev/null
+++ b/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff
@@ -0,0 +1,60 @@
+diff -Nur gnome-disk-utility-2.32.0.orig//configure gnome-disk-utility-2.32.0/configure
+--- gnome-disk-utility-2.32.0.orig//configure	2010-09-15 10:27:20.000000000 -0500
++++ gnome-disk-utility-2.32.0/configure	2010-11-04 20:39:07.922165358 -0500
+@@ -12676,56 +12676,6 @@
+ fi
+ 
+ 
+-# *************
+-# Documentation
+-# *************
+-
+-# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
+-set dummy scrollkeeper-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $SCROLLKEEPER_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no"
+-  ;;
+-esac
+-fi
+-SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
+-if test -n "$SCROLLKEEPER_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCROLLKEEPER_CONFIG" >&5
+-$as_echo "$SCROLLKEEPER_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  { as_fn_set_status please install the scrollkeeper package
+-as_fn_error "Couldn't find scrollkeeper-config" "$LINENO" 5; }
+-fi
+-
+ # ********************
+ # Internationalization
+ # ********************
diff --git a/system/gnome-disk-utility/slack-desc b/system/gnome-disk-utility/slack-desc
new file mode 100644
index 0000000000..bf5dbee964
--- /dev/null
+++ b/system/gnome-disk-utility/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------------------------------------------------------|
+gnome-disk-utility: gnome-disk-utility (storage device library and toolset)
+gnome-disk-utility:
+gnome-disk-utility: gnome-disk-utility provides libraries and
+gnome-disk-utility: applications for dealing with storage devices.
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
+gnome-disk-utility:
diff --git a/system/gnomint/README b/system/gnomint/README
new file mode 100644
index 0000000000..9143940d47
--- /dev/null
+++ b/system/gnomint/README
@@ -0,0 +1,7 @@
+gnomint (certification authorities gui)
+
+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.
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
new file mode 100644
index 0000000000..7851dc4789
--- /dev/null
+++ b/system/gnomint/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database &> /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..5c63786978
--- /dev/null
+++ b/system/gnomint/gnomint.SlackBuild
@@ -0,0 +1,88 @@
+#!/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 {} \;
+
+# apply two patches from Debian, one for respect env CFLAGS and another
+# to link explicitly to libgcryct
+patch -p1 < $CWD/patches/01-ldd.patch
+patch -p1 < $CWD/patches/02-cflags.patch
+
+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/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch
new file mode 100644
index 0000000000..0f92419fb0
--- /dev/null
+++ b/system/gnomint/patches/01-ldd.patch
@@ -0,0 +1,14 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Explicitly linking against libgcrypt.
+
+diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in
+--- gnomint.orig/src/Makefile.in	2011-05-17 19:57:50.013883380 +0200
++++ gnomint/src/Makefile.in	2011-05-17 19:57:37.209981808 +0200
+@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \
+ 
+ gnomint_cli_LDADD = \
+ 	$(GNOMINTCLI_LIBS) \
++	$(LIBGCRYPT_LIBS) \
+ 	$(LIBGNUTLS_LIBS) \
+ 	$(SQLITE_LIBS) \
+ 	$(READLINE_LIBS) \
diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch
new file mode 100644
index 0000000000..59e4f71943
--- /dev/null
+++ b/system/gnomint/patches/02-cflags.patch
@@ -0,0 +1,28 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description:
+ Don't hardcode CFLAGS and respect the environemnt (Closes: #634395).
+
+diff -Naurp gnomint.orig/configure gnomint/configure
+--- gnomint.orig/configure	2011-09-08 07:58:09.324752523 +0000
++++ gnomint/configure	2011-09-08 07:59:20.113103539 +0000
+@@ -14338,7 +14338,7 @@ fi
+ 
+ 
+ if test "x$GCC" = "xyes"; then
+-	CFLAGS="-Wall -Werror"
++	CFLAGS="${CFLAGS:--Wall -Werror}"
+ 	if test "x$use_debug" = "xYes"; then
+    	   CFLAGS="$CFLAGS -g -O0"
+ 	fi
+diff -Naurp gnomint.orig/configure.in gnomint/configure.in
+--- gnomint.orig/configure.in	2011-09-08 07:58:09.328752536 +0000
++++ gnomint/configure.in	2011-09-08 07:59:20.113103539 +0000
+@@ -181,7 +181,7 @@ dnl
+ 
+ dnl
+ if test "x$GCC" = "xyes"; then
+-	CFLAGS="-Wall -Werror"
++	CFLAGS="${CFLAGS:--Wall -Werror}"
+ 	if test "x$use_debug" = "xYes"; then
+    	   CFLAGS="$CFLAGS -g -O0"
+ 	fi
diff --git a/system/gnomint/slack-desc b/system/gnomint/slack-desc
new file mode 100644
index 0000000000..00ef8b50cf
--- /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 (certification authorities gui)
+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: homepage: http://sourceforge.net/projects/gnomint/
+gnomint:
+gnomint:
+gnomint:
+gnomint:
+
diff --git a/system/gvfs/gvfs.SlackBuild b/system/gvfs/gvfs.SlackBuild
index e0db4e4b6c..2369c2acde 100644
--- a/system/gvfs/gvfs.SlackBuild
+++ b/system/gvfs/gvfs.SlackBuild
@@ -3,9 +3,10 @@
 # Slackware build script for gvfs
 
 # Written by Luis Henrique <lmello.009@gmail.com>
+# Thanks from ponce <matteo.bernardini@gmail.com> to Steve Kennedy for the hints :)
 
 PRGNAM=gvfs
-VERSION=${VERSION:-1.6.7}
+VERSION=${VERSION:-1.8.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,6 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --disable-static \
+  --disable-hal \
   --build=$ARCH-slackware-linux
 
 make
@@ -73,9 +76,17 @@ 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
+cat <<EOF > $PKG/install/doinst.sh
+# create the gio module cache during postinstall
+if [ -x /usr/bin/gio-querymodules ]; then
+  chroot . /usr/bin/gio-querymodules /usr/lib${LIBDIRSUFFIX}/gio/modules/ >/dev/null 2>&1
+fi
+EOF
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gvfs/gvfs.info b/system/gvfs/gvfs.info
index a7ef633fc2..7a155aebf3 100644
--- a/system/gvfs/gvfs.info
+++ b/system/gvfs/gvfs.info
@@ -1,10 +1,10 @@
 PRGNAM="gvfs"
-VERSION="1.6.7"
+VERSION="1.8.2"
 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.2.tar.bz2"
+MD5SUM="402f94b187b197b403d25c85caeb9562"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Luis Henrique"
 EMAIL="lmello.009@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/ktsuss/README b/system/ktsuss/README
new file mode 100644
index 0000000000..5934c149d1
--- /dev/null
+++ b/system/ktsuss/README
@@ -0,0 +1,3 @@
+ktsuss stands for "keep the su simple, stupid", and as the name says, is a 
+graphical version of su written in C and GTK+ 2. The idea of the project is 
+to remain simple and bug free...
diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild
new file mode 100644
index 0000000000..3363187f0e
--- /dev/null
+++ b/system/ktsuss/ktsuss.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for ktsuss
+
+# Copyright 2008 Murat D. Kadirov <banderols@gmail.com>
+# Copyright 2009,2010  Robby Workman  Northport, AL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.
+
+PRGNAM=ktsuss
+VERSION=${VERSION:-2}
+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 .
+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 \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING CREDITS Changelog INSTALL 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/system/ktsuss/ktsuss.info b/system/ktsuss/ktsuss.info
new file mode 100644
index 0000000000..eff66e76ca
--- /dev/null
+++ b/system/ktsuss/ktsuss.info
@@ -0,0 +1,10 @@
+PRGNAM="ktsuss"
+VERSION="2"
+HOMEPAGE="http://code.google.com/p/ktsuss/"
+DOWNLOAD="http://ktsuss.googlecode.com/files/ktsuss-2.tar.gz"
+MD5SUM="30525f110b8b3fded8a53f1fc9785335"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/system/ktsuss/slack-desc b/system/ktsuss/slack-desc
new file mode 100644
index 0000000000..b47abbb0a7
--- /dev/null
+++ b/system/ktsuss/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------------------------------------------------------|
+ktsuss: ktsuss (a gtk su helper)
+ktsuss:
+ktsuss: ktsuss stands for "keep the su simple, stupid", and as the name 
+ktsuss: implies, is a graphical version of su written in C and GTK+ 2
+ktsuss: (similar in functionality to kdesu and gksu).
+ktsuss:
+ktsuss: The goal of the project is to remain simple and bug free...
+ktsuss:
+ktsuss: Homepage: http://code.google.com/p/ktsuss/
+ktsuss:
+ktsuss:
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild
index e657a9e43a..ded5c49ed2 100644
--- a/system/lxdm/lxdm.SlackBuild
+++ b/system/lxdm/lxdm.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lxdm
-VERSION=${VERSION:-0.3.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.4.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# patch lxdm.conf.in to avoid a wrong libexec path - must go deep on
+# why the build system gets it wrong
+sed -i "s/@FULL_LIBEXECDIR@/\/usr\/libexec/" data/lxdm.conf.in
+
 # Patch the Xsession file to source /etc/profile and xprofile on session start
 patch -p1 < $CWD/patches/source_profile_in_Xsession.diff
 
@@ -91,6 +95,9 @@ patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff
 # to maintain ; let's hope I don't eat those words.  --rworkman
 patch -p1 < $CWD/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff 
 
+# from git, fix null pointer dereference
+patch -p1 < $CWD/patches/null_pointer_dereference.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -109,6 +116,10 @@ make install DESTDIR=$PKG
 # We said --without-pam
 rm -rf $PKG/etc/pam.d
 
+# change default non-existent background image to an lxde one and theme accordingly :P
+sed -i -e "s|^bg=.*|bg=/usr/share/lxde/wallpapers/lxde_green.jpg|" $PKG/etc/lxdm/lxdm.conf
+sed -i -e "s|Clearlooks|Clearlooks-Olive|" $PKG/etc/lxdm/lxdm.conf
+
 # Install a to-be-customized-if-needed /etc/lxdm/xinitrc
 cat $CWD/xinitrc > $PKG/etc/lxdm/xinitrc.new
 
diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info
index c584170ee7..4190230038 100644
--- a/system/lxdm/lxdm.info
+++ b/system/lxdm/lxdm.info
@@ -1,10 +1,10 @@
 PRGNAM="lxdm"
-VERSION="0.3.0"
+VERSION="0.4.1"
 HOMEPAGE="http://lxde.org/"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/lxdm-0.3.0.tar.gz"
-MD5SUM="1d0688e088edab7c3c563263eb2f9654"
+DOWNLOAD="http://downloads.sourceforge.net/lxde/lxdm-0.4.1.tar.gz"
+MD5SUM="8da1cfc2be6dc9217c85a7cf51e1e821"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="michiel"
+APPROVED=""
diff --git a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff
index e9a8c5ae97..dacd16d770 100644
--- a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff
+++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff
@@ -1,18 +1,18 @@
-diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c
---- lxdm-0.3.0.orig//src/lxdm.c	2010-09-24 10:43:49.000000000 -0500
-+++ lxdm-0.3.0/src/lxdm.c	2010-10-10 23:01:24.711716765 -0500
-@@ -150,6 +150,7 @@
+diff -Naur lxdm-0.4.0.orig/src/lxdm.c lxdm-0.4.0/src/lxdm.c
+--- lxdm-0.4.0.orig/src/lxdm.c	2011-07-13 14:00:34.000000000 +0200
++++ lxdm-0.4.0/src/lxdm.c	2011-07-22 17:27:34.000000000 +0200
+@@ -153,6 +153,7 @@
      while( waitpid(-1, 0, WNOHANG) > 0 ) ;
  }
  
 +/* Sorry, -ENOPAM here
+ #if HAVE_LIBPAM
  static void close_pam_session(pam_handle_t *pamh)
  {
-     int err;
-@@ -159,6 +160,7 @@
-     pam_end(pamh, err);
+@@ -164,6 +165,7 @@
      pamh = NULL;
  }
+ #endif
 +*/
  
  static LXSession *lxsession_find_greeter(void)
diff --git a/system/lxdm/patches/null_pointer_dereference.patch b/system/lxdm/patches/null_pointer_dereference.patch
new file mode 100644
index 0000000000..7abdbd4705
--- /dev/null
+++ b/system/lxdm/patches/null_pointer_dereference.patch
@@ -0,0 +1,51 @@
+From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001
+From: Andrea Florio <andrea@opensuse.org>
+Date: Fri, 29 Jul 2011 23:59:32 +0200
+Subject: [PATCH] fix null pointer dereference
+
+---
+ src/config.c |   25 ++++++++++---------------
+ 1 files changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 3f92f7b..4603ab4 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
+ static void update_face_image(GtkWidget *w)
+ {
+ 	GdkPixbuf *pixbuf;
+-	char *path;
+-	path=g_build_filename(user->pw_dir,".face",NULL);
+-	if(access(path,R_OK))
+-	{
+-		g_free(path);
+-		if(ui_nobody)
+-			pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
+-		if(!pixbuf)
+-			pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
++	char *path=g_build_filename(user->pw_dir,".face",NULL);
++	pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
++	g_free(path);
++	if(!pixbuf && ui_nobody)
++		pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
++	if(!pixbuf)
++		pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
+-	}
+-	else
++	if(pixbuf)
+ 	{
+-		pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
+-		g_free(path);
++		gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
++		g_object_unref(pixbuf);
+ 	}
+-	gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
+-	g_object_unref(pixbuf);
+ }
+ 
+ static void set_face_file(const char *filename)
+-- 
+1.7.0.1
+
diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff
index df1da70b83..475c5c75a9 100644
--- a/system/lxdm/patches/remove_suse_from_Xsession.diff
+++ b/system/lxdm/patches/remove_suse_from_Xsession.diff
@@ -1,10 +1,10 @@
-diff -Nur lxdm-0.3.0.orig//data/Xsession lxdm-0.3.0/data/Xsession
---- lxdm-0.3.0.orig//data/Xsession	2010-10-12 20:13:01.316302089 -0500
-+++ lxdm-0.3.0/data/Xsession	2010-10-12 20:12:40.989504750 -0500
-@@ -31,10 +31,6 @@
+diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession
+--- lxdm-0.4.0.orig/data/Xsession	2011-03-17 16:35:47.000000000 +0100
++++ lxdm-0.4.0/data/Xsession	2011-07-22 17:23:49.000000000 +0200
+@@ -27,10 +27,6 @@
  elif [ -x /etc/X11/Xsession ]; then
  # mandriva, debian, ubuntu
- 	exec /etc/X11/Xsession $LXSESSION
+ 	exec /etc/X11/Xsession "$LXSESSION"
 -elif [ -x /etc/X11/xinit/xinitrc ]; then
 -#suse
 -	export WINDOWMANAGER=$LXSESSION
diff --git a/system/qemu-kvm/README b/system/qemu-kvm/README
index 4c9a99a300..7cc4b68c17 100644
--- a/system/qemu-kvm/README
+++ b/system/qemu-kvm/README
@@ -27,3 +27,6 @@ be using plain "qemu" for the others (since they can't use the KVM stuff
 anyway.  The default "x86_64" value works fine for for 32-bit or 64-bit 
 QEMU-KVM hosts providing full system emulation supporting Linux, BSD, and 
 Windows guests. 
+
+If you want to enable spice remote desktop support you need spice, then
+you can pass the script the variable SPICE=yes
diff --git a/system/qemu-kvm/qemu-kvm.SlackBuild b/system/qemu-kvm/qemu-kvm.SlackBuild
index 2858fe03e6..8f358adc53 100644
--- a/system/qemu-kvm/qemu-kvm.SlackBuild
+++ b/system/qemu-kvm/qemu-kvm.SlackBuild
@@ -70,6 +70,13 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+if [ "${SPICE:-no}" = "no" ]; then
+  with_spice=""
+else
+  with_spice="--enable-spice"
+  EXTRACFLAGS="-I/usr/include/spice-server -I/usr/include/spice-1"
+fi
+
 # Needed to build man pages if build is ran from su
 export PATH=$PATH:/usr/share/texmf/bin
 
@@ -95,6 +102,7 @@ patch -p1 < $CWD/fixup_udev_rules.patch
 # This translates the possible targets into the correct format for configure
 TARGETS="$(for i in $BUILD_ARCH ; do printf "$i-softmmu " ; done)"
 
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lz" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -102,6 +110,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-mixemu \
   --audio-drv-list=oss,alsa,sdl,esd \
   --enable-system \
+  $with_spice \
   --target-list="$TARGETS"
 
 make V=1 \
diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild
index 1d180289fb..9002749114 100644
--- a/system/redis/redis.SlackBuild
+++ b/system/redis/redis.SlackBuild
@@ -4,7 +4,8 @@
 # Written by kuroi_kenshi <kuroi_kenshi96@yahoo.com>
 
 PRGNAM=redis
-VERSION=${VERSION:-1.02}
+SRC_VERSION=2.2.105-scripting
+VERSION=$(echo $SRC_VERSION | tr - _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,18 +43,15 @@ 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
+rm -rf $PRGNAM-$SRC_VERSION
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
+cd $PRGNAM-$SRC_VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # No ./configure necessary
-CFLAGS="$SLKCFLAGS" make
-
-# move binaries to /usr/bin/ 
-mkdir -p $PKG/usr/bin
-install -m 0755 redis-server redis-cli redis-benchmark $PKG/usr/bin
+CFLAGS="$SLKCFLAGS" make PREFIX=/usr
+make PREFIX=$PKG/usr 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
@@ -63,7 +61,7 @@ install -D -m 644 redis.conf $PKG/etc/redis.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  00-RELEASENOTES BETATESTING.txt BUGS Changelog COPYING README TODO \
+  00-RELEASENOTES BUGS CONTRIBUTING Changelog COPYING README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/redis/redis.info b/system/redis/redis.info
index d598f18caf..aac97f476e 100644
--- a/system/redis/redis.info
+++ b/system/redis/redis.info
@@ -1,10 +1,10 @@
 PRGNAM="redis"
-VERSION="1.02"
-HOMEPAGE="http://code.google.com/p/redis/"
-DOWNLOAD="http://redis.googlecode.com/files/redis-1.02.tar.gz"
-MD5SUM="5396e2d8b67f451ab4702ce7655533ae"
+VERSION="2.2.105_scripting"
+HOMEPAGE="http://redis.io"
+DOWNLOAD="http://redis.googlecode.com/files/redis-2.2.105-scripting.tar.gz"
+MD5SUM="3e05ac7fe85445c7e7ba9c129f3dada6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Kuroi Kenshi"
 EMAIL="kuroi_kenshi96@yahoo.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/system/slackyd/README b/system/slackyd/README
new file mode 100644
index 0000000000..35c43da926
--- /dev/null
+++ b/system/slackyd/README
@@ -0,0 +1,9 @@
+slackyd (slacky downloader)
+
+slackyd is a tool that let you download packages from a repository
+(checking integrity by their md5) and perform other tasks like showing
+package informations (description, size, dependencies and so on),
+check for updates, search for official or unofficial installed
+packages. It can build packages from source or just download the
+files needed for building. It can resolve needed dependencies using
+required and reccomended fields in PACKAGES.TXT
diff --git a/system/slackyd/slack-desc b/system/slackyd/slack-desc
new file mode 100644
index 0000000000..10d6b66ac6
--- /dev/null
+++ b/system/slackyd/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------------------------------------------------------|
+slackyd: slackyd (slacky downloader)
+slackyd:
+slackyd: slackyd is a tool that let you download packages from a repository
+slackyd: (checking integrity by their md5) and perform other tasks like showing
+slackyd: package informations (description, size, dependencies and so on),
+slackyd: check for updates, search for official or unofficial installed
+slackyd: packages. It can build packages from source or just download the
+slackyd: files needed for building. It can resolve needed dependencies using
+slackyd: required and reccomended fields in PACKAGES.TXT
+slackyd: homepage: http://slacky.eu/~dani/slackyd/
+slackyd:
diff --git a/system/slackyd/slackyd.SlackBuild b/system/slackyd/slackyd.SlackBuild
new file mode 100644
index 0000000000..cf38843636
--- /dev/null
+++ b/system/slackyd/slackyd.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Slackware build script for slackyd
+# Written by ponce <matteo.bernardini@gmail.com>
+
+PRGNAM=slackyd
+VERSION=${VERSION:-1.0}
+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 CHANGELOG INSTALL THANKS"
+
+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.bz2
+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" \
+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
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/slackyd/slackyd.info b/system/slackyd/slackyd.info
new file mode 100644
index 0000000000..6d36cc6cd6
--- /dev/null
+++ b/system/slackyd/slackyd.info
@@ -0,0 +1,10 @@
+PRGNAM="slackyd"
+VERSION="1.0"
+HOMEPAGE="http://slacky.eu/~dani/slackyd/"
+DOWNLOAD="http://slacky.eu/~dani/slackyd/sources/slackyd-1.0.tar.bz2"
+MD5SUM="577b97cc9116f5c21ca7b86ab945a737"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ponce"
+EMAIL="matteo.bernardini@gmail.com"
+APPROVED=""
diff --git a/system/udisks/udisks.SlackBuild b/system/udisks/udisks.SlackBuild
index 672a3c26b5..6eb4bbc374 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:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# oversight
+sed -i "s/^\+#/#/" configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -91,6 +94,11 @@ mkdir -p $PKG/etc/bash_completion.d
 mv $PKG/etc/profile.d/udisks-bash-completion.sh \
    $PKG/etc/bash_completion.d/udisks
 
+# use ntfs-3g by default
+mkdir -p $PKG/etc/udev/rules.d
+echo "ENV{ID_FS_TYPE}==\"ntfs\", ENV{ID_FS_TYPE}=\"ntfs-3g\"" \ 
+  > $PKG/etc/udev/rules.d/99-udisks-ntfs3g.rules
+
 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/udisks/udisks.info b/system/udisks/udisks.info
index 02c72641ad..c710e1bad1 100644
--- a/system/udisks/udisks.info
+++ b/system/udisks/udisks.info
@@ -1,10 +1,10 @@
 PRGNAM="udisks"
-VERSION="1.0.2"
+VERSION="1.0.4"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-DOWNLOAD="http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz"
-MD5SUM="f630eefa51b95d6485eb3246bc1bea9a"
+DOWNLOAD="http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz"
+MD5SUM="86c63b2b5484f2060499a052b5b6256b"
 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.1-64bit.patch
deleted file mode 100644
index eadf9b64e5..0000000000
--- a/system/vice/patches/vice-2.1-64bit.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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}'
- dvidir='${docdir}'
- pdfdir='${docdir}'
- psdir='${docdir}'
--libdir='${exec_prefix}/lib'
-+libdir='${exec_prefix}/lib64'
- localedir='${datarootdir}/locale'
- mandir='${datarootdir}/man'
- 
-@@ -1445,7 +1445,7 @@ Installation directories:
- 			  [PREFIX]
- 
- By default, \`make install' will install all the files in
--\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib64' etc.  You can specify
- an installation prefix other than \`$ac_default_prefix' using \`--prefix',
- for instance \`--prefix=\$HOME'.
- 
-@@ -1458,7 +1458,7 @@ Fine tuning of the installation director
-   --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]
--  --libdir=DIR           object code libraries [EPREFIX/lib]
-+  --libdir=DIR           object code libraries [EPREFIX/lib64]
-   --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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CPP needs to be expanded
--    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp"
-     do
-       ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -6369,7 +6369,7 @@ if test -z "$CPP"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CPP needs to be expanded
--    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp"
-     do
-       ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -8652,7 +8652,7 @@ if test -z "$CXXCPP"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
--    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    for CXXCPP in "$CXX -E" "/lib64/cpp"
-     do
-       ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -8911,7 +8911,7 @@ _ACEOF
-   else
-         no_recursion=yes
- 
--    LDFLAGS="$LDFLAGS -L$with_resid/lib"
-+    LDFLAGS="$LDFLAGS -L$with_resid/lib64"
-     CPPFLAGS="$CPPFLAGS -I$with_resid/include"
- 
- 
-@@ -9131,7 +9131,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
- 
-     RESID_DIR=
--    RESID_LIBS="$with_resid/lib/libresid.a"
-+    RESID_LIBS="$with_resid/lib64/libresid.a"
-     RESID_INCLUDES="-I$with_resid/include"
-   fi
- 
-@@ -23284,7 +23284,7 @@ _ACEOF
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
--	/usr/lib | /lib) ;;
-+	/usr/lib64 | /lib64) ;;
- 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-     esac
-   fi
-@@ -28704,7 +28704,7 @@ fi
- 
-     ;;
-   *)
--    VICEDIR="$PREFIX/lib/vice";
-+    VICEDIR="$PREFIX/lib64/vice";
- 
- 
- 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;
- #ifdef __NetBSD__
- #define LIBDIR          PREFIX "/share/vice"
- #else
--#define LIBDIR          PREFIX "/lib/vice"
-+#define LIBDIR          PREFIX "/lib64/vice"
- #endif
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/system/vice/patches/vice-2.3.12-x86_64.patch b/system/vice/patches/vice-2.3.12-x86_64.patch
new file mode 100644
index 0000000000..e56907ef47
--- /dev/null
+++ b/system/vice/patches/vice-2.3.12-x86_64.patch
@@ -0,0 +1,170 @@
+diff -Naur vice-2.3.12.orig/INSTALL vice-2.3.12/INSTALL
+--- vice-2.3.12.orig/INSTALL	2011-01-29 14:17:50.000000000 +0100
++++ vice-2.3.12/INSTALL	2011-12-23 12:22:05.147190182 +0100
+@@ -301,7 +301,7 @@
+ 
+       make install
+ 
+-    The binaries and support files will all go under PREFIX/lib/vice.
++    The binaries and support files will all go under PREFIX/lib64/vice.
+     You must of course have write permissions for the directories where
+     VICE is to be installed. Normally only the system administrator
+     has write access to /usr/local, the default PREFIX. Either ask
+diff -Naur vice-2.3.12.orig/configure.in vice-2.3.12/configure.in
+--- vice-2.3.12.orig/configure.in	2011-12-02 01:28:21.000000000 +0100
++++ vice-2.3.12/configure.in	2011-12-23 12:22:05.148190197 +0100
+@@ -1623,7 +1623,7 @@
+   fi
+ else
+   if test x"$enable_ethernet" = "xyes"; then
+-  dnl /usr/lib/libpcap.a
++  dnl /usr/lib64/libpcap.a
+     AC_CHECK_LIB(pcap, pcap_inject,[
+       AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
+       AC_DEFINE(HAVE_PCAP_INJECT,,[A libpcap version with pcap_inject is available])
+@@ -1634,8 +1634,8 @@
+       AC_DEFINE(HAVE_PCAP_SENDPACKET,,[A libpcap version with pcap_sendpacket is available])
+       TFE_LIBS="-lpcap"
+     ],,$LIBS)
+-  dnl /usr/lib/libpcap.a
+-  dnl /usr/lib/libnet.a
++  dnl /usr/lib64/libpcap.a
++  dnl /usr/lib64/libnet.a
+     AC_CHECK_LIB(pcap, pcap_open_live,[
+       AC_CHECK_LIB(net, libnet_init,[
+         AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
+@@ -1643,8 +1643,8 @@
+         TFE_LIBS="-lpcap `libnet-config --libs`"
+         CFLAGS="$CFLAGS `libnet-config --defines`"
+     ],,$LIBS)],,$LIBS)
+-  dnl /usr/lib/libpcap.a
+-  dnl /usr/lib/libnet.a
++  dnl /usr/lib64/libpcap.a
++  dnl /usr/lib64/libnet.a
+     AC_CHECK_LIB(pcap, pcap_open_live,[
+       AC_CHECK_LIB(net, libnet_write_link_layer,[
+         AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet])
+@@ -3393,7 +3393,7 @@
+     AM_CONDITIONAL(ALTERNATE_DOCDIR, true)
+     ;;
+   *)
+-    VICEDIR="$PREFIX/lib/vice";
++    VICEDIR="$PREFIX/lib64/vice";
+     AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     ;;  
+ esac
+diff -Naur vice-2.3.12.orig/doc/vice.guide vice-2.3.12/doc/vice.guide
+--- vice-2.3.12.orig/doc/vice.guide	2011-12-02 01:28:21.000000000 +0100
++++ vice-2.3.12/doc/vice.guide	2011-12-23 12:26:51.663193300 +0100
+@@ -1211,7 +1211,7 @@
+ (`:')-separated search
+ path list, like the UNIX `PATH' environment
+ variable.  The
+ default value is
+ 
+ 
+-   PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+  example
+ 
++   PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+  example
+ 
+ Where `PREFIX' is the installation prefix (usually
+ `/usr/local'),
+ `EMU' is the name of the emulated machine
+ (`C64', `C128', `PET',
+ `CBM-II' or `VIC20') and
+ `BOOTPATH' is the directory where the
+@@ -1221,10 +1221,10 @@
+ 
+    /usr/local/bin/x64
+  example
+ 
+ then the value will be
+ 
+ 
+-   /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++   /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ example
+ 
+ And system files will be searched for under the following
+ directories,
+ in the specified order:
+ 
+-     `/usr/local/lib/VICE/C64'
++     `/usr/local/lib64/VICE/C64'
+ 
+      `$HOME/.vice/C64'
+ 
+@@ -3542,7 +3542,7 @@
+      LIBDIR/EMUID:$HOME/.vice/EMUID:BOOTPATH/EMUID:LIBDIR/DRIVES:$HOME/.vice/DRIVES:BOOTPATH/DRIVES
+ 
+ where:
+ 
+      `LIBDIR' is the VICE installation directory (usually
+-     `/usr/local/lib/vice', `/usr/lib/vice' or
+ `/opt/vice/lib');
++     `/usr/local/lib64/vice', `/usr/lib64/vice' or
+ `/opt/vice/lib');
+ 
+      `EMUID' is the emulation identification
+ string (`C64', `C128',
+      `VIC20' or `PET');
+diff -Naur vice-2.3.12.orig/doc/vice.texi vice-2.3.12/doc/vice.texi
+--- vice-2.3.12.orig/doc/vice.texi	2011-11-27 21:01:24.000000000 +0100
++++ vice-2.3.12/doc/vice.texi	2011-12-23 12:22:05.162190237 +0100
+@@ -1320,7 +1320,7 @@
+ default value is
+ 
+ @example
+-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ @end example
+ 
+ Where @code{PREFIX} is the installation prefix (usually
+@@ -1339,7 +1339,7 @@
+ then the value will be
+ 
+ @example
+-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ @end example
+ 
+ And system files will be searched for under the following directories,
+@@ -1347,7 +1347,7 @@
+ 
+ @enumerate 1
+ @item
+-@code{/usr/local/lib/VICE/C64}
++@code{/usr/local/lib64/VICE/C64}
+ @item
+ @code{$HOME/.vice/C64}
+ @item
+diff -Naur vice-2.3.12.orig/doc/vice.txt vice-2.3.12/doc/vice.txt
+--- vice-2.3.12.orig/doc/vice.txt	2011-11-28 12:43:23.000000000 +0100
++++ vice-2.3.12/doc/vice.txt	2011-12-23 12:22:05.166190239 +0100
+@@ -1035,7 +1035,7 @@
+ `Directory' resource, which is a colon (`:')-separated search path
+ list, like the UNIX `PATH' environment variable.  The default value is
+ 
+-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
+ 
+ Where `PREFIX' is the installation prefix (usually `/usr/local'),
+ `EMU' is the name of the emulated machine (`C64', `C128', `PET',
+@@ -1049,12 +1049,12 @@
+ 
+ then the value will be
+ 
+-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ 
+ And system files will be searched for under the following
+ directories, in the specified order:
+ 
+-1. `/usr/local/lib/VICE/C64'
++1. `/usr/local/lib64/VICE/C64'
+ 
+ 2. `$HOME/.vice/C64'
+ 
+diff -Naur vice-2.3.12.orig/src/arch/sdl/archdep_unix.h vice-2.3.12/src/arch/sdl/archdep_unix.h
+--- vice-2.3.12.orig/src/arch/sdl/archdep_unix.h	2011-07-21 05:10:28.000000000 +0200
++++ vice-2.3.12/src/arch/sdl/archdep_unix.h	2011-12-23 12:22:05.167190238 +0100
+@@ -88,7 +88,7 @@
+ #ifdef __NetBSD__
+ #define LIBDIR PREFIX "/share/vice"
+ #else
+-#define LIBDIR PREFIX "/lib/vice"
++#define LIBDIR PREFIX "/lib64/vice"
+ #endif
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+diff -Naur vice-2.3.12.orig/src/arch/unix/archdep.h vice-2.3.12/src/arch/unix/archdep.h
+--- vice-2.3.12.orig/src/arch/unix/archdep.h	2010-10-06 18:17:43.000000000 +0200
++++ vice-2.3.12/src/arch/unix/archdep.h	2011-12-23 12:22:05.167190238 +0100
+@@ -127,7 +127,7 @@
+ #ifdef __NetBSD__
+ #define LIBDIR PREFIX "/share/vice"
+ #else
+-#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..c507067c99 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vice
-VERSION=2.1
+VERSION=${VERSION:-2.3.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,7 +62,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 . \
@@ -71,16 +71,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Use /usr/lib64 on 64-bit Slackware
+[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.3.12-x86_64.patch
+
+sh autogen.sh || true
+
 # Set the help path correctly with respect to the actually installed doc
 # folder (the folder set up by "make install" is quite broken).
 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
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/vice/vice.info b/system/vice/vice.info
index 2e02290c32..eeb764d911 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,10 +1,10 @@
 PRGNAM="vice"
-VERSION="2.1"
+VERSION="2.3.12"
 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://ponce.cc/slackware/sources/repo/vice-2.3.12.tar.xz"
+MD5SUM="268e524f4cf4eb9441e257990698066c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Eric B. Pratt"
 EMAIL="eric.b.pratt@gmail.com"
-APPROVED="rworkman"
+APPROVED=""