4 files changed, 28 insertions, 10 deletions
diff --git a/libraries/libconfig/README b/libraries/libconfig/README
index 546a0789c0b03..950a1623f094a 100644
--- a/libraries/libconfig/README
+++ b/libraries/libconfig/README
@@ -9,3 +9,8 @@ handheld devices.
 The library includes bindings for both the C and C++ languages. It
 works on POSIX-compliant UNIX systems (GNU/Linux, Mac OS X, Solaris,
 FreeBSD) and Windows (2000, XP and later).
+
+To install the example programs and configuration files pass
+EXAMPLES=yes to the slackbuild as
+
+   EXAMPLES=yes ./libconfig.SlackBuild
diff --git a/libraries/libconfig/libconfig.SlackBuild b/libraries/libconfig/libconfig.SlackBuild
index 085dfb2eb3ce1..a271812947d26 100644
--- a/libraries/libconfig/libconfig.SlackBuild
+++ b/libraries/libconfig/libconfig.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for libconfig
 
-# Copyright 2016 Manuel Argüelles
+# Copyright 2017 Manuel Argüelles <manuel.arguelles@gmail.com>
+# Copyright 2017 Jason Graham <jgraha8@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libconfig
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,6 +55,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+EXAMPLES=${EXAMPLES:-no}
+
 set -e
 
 rm -rf $PKG
@@ -69,6 +72,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+zcat $CWD/remove_scanner.patch.gz | patch -p1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -82,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -92,9 +97,17 @@ rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL COPYING.LIB AUTHORS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  INSTALL COPYING.LIB AUTHORS README ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+if [ "${EXAMPLES}" = "yes" ]; then
+    mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples/{c,c++}
+    cp -a examples/c/*.{cfg,c} $PKG/usr/doc/$PRGNAM-$VERSION/examples/c/
+    cp -a examples/c++/*.{cfg,cpp} $PKG/usr/doc/$PRGNAM-$VERSION/examples/c++/
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/libraries/libconfig/libconfig.info b/libraries/libconfig/libconfig.info
index fedbcc924ad10..76d48ccea5088 100644
--- a/libraries/libconfig/libconfig.info
+++ b/libraries/libconfig/libconfig.info
@@ -1,10 +1,10 @@
 PRGNAM="libconfig"
-VERSION="1.5"
-HOMEPAGE="https://github.com/hyperrealm/libconfig/"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/libconfig/libconfig-1.5.tar.gz/a939c4990d74e6fc1ee62be05716f633/libconfig-1.5.tar.gz"
-MD5SUM="a939c4990d74e6fc1ee62be05716f633"
+VERSION="1.6"
+HOMEPAGE="https://github.com/hyperrealm/libconfig"
+DOWNLOAD="https://github.com/hyperrealm/libconfig/archive/v1.6/libconfig-1.6.tar.gz"
+MD5SUM="2ccd24b6a2ee39f7ff8a3badfafb6539"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Manuel Argüelles"
-EMAIL="manuel.arguelles@gmail.com"
+MAINTAINER="Jason Graham"
+EMAIL="jgraha8@gmail.com"
diff --git a/libraries/libconfig/remove_scanner.patch.gz b/libraries/libconfig/remove_scanner.patch.gz
new file mode 100644
index 0000000000000..bceebc69b5b78
--- /dev/null
+++ b/libraries/libconfig/remove_scanner.patch.gz