diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild
new file mode 100644
index 0000000..fae6c41
--- /dev/null
+++ b/Apps/abakus/abakus.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/sh
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2015-2016  Thorn Inurcide
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=abakus
+VERSION=${VERSION:-$TDEVERSION}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM is a calculator designed with computer usability in mind.
+$PRGNAM: Instead of using your powerful computer to put a limited simulation
+$PRGNAM: of a calculator on-screen, $PRGNAM instead allows you to use your
+$PRGNAM: computer to its greater potential.
+$PRGNAM:
+$PRGNAM: Can be built and used with mpfr.
+$PRGNAM: Customizable precision up to 75 digits.
+$PRGNAM:
+$PRGNAM: Copy/paste or type in and evaluate complex expressions. Exponentiation
+$PRGNAM: is right-associative, for example:  (2^3)^2*e^4/pi  2^3^2*e^4/pi
+$PRGNAM:      [The answers given by $PRGNAM:  1112.26437907   8898.11503252]
+
+" > $PKG/install/slack-desc
+}
+
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+echo "
+Extracting the source from the ${PRGNAM} archive ..."
+tar -xf ${SOURCE}
+
+cd applications
+cd ${PRGNAM}
+
+## add check for mpfr installed to set HAVE_MPFR, otherwise even if it is installed, abakus won't be built with mpfr
+sed -i 's|HAVE_INOTIFY )|HAVE_INOTIFY )\ncheck_include_file( mpfr.h HAVE_MPFR )|' ConfigureChecks.cmake
+## the linker can't find 'gmp' although it can find 'mpfr' and fails with:
+## [100%] Linking CXX executable abakus c++: error: gmp: No such file or directory
+## As libgmp is linked through libmpfr, do we really need libgmp here?
+sed -i 's|mpfr gmp|mpfr -lgmp|' src/CMakeLists.txt
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DBUILD_DOC="ON" \
+    ..
+
+
+  make $NUMJOBS || exit 1
+  make DESTDIR=$PKG install || exit 1
+cd -
+
+mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true
+cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
+
+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/install
+SlackDesc
+
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
+ 
diff --git a/Apps/dolphin/README b/Apps/dolphin/README
deleted file mode 100755
index 1532642..0000000
--- a/Apps/dolphin/README
+++ /dev/null
@@ -1 +0,0 @@
-Built with automake/configure because the cmake build doesn't include documentation.
diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild
index b9e0055..e07459d 100755
--- a/Apps/dolphin/dolphin.SlackBuild
+++ b/Apps/dolphin/dolphin.SlackBuild
@@ -38,18 +38,18 @@ echo "
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
-dolphin: dolphin (Dolphin file manager for TDE)
-dolphin:
-dolphin: Dolphin file manager for TDE
-dolphin:
-dolphin:
-dolphin: With language support for:
-dolphin:
-dolphin: en $(echo $langs)
-dolphin:
-dolphin:
-dolphin: Home: https://www.trinitydesktop.org/index.php 
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM (Dolphin file manager for TDE)
+$PRGNAM:
+$PRGNAM: Dolphin file manager for TDE
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM:
+$PRGNAM: en $langs
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: Home: https://www.trinitydesktop.org/index.php 
 " > $PKG/install/slack-desc
 }
 
@@ -67,36 +67,73 @@ cd ${PRGNAM}
 DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
 
 
+## Patches to edit/create CMakeLists.txt for documentation and locales support
+sed -i 's|src )|src )\nadd_subdirectory( po )\nadd_subdirectory( doc )|' CMakeLists.txt
+
+## for doc - based on amarok CMakeLists.txt:
+echo "tde_auto_add_subdirectories()
+" > doc/CMakeLists.txt
+echo "tde_create_handbook( LANG en DESTINATION d3lphin )
+" > doc/en/CMakeLists.txt
+## for po - based on tde-style-qtcurve CMakeLists.txt:
+echo 'exec_program(tde-config
+             ARGS --install locale --expandvars
+             OUTPUT_VARIABLE TDE_LOCALE_PREFIX)
+
+find_program(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+ 
+if(NOT GETTEXT_MSGFMT_EXECUTABLE)
+    message("------\n"
+            "NOTE: msgfmt not found. Translations will *not* be installed\n"
+            "------\n")
+else(NOT GETTEXT_MSGFMT_EXECUTABLE)
+    set(catalogname d3lphin)
+    add_custom_target(translations ALL)
+    file(GLOB PO_FILES *.po)
+    foreach(_poFile ${PO_FILES})
+        get_filename_component(_poFileName ${_poFile} NAME)
+        string(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} )
+        string(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
+        if(_langCode)
+            get_filename_component(_lang ${_poFile} NAME_WE)
+            set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+            add_custom_command(TARGET translations
+                    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
+                    DEPENDS ${_poFile})
+            install(FILES ${_gmoFile} DESTINATION  ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
+        endif( _langCode )
+    endforeach(_poFile ${PO_FILES})
+endif(NOT GETTEXT_MSGFMT_EXECUTABLE)
+' > po/CMakeLists.txt
+
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
-langs=$(echo $langs | sed 's|.po||g')
+echo $langs
 #
-langdoc="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done
-sed -i "s|SUBDIRS =.*$|SUBDIRS = $langdoc|" doc/Makefile.am
-
-
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
+## output list of available locales ...
+ls -1 po | while read line
+do
+## ... and compare to selected locales & remove those not required
+[[ $(echo $line|grep po) ]] && [[ $langs != *$line* ]] && rm -rf po/$line
+done
+langs=$(echo $langs | sed 's|.po||g')
 
-make -f admin/Makefile.common
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-./configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
+    ..
 
 
   make $NUMJOBS || exit 1
@@ -121,7 +158,7 @@ fi
 EOINS
 
 mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
-(cd ${PRGNAM};cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true
 cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
 find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
@@ -137,7 +174,7 @@ makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG
 cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Restore the original umask:
 umask ${_UMASK_}
diff --git a/Apps/dolphin/slack-desc b/Apps/dolphin/slack-desc
deleted file mode 100755
index 49a7b14..0000000
--- a/Apps/dolphin/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-dolphin: dolphin (Dolphin file manager for TDE)
-dolphin:
-dolphin: Dolphin file manager for TDE
-dolphin:
-dolphin:
-dolphin:
-dolphin:
-dolphin:
-dolphin:
-dolphin:
-dolphin: Home: https://www.trinitydesktop.org/index.php 
diff --git a/Core/tdenetwork/tdenetwork.SlackBuild-cmake b/Apps/filelight/filelight.SlackBuild
old mode 100755
new mode 100644
similarity index 57%
rename from Core/tdenetwork/tdenetwork.SlackBuild-cmake
rename to Apps/filelight/filelight.SlackBuild
index f8ecad2..b357778
--- a/Core/tdenetwork/tdenetwork.SlackBuild-cmake
+++ b/Apps/filelight/filelight.SlackBuild
@@ -22,12 +22,36 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
-PRGNAM=tdenetwork
+PRGNAM=filelight
 VERSION=${VERSION:-$TDEVERSION}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_tde}
 
-DOCS="AUTHORS COPYING* README*"
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM allows you to understand exactly where your diskspace is
+$PRGNAM: being used by graphically representating your filesystem as a set of
+$PRGNAM: concentric segmented-rings.
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM:
+$PRGNAM: en$langs
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: 
+" > $PKG/install/slack-desc
+}
 
 source ../../get-source.sh
 
@@ -36,57 +60,54 @@ echo "
 Extracting the source from the ${PRGNAM} archive ..."
 tar -xf ${SOURCE}
 
+cd applications
 cd ${PRGNAM}
 
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done
+#
+## output list of available locales ...
+ls -1 po | while read line
+do
+## ... and compare to selected locales & remove those not required
+[[ -d po/$line ]] && [[ $langs != *$line* ]] && rm -rf po/$line
+done 
+#
+## output list of available locale documentation ...
+ldocs="filelight $langs"
+ls -1 doc | while read line
+do
+## ... and compare to docs for selected locales & remove those not required
+[[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line
+done
+
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
+
 mkdir -p build-${PRGNAM}
 cd build-${PRGNAM}
+
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-    -DWITH_SPEEX="ON" \
-    -DWITH_ARTS="ON" \
-    -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
-    -DBUILD_KOPETE_PLUGIN_ALL="ON" \
-    -DBUILD_KOPETE_PROTOCOL_GADU="OFF" \
-    -DBUILD_KOPETE_PROTOCOL_MEANWHILE="OFF" \
-    -DBUILD_ALL="ON" \
-    -Wno-dev \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS="ON" \
     ..
+
+
   make $NUMJOBS || exit 1
   make DESTDIR=$PKG install || exit 1
 cd -
 
-# Add this to the doinst.sh:
-mkdir -p $PKG/install
-cat <<EOINS >> $PKG/install/doinst.sh
-# Update the desktop database:
-if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
-fi
-
-# Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
-  fi
-fi
-
-# Update the mime database:
-if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-EOINS
 
 mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true
@@ -98,14 +119,15 @@ 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/install
-cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+SlackDesc
 
 cd $PKG
 makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
 cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Restore the original umask:
-umask ${_UMASK_} 
+umask ${_UMASK_}
+ 
diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild
new file mode 100644
index 0000000..a17c3ee
--- /dev/null
+++ b/Apps/knmap/knmap.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/sh
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2015-2016  Thorn Inurcide 
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=knmap
+VERSION=${VERSION:-$TDEVERSION}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM:
+$PRGNAM: $PRGNAM is a front end to nmap
+$PRGNAM:
+$PRGNAM: A normal (non-root) user can use the privileged nmap functions via
+$PRGNAM: the 'tdesu' utility.
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+" > $PKG/install/slack-desc
+}
+
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+echo -e "\nExtracting the source from the ${PRGNAM} archive ..."
+tar -xf ${SOURCE}
+
+cd applications
+cd ${PRGNAM}
+
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+# update admin for installed version of libtool
+cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
+cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
+
+make -f admin/Makefile.common
+
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+# Configure the package
+LDFLAGS="${SLKLDFLAGS}" \
+CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
+CXXFLAGS="${SLKCFLAGS}" \
+../configure \
+   --prefix=${INSTALL_TDE}
+
+
+  make ${NUMJOBS:-} || exit 1
+  make DESTDIR=$PKG install || exit 1
+
+
+mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+(cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
+
+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/install
+SlackDesc
+
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
+ 
diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild
new file mode 100644
index 0000000..278c67d
--- /dev/null
+++ b/Apps/kscope/kscope.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2015-2016  Thorn Inurcide 
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=kscope
+VERSION=${VERSION:-$TDEVERSION}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM:
+$PRGNAM: $PRGNAM is a TDE-based source-editing environment for C and C-style
+$PRGNAM: languages. Primarily, it is a front-end to the veteran Cscope,
+$PRGNAM: a source-code browser originally developed at Bell Labs.
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM:
+$PRGNAM: en $langs
+$PRGNAM:
+$PRGNAM:
+" > $PKG/install/slack-desc
+}
+
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+echo -e "\nExtracting the source from the ${PRGNAM} archive ..."
+tar -xf ${SOURCE}
+
+cd applications
+cd ${PRGNAM}
+
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
+sed -i "s|POFILES =.*$|POFILES =kscope.pot$langs|" po/Makefile.am
+langs=$(echo $langs | sed 's|.po||g')
+
+# update admin for installed version of libtool
+cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
+cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
+
+make -f admin/Makefile.common
+
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+# Configure the package
+LDFLAGS="${SLKLDFLAGS}" \
+CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
+CXXFLAGS="${SLKCFLAGS}" \
+../configure \
+   --prefix=${INSTALL_TDE}
+
+
+  make ${NUMJOBS:-} || exit 1
+  make DESTDIR=$PKG install || exit 1
+
+
+mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+(cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
+
+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/install
+SlackDesc
+
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
+ 
diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild
index 0944af9..d099aa4 100755
--- a/Apps/tdeamarok/tdeamarok.SlackBuild
+++ b/Apps/tdeamarok/tdeamarok.SlackBuild
@@ -39,18 +39,18 @@ echo "
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
-tdeamarok: tdeamarok (Amarok Music Player)
-tdeamarok:
-tdeamarok: Amarok music player for TDE
-tdeamarok:
-tdeamarok:
-tdeamarok: With language support for:
-tdeamarok:
-tdeamarok: en $(echo $langs)
-tdeamarok:
-tdeamarok:
-tdeamarok: Home: https://www.trinitydesktop.org/index.php
+$PKGNAM|-----handy-ruler------------------------------------------------------|
+$PKGNAM: $PKGNAM (Amarok Music Player)
+$PKGNAM:
+$PKGNAM: Amarok music player for TDE
+$PKGNAM:
+$PKGNAM:
+$PKGNAM: With language support for:
+$PKGNAM:
+$PKGNAM: en$langs
+$PKGNAM:
+$PKGNAM:
+$PKGNAM: Home: https://www.trinitydesktop.org/index.php
 " > $PKG/install/slack-desc
 }
 
@@ -64,39 +64,73 @@ tar -xf ${SOURCE}
 cd applications
 cd ${PRGNAM}
 
+## speex patches to cmake:
+## [1] new speex/CMakeLists.txt using aac/CMakeLists.txt as a template
+cat amarok/src/metadata/aac/CMakeLists.txt | \
+sed 's|tagaac|tagspeex|g;s|aacfile.*$|taglib_speexfiletyperesolver.cpp speexfile.cpp speexproperties.cpp|' \
+> amarok/src/metadata/speex/CMakeLists.txt
+#
+## [2] patch metadata/CMakeLists.txt
+sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \
+-e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt
+
+# If libmp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a ..
+[[ $(grep -E "mp4.h|mp4v2.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4|tagm4a|' amarok/src/metadata/CMakeLists.txt
+
+
 # list only files > zero bytes
 DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
 
-
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done
-sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am
 #
-langdoc="amarok";for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done
-sed -i "s|SUBDIRS =.*$|SUBDIRS = $langdoc|" doc/Makefile.am
-
-
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
+## output list of available locales ...
+ls -1 po | while read line
+do
+## ... and compare to selected locales & remove those not required
+[[ -d po/$line ]] && [[ $langs != *$line* ]] && rm -rf po/$line
+done 
+#
+## output list of available locale documentation ...
+ldocs="amarok $langs"
+ls -1 doc | while read line
+do
+## ... and compare to docs for selected locales & remove those not required
+[[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line
+done
 
-make -f admin/Makefile.common
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-./configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
+    -DWITH_MP4V2=${LMP4V2:-"OFF"} \
+    -DWITH_LIBVISUAL="OFF" \
+    -DWITH_KONQSIDEBAR="OFF" \
+    -DWITH_XINE="ON" \
+    -DWITH_YAUAP="OFF" \
+    -DWITH_AKODE="OFF" \
+    -DWITH_IPOD="OFF" \
+    -DWITH_IFP="OFF" \
+    -DWITH_NJB="OFF" \
+    -DWITH_MTP="OFF" \
+    -DWITH_RIOKARMA="OFF" \
+    -DWITH_DAAP="OFF" \
+    -DWITH_INOTIFY="OFF" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS="ON" \
+    ..
 
 
   make $NUMJOBS || exit 1
@@ -121,7 +155,7 @@ fi
 EOINS
 
 mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
-(cd ${PRGNAM};cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true
 cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
 find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
@@ -137,7 +171,7 @@ makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG
 cd $OUTPUT
 md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PKGNAM}" | grep -v handy > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Restore the original umask:
 umask ${_UMASK_}
diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild
index 5c86882..7b374b8 100755
--- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild
+++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild
@@ -44,7 +44,7 @@ tdek3b-i18n: tdek3b-i18n (internationalization files for the CD Creator).
 tdek3b-i18n:
 tdek3b-i18n: For languages:
 tdek3b-i18n: 
-tdek3b-i18n: $(echo $langs)
+tdek3b-i18n: $langs
 tdek3b-i18n: 
 tdek3b-i18n: 
 tdek3b-i18n: 
@@ -67,33 +67,24 @@ cd ${PRGNAM}
 # list only files > zero bytes
 DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
 
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
-
-make -f admin/Makefile.common
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -d $Lang ]] && langs="$langs $Lang";done
-sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" Makefile.am
+langs="";for Lang in $I18N;do [[ $(grep $Lang subdirs) ]] && langs="$langs $Lang";done
+## remove wanted locales from subdirs file ...
+for loca in $langs;do sed -i "/$loca/d" subdirs;done
+## ... and use modified subdirs to remove unwanted locale directories
+while read dir;do rm -rf $dir;done < subdirs
+
 
 mkdir -p build-${PRGNAM}
 cd build-${PRGNAM}
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-../configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    ..
 
   make $NUMJOBS || exit 1
   make DESTDIR=$PKG install || exit 1
diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild
index 23fe46b..9feb7d0 100755
--- a/Apps/tdek3b/tdek3b.SlackBuild
+++ b/Apps/tdek3b/tdek3b.SlackBuild
@@ -39,18 +39,18 @@ echo "
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-   |-----handy-ruler------------------------------------------------------|
-tdek3b: tdek3b (The CD Creator, TDE $TDEVERSION version)
-tdek3b:
-tdek3b: K3b makes writing cds under Linux easy.  It has an easy to use
-tdek3b: interface and supports CD burning (including on-the-fly), copying,
-tdek3b: erasing, ripping, and more.
-tdek3b:
-tdek3b: K3b was written by Sebastian Trueg, Thomas Froescher,
-tdek3b: Christian Kvasny, and Klaus-Dieter Krannich.
-tdek3b:
-tdek3b: For more information, visit:  http://www.k3b.org
-tdek3b:
+$PKGNAM|-----handy-ruler------------------------------------------------------|
+$PKGNAM: $PKGNAM (The CD Creator, TDE $TDEVERSION version)
+$PKGNAM:
+$PKGNAM: K3b makes writing cds under Linux easy.  It has an easy to use
+$PKGNAM: interface and supports CD burning (including on-the-fly), copying,
+$PKGNAM: erasing, ripping, and more.
+$PKGNAM:
+$PKGNAM: K3b was written by Sebastian Trueg, Thomas Froescher,
+$PKGNAM: Christian Kvasny, and Klaus-Dieter Krannich.
+$PKGNAM:
+$PKGNAM: For more information, visit:  http://www.k3b.org
+$PKGNAM:
 " > $PKG/install/slack-desc
 }
 
@@ -64,16 +64,8 @@ tar -xf ${SOURCE}
 cd applications
 cd ${PRGNAM}
 
-DOCS=$(ls AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm 2>/dev/null) || true
-
-# change item description in Settings menu [but messes up non-english translations ..]
-#sed -i 's|Setup System Permissions...|Set up permissions (K3bSetup)...|' src/k3b.cpp
-
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
-
-make -f admin/Makefile.common
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
@@ -81,16 +73,33 @@ chmod -R u+w,go+r-w,a+rX-st .
 mkdir -p build-${PRGNAM}
 cd build-${PRGNAM}
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-../configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
+    -DWITH_LIBDVDREAD="ON" \
+    -DWITH_MUSICBRAINZ="OFF" \
+    -DWITH_SYSTEM_LIBSAMPLERATE="ON" \
+    -DWITH_HAL="OFF" \
+    -DWITH_DEBUG="OFF" \
+    -DWITH_ALSA="ON" \
+    -DWITH_ARTS="ON" \
+    -DWITH_FFMPEG="ON" \
+    -DWITH_FFMPEG_ALL_CODECS="OFF" \
+    -DWITH_FLAC="ON" \
+    -DWITH_SNDFILE="ON" \
+    -DWITH_TAGLIB="ON" \
+    -DWITH_MAD="ON" \
+    -DWITH_MUSEPACK="OFF" \
+    -DWITH_VORBIS="ON" \
+    -DWITH_LAME="ON" \
+    -DBUILD_K3BSETUP="ON" \
+    -DBUILD_DOC="ON" \
+    ..
+
 
   make $NUMJOBS || exit 1
   make DESTDIR=$PKG install || exit 1
@@ -114,7 +123,7 @@ makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG
 cd $OUTPUT
 md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PKGNAM}" | grep -v handy > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Restore the original umask:
 umask ${_UMASK_}
diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild
new file mode 100644
index 0000000..4ff46d3
--- /dev/null
+++ b/Apps/tdesudo/tdesudo.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2015-2016  Thorn Inurcide 
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=tdesudo
+VERSION=${VERSION:-$TDEVERSION}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM:
+$PRGNAM: $PRGNAM is a graphical front end for the sudo command.
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM:
+$PRGNAM: en $langs
+$PRGNAM:
+$PRGNAM:
+" > $PKG/install/slack-desc
+}
+
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+echo -e "\nExtracting the source from the ${PRGNAM} archive ..."
+tar -xf ${SOURCE}
+
+cd applications
+cd ${PRGNAM}
+
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
+sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
+langs=$(echo $langs | sed 's|.po||g')
+
+# update admin for installed version of libtool
+cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
+cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
+
+make -f admin/Makefile.common
+
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+# Configure the package
+LDFLAGS="${SLKLDFLAGS}" \
+CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
+CXXFLAGS="${SLKCFLAGS}" \
+../configure \
+   --prefix=${INSTALL_TDE}
+
+
+  make ${NUMJOBS:-} || exit 1
+  make DESTDIR=$PKG install || exit 1
+
+
+mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+(cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
+find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
+
+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/install
+SlackDesc
+
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
+ 
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index bd7c398..fa808a3 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -20,7 +20,7 @@ dialog --no-shadow --colors --title " Introduction " --msgbox \
 
 
 rm -f $TMPVARS/build-new
-dialog --yes-label "New" --no-label "Re-use" --no-shadow --colors --title " TDE Build " --yesno \
+dialog --yes-label "Re-use" --no-label "New" --defaultno --no-shadow --colors --title " TDE Build " --yesno \
 "\n
 Select \Zr\Z4\ZbNew\Zn if:
 \n
@@ -32,8 +32,9 @@ Additional packages are being built
 \n\n
 Selecting \Z1R\Zb\Z0e-use\Zn avoids having to create the build list again when re-running the build for any SlackBuilds that failed." \
 13 75
-[[ $(echo $?) == 0 ]] && rm $TMPVARS/TDEbuilds 2> /dev/null
-[[ $(echo $?) == 1 ]] && echo no > $TMPVARS/build-new
+[[ $(echo $?) == 0 ]] && echo no > $TMPVARS/build-new
+[[ $(echo $?) == 1 ]] && rm $TMPVARS/TDEbuilds 2> /dev/null
+
 
 build_core()
 {
@@ -213,6 +214,34 @@ Select \Zr\Zb\Z4No\Zn here if they have already been built and installed and you
 export SELECT=$(cat $TMPVARS/SELECT)
 
 
+rm $TMPVARS/PREPEND
+EXITVAL=2
+until [[ $EXITVAL -lt 2 ]] ; do
+dialog --no-shadow --yes-label "Prepend" --help-button --help-label "README" --no-label "Default" --colors --defaultno --title " Libraries Search Path " --yesno \
+"\n
+Select \Z1P\Zb\Z0repend\Zn to add the TDE libs paths to the beginning of the search path.
+\n\n
+Try \Zr\Zb\Z4Default\Zn first - in most cases this will work.
+\n\n" \
+10 75
+EXITVAL=$?
+[[ $EXITVAL == 0 ]] && echo yes > $TMPVARS/PREPEND
+[[ $EXITVAL == 1 ]] && 2> $TMPVARS/PREPEND
+[[ $EXITVAL == 2 ]] && dialog --no-shadow --colors --msgbox \
+"\n
+The default with the tqt3 build is to append the TDE lib paths to /etc/ld.so.conf.
+\n\n
+This means that TDE libs will be at the end of the search path. If the package configuration sets up the search path without using the shell variables set up in this script, those TDE libs will not be used if a library of the same name exists - a conflict which could arise if another DE is installed.
+\n\n
+If you experience any problems of this nature, then try the \Z1P\Zb\Z0repend\Zn option, which will set up doinst.sh for tqt3 to add the TDE libs paths to the beginning of the search path.
+\n\n
+ Then \Zb\Z2rebuild tqt3\Zn. This build option only applies to that package.
+\n\n" \
+ 20 75
+done
+export PREPEND=$(cat $TMPVARS/PREPEND)
+
+
 rm -f $TMPVARS/TDEbuilds
 dialog --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \
 "\n
@@ -253,33 +282,40 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 "Libs/tdelibkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \
 "Libs/kipi-plugins" "Additional functions for digiKam, ksquirrel and gwenview" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Requires tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \
 "Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel \Zn" \
+"Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \
+" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6   \Zn" \
+"Apps/tdeamarok" "A Music Player" off "\Zb\Z6  Optional dependencies - libmp4v2, speex \Zn" \
 "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi.  \Zn" \
-"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \
+"Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6   \Zn" \
+"Apps/filelight" "Graphical diskspace display" off "\Zb\Z6 requires x/xdpyinfo in use \Zn" \
+"Apps/gtk-qt-engine" "A GTK+2 theme engine" off "\Zb\Z6   \Zn" \
+"Apps/gtk3-tqt-engine" "A GTK+3 theme engine" off "\Zb\Z6   \Zn" \
 "Apps/tdegwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi.  \Zn" \
 "Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Required for tdegwenview when \Zb\Z3Additional language support\Zb\Z6 has been selected  \Zn" \
-" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6   \Zn" \
-"Apps/tdeamarok" "A Music Player" off "\Zb\Z6  Optional dependencies - libmp4v2, speex \Zn" \
 "Apps/tdek3b" "The CD Creator" off "\Zb\Z6   \Zn" \
 "Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Required for tdek3b when \Zb\Z3Additional language support\Zb\Z6 has been selected  \Zn" \
 "Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires tdek3b and ffmpeg \Zn" \
-"Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6   \Zn" \
-"Apps/knights" "A graphical chess interface" off "\Zb\Z6   \Zn" \
-"Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6   \Zn" \
-"Apps/gtk-qt-engine" "A GTK+2 theme engine" off "\Zb\Z6   \Zn" \
-"Apps/gtk3-tqt-engine" "A GTK+3 theme engine" off "\Zb\Z6   \Zn" \
 "Apps/kbookreader" "Twin-panel text files viewer esp. for reading e-books." off "\Zb\Z6   \Zn" \
-"Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6   \Zn" \
-"Apps/tde-style-lipstik" "lipstik theme" off "\Zb\Z6   \Zn" \
-"Apps/twin-style-crystal" "twin theme" off "\Zb\Z6   \Zn" \
-"Apps/tdeio-locate" "TDE frontend for the locate command" off "\Zb\Z6   \Zn" \
 "Apps/kile" "A TEX and LATEX source editor and shell" off "\Zb\Z6   \Zn" \
+"Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6   \Zn" \
+"Apps/knights" "A graphical chess interface" off "\Zb\Z6   \Zn" \
+"Apps/knmap" "A graphical nmap interface" off "\Zb\Z6 Might need tdesudo \Zn" \
+"Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \
 "Apps/kshutdown" "Shutdown utility for TDE" off "\Zb\Z6   \Zn" \
+"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \
 " Misc/potrace" "For tracing bitmaps to a vector graphics format" off "\Zb\Z6 Required for potracegui \Zn" \
 "Apps/potracegui" "A GUI for potrace" off "\Zb\Z6 Requires potrace \Zn" \
+"Apps/tde-style-lipstik" "lipstik theme" off "\Zb\Z6   \Zn" \
+"Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6   \Zn" \
+"Apps/tdeio-locate" "TDE frontend for the locate command" off "\Zb\Z6   \Zn" \
+"Apps/tdesudo" "Graphical frontend for the sudo command" off "\Zb\Z6   \Zn" \
+"Apps/twin-style-crystal" "twin theme" off "\Zb\Z6   \Zn" \
 " Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6   \Zn" \
+" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Optional for kscope. pdf/html docs not built by default  \Zn" \
 " Misc/tidy-html5" "Corrects and cleans up HTML and XML documents" off "\Zb\Z6 Optional for Quanta+ [tdewebdev] \Zn" \
 " Misc/inkscape" "SVG editor" off "\Zb\Z6 Requires lxml if online help facility is required. \Zn" \
 " Misc/lxml" "Python bindings for libxml2 and libxslt" off "\Zb\Z6 Required to use Inkscape online help \Zn" \
+" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Optional for Amarok \Zn" \
 2> $TMPVARS/TDEbuilds
 # successful builds are removed from the TDEbuilds list by '$dir ' so add a space to the last entry
 # and the " needs to be removed because the Misc entries are double-quoted
@@ -289,29 +325,22 @@ sed -i -e 's|$| |' -e 's|"||g' $TMPVARS/TDEbuilds
 [[ ! -e $TMPVARS/TDEbuilds ]] && run_dialog
 
 
-## These are changes to the default SlackBuild where an optional dependency is selected
-# If libcaldav is installed, or if building libcaldav for korganizer,
-# change option in tdepim.SlackBuild to "ON"
-[[ $(ls /var/log/packages/libcaldav*) || $(grep libcaldav $TMPVARS/TDEbuilds) ]] && \
-export LCALDAV="ON"
-
-
 # option to change to stop the build when it fails
 if [[ $(cat $TMPVARS/build-new) == no ]] 2> /dev/null ; then
 if [[ $(cat $TMPVARS/EXIT_FAIL) == "" ]] ; then
 if [[ $(cat $TMPVARS/KEEP_BUILD) == no ]] ; then
-dialog --defaultno --yes-label "Continue" --no-label "Stop" --no-shadow --colors --title " Action on failure - 2 " --yesno \
+dialog --defaultno --yes-label "Stop" --no-label "Continue" --no-shadow --colors --title " Action on failure - 2 " --yesno \
 "\n
 You have chosen to re-use the TDE build list, which now contains only those programs that failed to build.
 \n\n
-But this script is set to Continue in the event of a failure, which will delete all but the last build record. Each failure should now be investigated which requires that the build be stopped when it fails.
+But this script is set to Continue in the event of a failure, which will delete all but the last build record. It will be easier to investigate each failure if the build is stopped when it fails.
 \n\n
-Do you still want the build to \Z1C\Zb\Z0ontinue\Zn at a failure
+Do you still want the build to \Zr\Z4\ZbContinue\Zn at a failure
 \n
- or change to \Zr\Z4\ZbStop\Zn ?
+ or change to \Z1S\Zb\Z0top\Zn ?
 \n " \
 15 75
-[[ $(echo $?) == 1 ]] && echo "exit 1" > $TMPVARS/EXIT_FAIL
+[[ $(echo $?) == 0 ]] && echo "exit 1" > $TMPVARS/EXIT_FAIL
 fi;fi;fi
 
 
diff --git a/CHANGELOG b/CHANGELOG
index 5e8e633..29f2d04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
 12/29/2015 Removed Avahi and krb5 as deps
 08/01/2016 Overhaul to entire build process using a dialog script - Thanks Ray-V
 2016-12-04 Issue 21 - Added TDEVERSION variable. Changed libcaldav to optional dependency. Updated mp4v2 URL.
+2016-12-xx Updated dolphin, amarok, tdenetwork, k3b[-i18n], tdegames to cmake build.
+           Added Apps/abakus and Apps/filelight. Put Apps in program name order in BUILD-TDE.sh
+2016-12-xx Added Apps/{knmap,kscope,tdesudo} and Misc/graphviz
+           Modified BUILD-TDE.sh and tqt3.SlackBuild for ld.so.conf option
\ No newline at end of file
diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild
index 8d66081..d79d140 100755
--- a/Core/tdegames/tdegames.SlackBuild
+++ b/Core/tdegames/tdegames.SlackBuild
@@ -28,34 +28,6 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_tde}
 
 
-Options()
-{
-# if tdemultimedia has been built with cmake, only kmix has been built and without libartsmodules
-#  - in that case, remove it's requirement for kolf.
-[[ ! $(grep -h libartsmodules.so /var/log/packages/tdemultimedia-* 2>/dev/null) ]] && sed -i 's| -lartsmodules||' kolf/Makefile.am
-return 0
-}
-
-
-ChooseGames()
-{
-# Uncomment to choose the games to be built - otherwise the default is all
-#CHOOSE="y"
-#
-if [ "${CHOOSE:-}" == "y" ]
-then
-# edit for games required
-CHOICE="atlantik kasteroids katomic kbackgammon kbattleship kblackbox kbounce kenolaba kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kpoker kreversi ksame kshisen ksmiletris ksnake ksokoban kspaceduel ktron ktuberling lskat twin4 klickety kfouleggs ksirtet"
-sed -i "s|TOPSUBDIRS =  .*$|TOPSUBDIRS =  libtdegames doc libksirtet $CHOICE|" Makefile
-# don't package carddecks if they're not needed for chosen games
-[[ ! $(echo $CHOICE|grep -E "kpat|kpoker|lskat") ]] && sed -i 's|carddecks||' libtdegames/Makefile
-# docs for chosen games only
-sed -i "s|SUBDIRS =.*$|SUBDIRS =. $CHOICE|" doc/Makefile
-fi
-return
-}
-
-
 SlackDesc()
 {
 echo "
@@ -92,13 +64,6 @@ Extracting the source from the ${PRGNAM} archive ..."
 tar -xf ${SOURCE}
 
 cd ${PRGNAM}
-Options
-
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
-
-make -f admin/Makefile.common
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
@@ -106,19 +71,63 @@ chmod -R u+w,go+r-w,a+rX-st .
 mkdir -p build-${PRGNAM}
 cd build-${PRGNAM}
 
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
+    -DWITH_ARTS="ON" \
+    -DBUILD_ATLANTIK="ON" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_KASTEROIDS="ON" \
+    -DBUILD_KATOMIC="ON" \
+    -DBUILD_KBACKGAMMON="ON" \
+    -DBUILD_KBATTLESHIP="ON" \
+    -DBUILD_KBLACKBOX="ON" \
+    -DBUILD_KBOUNCE="ON" \
+    -DBUILD_KENOLABA="ON" \
+    -DBUILD_KFOULEGGS="ON" \
+    -DBUILD_KGOLDRUNNER="ON" \
+    -DBUILD_KJUMPINGCUBE="ON" \
+    -DBUILD_KLICKETY="ON" \
+    -DBUILD_KLINES="ON" \
+    -DBUILD_KMAHJONGG="ON" \
+    -DBUILD_KMINES="ON" \
+    -DBUILD_KNETWALK="ON" \
+    -DBUILD_KOLF="ON" \
+    -DBUILD_KONQUEST="ON" \
+    -DBUILD_KPAT="ON" \
+    -DBUILD_KPOKER="ON" \
+    -DBUILD_KREVERSI="ON" \
+    -DBUILD_KSAME="ON" \
+    -DBUILD_KSHISEN="ON" \
+    -DBUILD_KSIRTET="ON" \
+    -DBUILD_KSMILETRIS="ON" \
+    -DBUILD_KSNAKE="ON" \
+    -DBUILD_KSOKOBAN="ON" \
+    -DBUILD_KSPACEDUEL="ON" \
+    -DBUILD_KTRON="ON" \
+    -DBUILD_KTUBERLING="ON" \
+    -DBUILD_LIBTDEGAMES="ON" \
+    -DBUILD_LSKAT="ON" \
+    -DBUILD_TWIN4="ON" \
+    ..
+
+
+# don't package carddecks if they're not needed for chosen games:
+[[ ! $(grep -E "kpat|kpoker|lskat" cmake_install.cmake) ]] && sed -i '/carddecks/d' libtdegames/cmake_install.cmake
+# docs for chosen games only:
+## output list of available docs
+grep include doc/cmake_install.cmake |rev |cut -d "/" -f 2|rev | while read line
+do
+## compare to selected packages & remove available docs if not in list
+[[ ! $(grep $line cmake_install.cmake) ]] && sed -i "/$line/d" doc/cmake_install.cmake
+: # need something here to prevent exit 1
+done
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-../configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
 
-ChooseGames
   make $NUMJOBS || exit 1
   make DESTDIR=$PKG install || exit 1
 cd -
diff --git a/Core/tdenetwork/slack-desc b/Core/tdenetwork/slack-desc
deleted file mode 100755
index abe45a5..0000000
--- a/Core/tdenetwork/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-tdenetwork: tdenetwork (networking applications)
-tdenetwork:
-tdenetwork: Networking applications for TDE
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork: Home: https://www.trinitydesktop.org/index.php 
diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild
index 750680a..d1d6964 100755
--- a/Core/tdenetwork/tdenetwork.SlackBuild
+++ b/Core/tdenetwork/tdenetwork.SlackBuild
@@ -38,18 +38,18 @@ echo "
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-          |-----handy-ruler------------------------------------------------------|
-tdenetwork: tdenetwork (networking applications)
-tdenetwork:
-tdenetwork: Networking applications for TDE
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork:
-tdenetwork: Home: https://www.trinitydesktop.org/index.php
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM (networking applications)
+$PRGNAM:
+$PRGNAM: Networking applications for TDE
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+$PRGNAM: Home: https://www.trinitydesktop.org/index.php
 " > $PKG/install/slack-desc
 }
 
@@ -62,29 +62,80 @@ tar -xf ${SOURCE}
 
 cd ${PRGNAM}
 
+# If speex is installed, include it in the build for jingle
+[[ $(grep speex.h /var/log/packages/*speex*) ]] 2>/dev/null && SPX="ON"
+
 # list only files > zero bytes
 DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
 
-
-# update admin for installed version of libtool
-cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/
-cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in
-
-make -f admin/Makefile.common
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
-# Configure the package
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-./configure \
-   --prefix=${INSTALL_TDE} \
-   --sysconfdir="/etc/trinity" \
-   --mandir=${INSTALL_TDE}/man \
-   --disable-rpath \
-   --enable-closure
+mkdir -p build-${PRGNAM}
+cd build-${PRGNAM}
+
+## If changing any of these options, READ CMakeLists.txt for info on interdependencies ..
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
+    -DWITH_ARTS="ON" \
+    -DWITH_JINGLE="ON" \
+    -DWITH_SPEEX=${SPX:-"OFF"} \
+    -DWITH_GSM="OFF" \
+    -DWITH_XMMS="OFF" \
+    -DWITH_SLP="OFF" \
+    -DBUILD_DCOPRSS="ON" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_FILESHARING="ON" \
+    -DBUILD_KDICT="ON" \
+    -DBUILD_TDEDNSSD="ON" \
+    -DBUILD_TDEFILE_PLUGINS="ON" \
+    -DBUILD_KGET="ON" \
+    -DBUILD_KNEWSTICKER="ON" \
+    -DBUILD_KPF="ON" \
+    -DBUILD_KPPP="OFF" \
+    -DBUILD_KRDC="ON" \
+    -DBUILD_KRFB="ON" \
+    -DBUILD_KSIRC="ON" \
+    -DBUILD_KTALKD="ON" \
+    -DBUILD_LANBROWSING="ON" \
+    -DBUILD_LIBRSS="ON" \
+    -DBUILD_WIFI="ON" \
+    -DBUILD_KOPETE="ON" \
+    -DBUILD_KOPETE_PROTOCOL_TESTBED="ON" \
+    -DBUILD_KOPETE_PROTOCOL_GROUPWISE="ON" \
+    -DBUILD_KOPETE_PROTOCOL_MSN="ON" \
+    -DBUILD_KOPETE_PROTOCOL_IRC="ON" \
+    -DBUILD_KOPETE_PROTOCOL_OSCAR="ON" \
+    -DBUILD_KOPETE_PROTOCOL_YAHOO="ON" \
+    -DBUILD_KOPETE_PROTOCOL_WINPOPUP="ON" \
+    -DBUILD_KOPETE_PROTOCOL_SMS="ON" \
+    -DBUILD_KOPETE_PROTOCOL_JABBER="ON" \
+    -DBUILD_KOPETE_PROTOCOL_GADU="OFF" \
+    -DBUILD_KOPETE_PROTOCOL_MEANWHILE="OFF" \
+    -DBUILD_KOPETE_PLUGIN_LATEX="ON" \
+    -DBUILD_KOPETE_PLUGIN_AUTOREPLACE="ON" \
+    -DBUILD_KOPETE_PLUGIN_HISTORY="ON" \
+    -DBUILD_KOPETE_PLUGIN_CONTACTNOTES="ON" \
+    -DBUILD_KOPETE_PLUGIN_CRYPTOGRAPHY="ON" \
+    -DBUILD_KOPETE_PLUGIN_CONNECTIONSTATUS="ON" \
+    -DBUILD_KOPETE_PLUGIN_TRANSLATOR="ON" \
+    -DBUILD_KOPETE_PLUGIN_NOWLISTENING="ON" \
+    -DBUILD_KOPETE_PLUGIN_WEBPRESENCE="ON" \
+    -DBUILD_KOPETE_PLUGIN_TEXTEFFECT="ON" \
+    -DBUILD_KOPETE_PLUGIN_HIGHLIGHT="ON" \
+    -DBUILD_KOPETE_PLUGIN_ALIAS="ON" \
+    -DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY="ON" \
+    -DBUILD_KOPETE_PLUGIN_NETMEETING="ON" \
+    -DBUILD_KOPETE_PLUGIN_ADDBOOKMARKS="ON" \
+    -DBUILD_KOPETE_PLUGIN_STATISTICS="ON" \
+    -DBUILD_KOPETE_PLUGIN_SMPPPDCS="ON" \
+    -Wno-dev \
+    ..
 
 
   make $NUMJOBS || exit 1
@@ -114,7 +165,7 @@ fi
 EOINS
 
 mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
-(cd ${PRGNAM};cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
+cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true
 cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
 find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
@@ -130,8 +181,7 @@ makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG
 cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Restore the original umask:
 umask ${_UMASK_}
- 
diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild
index 5779b85..6e41527 100755
--- a/Core/tdepim/tdepim.SlackBuild
+++ b/Core/tdepim/tdepim.SlackBuild
@@ -38,6 +38,9 @@ tar -xf ${SOURCE}
 
 cd ${PRGNAM}
 
+# If libcaldav is installed, include it in the build for korganizer
+[[ $(ls /var/log/packages/libcaldav*) ]] 2>/dev/null && LCALDAV="ON"
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index ff6306b..721d578 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -93,6 +93,7 @@ make install INSTALL_ROOT=$PKG || exit 1
 
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
+[[ $PREPEND != yes ]] && \
 cat <<EOINS >> $PKG/install/doinst.sh
 # Add TQt library directories to /etc/ld.so.conf:
 if ! grep ${INSTALL_TDE}/lib${LIBDIRSUFFIX} /etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
@@ -112,6 +113,28 @@ sed -i "s|pkgconfig$|pkgconfig:${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig|g" /e
 sed -i "s|pkgconfig$|pkgconfig:${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig|g" /etc/profile.d/pkgconfig.csh
 fi
 
+EOINS
+
+## Removing any existing TDE libs paths and re-installing prevents duplication -
+## upgradepkg runs installpkg, and hence doinst.sh, twice, also generating the double colon.
+[[ $PREPEND == yes ]] && \
+cat <<EOINS >> $PKG/install/doinst.sh
+# Add TQt library directories to /etc/ld.so.conf:
+sed -i "\|${INSTALL_TDE}/lib${LIBDIRSUFFIX}|d" /etc/ld.so.conf
+sed -i "1i ${INSTALL_TDE}/lib${LIBDIRSUFFIX}" /etc/ld.so.conf
+sed -i "1i $TQTDIR-$VERSION/lib" /etc/ld.so.conf
+if [ -x /sbin/ldconfig ]; then
+  /sbin/ldconfig 2> /dev/null
+fi
+
+# Update PKG_CONFIG_PATH:
+sed -i "s|${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig||g;s|:$||g" /etc/profile.d/pkgconfig.{,c}sh
+sed -i "s|PKG_CONFIG_PATH=|PKG_CONFIG_PATH=${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig:|g;s|::|:|g" /etc/profile.d/pkgconfig.sh
+sed -i "s|PKG_CONFIG_PATH |PKG_CONFIG_PATH ${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig:|g;s|::|:|g" /etc/profile.d/pkgconfig.csh
+
+EOINS
+
+cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
diff --git a/Misc/graphviz/README b/Misc/graphviz/README
new file mode 100644
index 0000000..2d48990
--- /dev/null
+++ b/Misc/graphviz/README
@@ -0,0 +1,14 @@
+Graphviz is open source graph visualization software.  It has several
+main graph layout programs.  It also has web and interactive graphical
+interfaces, and auxiliary tools, libraries, and language bindings.
+
+Graph visualization is a way of representing structural information as
+diagrams of abstract graphs and networks.  Automatic graph drawing has
+many important applications in software engineering, database and web
+design, networking, and in visual interfaces for many other domains.
+
+gts is an optional dependency.
+
+------------------------------
+pdf and html documentation is not built by default in the SB.
+To build it, comment out 'source $SRCDIR/patches && rmdoc' in the script [c. line 97].
diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild
new file mode 100644
index 0000000..a5e0ce9
--- /dev/null
+++ b/Misc/graphviz/graphviz.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+# Slackware build script for graphviz
+
+# Copyright 2007 Robby Workman <rworkman@slackbuilds.org>
+# Copyright 2011 Heinz Wiesinger <pprkut@slackbuilds.org>
+# Copyright 2013-2015 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2016 tde-slackbuilds - modified for inclusion in build method
+# 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=graphviz
+VERSION=${VERSION:-2.38.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM (Graph Visualization)
+$PRGNAM:
+$PRGNAM: Graphviz is open source graph visualization software.
+$PRGNAM: It has several main graph layout programs.  It also has
+$PRGNAM: web and interactive graphical interfaces, and auxiliary
+$PRGNAM: tools, libraries, and language bindings.
+$PRGNAM:
+$PRGNAM: Homepage: http://graphviz.org/
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+
+" > $PKG/install/slack-desc
+}
+
+SRCURL="http://graphviz.org/pub/graphviz/stable/SOURCES/$PRGNAM-$VERSION.tar.gz"
+ARCHIVE_TYPE="tar.gz"
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+echo "
+Extracting the source from the ${PRGNAM} archive ..."
+tar -xf ${SOURCE}
+
+cd ${PRGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+# set file permissions
+source $SRCDIR/patches && setperms
+# Install PHP bindings to proper location.
+source $SRCDIR/patches && phpbindings
+# Fix for php-5.4 and patches from Arch (thanks!)
+source $SRCDIR/patches && patches
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --enable-ocaml=no
+
+make $NUMJOBS || exit 1
+make install-strip DESTDIR=$PKG || exit 1
+
+## The primary purpose of this build is for 'dot' for kscope.
+## If you want the pdf and html documentation, then comment out this line:
+source $SRCDIR/patches && rmdoc
+# Install config file for PHP.
+source $SRCDIR/patches && graphvizini
+# gzip man pages
+source $SRCDIR/patches && gzipman
+# Remove empty directories of language bindings that are absent.
+source $SRCDIR/patches && emptydirs
+# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz ...
+source $SRCDIR/patches && dummy
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cat $SRCDIR/$(basename $0) > $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 | 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/install
+SlackDesc
+source $SRCDIR/patches && doinstsh
+
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}
diff --git a/Misc/graphviz/patches b/Misc/graphviz/patches
new file mode 100644
index 0000000..35c1d83
--- /dev/null
+++ b/Misc/graphviz/patches
@@ -0,0 +1,125 @@
+setperms() {
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+}
+
+
+phpbindings() {
+sed -i 's|/php/modules|/php/extensions|' configure
+}
+
+
+patches() {
+echo $'--- lib/cgraph/scan.l
++++ lib/cgraph/scan.l
+@@ -152,1 +152,1 @@
+-	agerr(AGWARN,agxbuse(&xb));
++	agerr(AGWARN, "%s", agxbuse(&xb));
+@@ -228,1 +228,1 @@
+-	agerr(AGERR,agxbuse(&xb));
++	agerr(AGERR, "%s", agxbuse(&xb));
+--- plugin/gs/gvloadimage_gs.c
++++ plugin/gs/gvloadimage_gs.c
+@@ -72,11 +72,11 @@
+ 
+     assert (err < 0);
+ 
+-    if (err >= e_VMerror) 
++    if (err >= gs_error_VMerror)
+ 	errsrc = "PostScript Level 1"; 
+-    else if (err >= e_unregistered)
++    else if (err >= gs_error_unregistered)
+ 	errsrc = "PostScript Level 2";
+-    else if (err >= e_invalidid)
++    else if (err >= gs_error_invalidid)
+ 	errsrc = "DPS error";
+     else
+ 	errsrc = "Ghostscript internal error";
+--- tclpkg/gv/gv_php_init.c
++++ tclpkg/gv/gv_php_init.c
+@@ -27,0 +28 @@
++    TSRMLS_FETCH();
+@@ -32,0 +34 @@
++    TSRMLS_FETCH();
+' | while read line
+do
+patch -p0
+done
+}
+
+
+rmdoc() {
+rm -rf $PKG/usr/share/$PRGNAM/doc
+}
+
+
+graphvizini() {
+mkdir -p $PKG/etc/php.d
+cat << EOF > $PKG/etc/php.d/graphviz.ini.new
+; Enable graphviz extension module
+; extension=gv.so
+
+; Graphviz' own documentation mentions a "gv.php" file that should
+; be included. This file is however not necessary, it is just a
+; wrapper class around functions that are already available after
+; loading the extension, just leave out the "gv::" prefix.
+; In case you still prefer to use the wrapper class you have to
+; include it using its absolute path:
+; <?php
+; include ('/usr/lib$LIBDIRSUFFIX/graphviz/php/gv.php');
+; ?>
+EOF
+}
+
+
+gzipman() {
+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
+}
+
+
+emptydirs() {
+find $PKG/usr/lib${LIBDIRSUFFIX}/graphviz -depth -type d -empty -exec rmdir {} \;
+}
+
+
+# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz so that it
+# will be removed when the package is uninstalled.  This file is generated by
+# the postinstall script and contains information about available plugins, so
+# this is (or at least should be) safe.
+#
+# Write some dummy content to it to avoid
+# "Error: /usr/lib64/graphviz/config6 is zero sized, or other read error."
+# message during installation.
+dummy() {
+echo '# Dummy content.' > $PKG/usr/lib${LIBDIRSUFFIX}/graphviz/config6
+}
+
+
+doinstsh() {
+cat << EOF > $PKG/install/doinst.sh
+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/php.d/graphviz.ini.new
+
+# Configure plugins
+# (writes /usr/lib*/graphviz/config6 with available plugin information)
+chroot . /usr/bin/dot -c
+EOF
+}
+
+
diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild
new file mode 100755
index 0000000..f55074c
--- /dev/null
+++ b/Misc/moodbar/moodbar.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/sh
+# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, Netherlands
+# Copyright 2015-2016  Thorn inurcide
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=moodbar
+VERSION=${VERSION:-0.1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-}
+
+SRCURL="http://pkgs.fedoraproject.org/repo/pkgs/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz/28c8eb65e83b30f71b84be4fab949360/${PRGNAM}-${VERSION}.tar.gz"
+source ../../get-source.sh
+
+cd $TMP/tmp-$PRGNAM
+tar -xf ${SOURCE}
+
+# list only files > zero bytes
+DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true
+
+cd ${PRGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
+
+LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+
+make $NUMJOBS || exit 1
+make DESTDIR=$PKG install || exit 1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cat $SRCDIR/$(basename $0) > $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 {} \;
+
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+SlackDesc()
+{
+echo "
+# 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 ':'.
+
+$PRGNAM|-----handy-ruler------------------------------------------------------|
+$PRGNAM: $PRGNAM (For inclusion in the Amarok music player)
+$PRGNAM: 
+$PRGNAM: The Moodbar is an algorithm for creating a colorful visual
+$PRGNAM: representation of the contents of an audio file, giving an idea of its
+$PRGNAM: mood (this is a rather fanciful term for the simple analysis it
+$PRGNAM: actually does).
+$PRGNAM: 
+$PRGNAM: This package contains a GStreamer plugin with elements that are used
+$PRGNAM: in the moodbar analysis, and an application that actually does the analysis.
+$PRGNAM: 
+$PRGNAM:      
+
+" > $PKG/install/slack-desc
+}
+
+mkdir -p $PKG/install
+SlackDesc
+
+cd $PKG
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+
+# Restore the original umask:
+umask ${_UMASK_}