libraries/libconfig: Updated for version 1.7.3, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 48 insertions, 50 deletions

diff --git a/libraries/libconfig/README b/libraries/libconfig/README
index cad1772a5e005..dec6ebf5a193a 100644
--- a/libraries/libconfig/README
+++ b/libraries/libconfig/README
@@ -1,3 +1,5 @@
+libconfig (library for processing structured configuration files)
+
 Libconfig is a simple library for processing structured configuration
 files. This file format is more compact and more readable than XML and
 unlike XML, it is type-aware, so it is not necessary to do string
@@ -10,12 +12,7 @@ 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 library documentation (html and pdf) pass DOC=yes to
-the slackbuild as
+To install the library documentation (HTML and PDF) pass DOC=yes to
+the SlackBuild in the environment, e.g.:
 
    DOC=yes ./libconfig.SlackBuild
-
-To install the example programs and configuration files pass
-EXAMPLES=yes to the slackbuild as
-
-   EXAMPLES=yes ./libconfig.SlackBuild
diff --git a/libraries/libconfig/doinst.sh b/libraries/libconfig/doinst.sh
new file mode 100644
index 0000000000000..1bef5020286ea
--- /dev/null
+++ b/libraries/libconfig/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/libraries/libconfig/libconfig.SlackBuild b/libraries/libconfig/libconfig.SlackBuild
index b0d52872d86a9..4cb4e949629d1 100644
--- a/libraries/libconfig/libconfig.SlackBuild
+++ b/libraries/libconfig/libconfig.SlackBuild
@@ -2,8 +2,9 @@
 
 # Slackware build script for libconfig
 
-# Copyright 2017 Manuel Argüelles <manuel.arguelles@gmail.com>
-# Copyright 2017-2018 Jason Graham <jgraha8@gmail.com>
+# Copyright 2017 Manuel Argüelles <email removed>
+# Copyright 2017-2018 Jason Graham <email removed>
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +24,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20231127 bkw:
+# - update for v1.7.3.
+# - take over maintenance.
+# - add doinst.sh and douninst.sh for GNU info file.
+# - remove the EXAMPLE option; the examples are tiny, always include them.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libconfig
-VERSION=${VERSION:-1.7.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +46,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -65,9 +69,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOC=${DOC:-no}
-EXAMPLES=${EXAMPLES:-no}
-
 set -e
 
 rm -rf $PKG
@@ -77,11 +78,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 autoreconf -if
 
@@ -100,34 +98,31 @@ CXXFLAGS="$SLKCFLAGS" \
   --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
+make install-strip DESTDIR=$PKG
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING.LIB INSTALL ChangeLog LICENSE README TODO  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-if [ "${DOC}" = "yes" ]; then
-    make html pdf
-    cp -a doc/libconfig.{html,pdf} $PKG/usr/doc/$PRGNAM-$VERSION/
-fi
-
-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++/
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/examples/{c,c++}
+cp -a AUTHORS COPYING.LIB ChangeLog LICENSE README TODO $PKGDOC
+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++/
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+INCLUDES="does NOT include"
+if [ "${DOC:-no}" = "yes" ]; then
+  make html pdf
+  cp -a doc/libconfig.{html,pdf} $PKGDOC
+  INCLUDES="includes"
 fi
 
 rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@INCLUDES@,$INCLUDES," < $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/libconfig/libconfig.info b/libraries/libconfig/libconfig.info
index 0d6fc59ed0a58..bff7993ee52a9 100644
--- a/libraries/libconfig/libconfig.info
+++ b/libraries/libconfig/libconfig.info
@@ -1,10 +1,10 @@
 PRGNAM="libconfig"
-VERSION="1.7.2"
+VERSION="1.7.3"
 HOMEPAGE="https://github.com/hyperrealm/libconfig"
-DOWNLOAD="https://github.com/hyperrealm/libconfig/archive/v1.7.2/libconfig-1.7.2.tar.gz"
-MD5SUM="d666f0ca093906d34d6e1e4890053e62"
+DOWNLOAD="https://github.com/hyperrealm/libconfig/archive/v1.7.3/libconfig-1.7.3.tar.gz"
+MD5SUM="898fbd4ccac2eb3913a86883ab9b2e6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/libraries/libconfig/remove_scanner.patch.gz b/libraries/libconfig/remove_scanner.patch.gz
deleted file mode 100644
index bceebc69b5b78..0000000000000
--- a/libraries/libconfig/remove_scanner.patch.gz
+++ /dev/null
diff --git a/libraries/libconfig/slack-desc b/libraries/libconfig/slack-desc
index 21eeb02885812..6b2bf1aaf5629 100644
--- a/libraries/libconfig/slack-desc
+++ b/libraries/libconfig/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-libconfig: libconfig (Library for processing structured configuration files)
+libconfig: libconfig (library for processing structured configuration files)
 libconfig:
 libconfig: Libconfig is a simple library for processing structured configuration
 libconfig: files. This file format is more compact and more readable than XML
 libconfig: and unlike XML, it is type-aware, so it is not necessary to do string
 libconfig: parsing in application code. It is very compact and well-suited for
-libconfig: memory-constrained systems like handheld devices.
-libconfig:
-libconfig: The library includes bindings for both the C and C++ languages.
+libconfig: memory-constrained systems like handheld devices. Includes bindings
+libconfig: for both C and C++.
 libconfig:
+libconfig: This package @INCLUDES@ the API documentation.
 libconfig: