From ede8ce81ea264ba9fc0271cbb6b25961290b80ee Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 31 Oct 2020 16:32:36 +0100
Subject: 20201031.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/libkqueue/libkqueue.SlackBuild | 28 +++++++++++++++++-----------
 libraries/libkqueue/libkqueue.info       |  6 +++---
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'libraries/libkqueue')

diff --git a/libraries/libkqueue/libkqueue.SlackBuild b/libraries/libkqueue/libkqueue.SlackBuild
index a989d26944..c5eb815798 100644
--- a/libraries/libkqueue/libkqueue.SlackBuild
+++ b/libraries/libkqueue/libkqueue.SlackBuild
@@ -25,7 +25,7 @@
 # Modified by the slackbuilds.org project.
 
 PRGNAM=libkqueue
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,22 +75,28 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-  ./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
-make -j1
-make install DESTDIR=$PKG
+# MAN_INSTALL_DIR is actually ignored ATM
+mv $PKG/usr/share/man $PKG/usr/man
+rm -fR $PKG/usr/share
 
 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 LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS ChangeLog LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/libraries/libkqueue/libkqueue.info b/libraries/libkqueue/libkqueue.info
index 6cd089bc9f..b446f003bf 100644
--- a/libraries/libkqueue/libkqueue.info
+++ b/libraries/libkqueue/libkqueue.info
@@ -1,8 +1,8 @@
 PRGNAM="libkqueue"
-VERSION="2.0.1"
+VERSION="2.3.1"
 HOMEPAGE="https://github.com/mheily/libkqueue"
-DOWNLOAD="http://sourceforge.net/projects/libkqueue/files/libkqueue-2.0/libkqueue-2.0.1.tar.gz"
-MD5SUM="3d939aa5fa83a870aee71f2181b22994"
+DOWNLOAD="https://github.com/mheily/libkqueue/archive/v2.3.1/libkqueue-2.3.1.tar.gz"
+MD5SUM="e64baefa000c5667f4a15ea93fe8356b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3