From ebe7858a9650f6b17b083965051f63d39f413483 Mon Sep 17 00:00:00 2001
From: Matteo Rossini <info@slakfinder.org>
Date: Thu, 3 Jan 2019 12:16:22 +0100
Subject: [PATCH] Works with the slackpkg 2.84 (still in beta) blacklist system
 (but not for search options)

---
 src/slackpkgplus.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 5c57040..053f8be 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -109,9 +109,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     fi
     if $MLREPO_SELELECTED && grep -q "^aaa_elflibs$" ${TMPDIR}/blacklist && ! grep -q "^aaa_elflibs-compat32$" ${TMPDIR}/blacklist ; then
       sed -i --expression "s/^aaa_elflibs/#aaa_elflibs/" ${TMPDIR}/blacklist
-      grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]" >${TMPDIR}/blacklist.tmp
+      grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus | grep -v "[ ]aaa_elflibs[ ]" >${TMPDIR}/blacklist.tmp
     else
-      grep -vEw -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp
+      grep -vE $LEGACYBLACKLIST -f ${TMPDIR}/blacklist -f ${TMPDIR}/blacklist.slackpkgplus >${TMPDIR}/blacklist.tmp
     fi
     if [ "$(head -1 ${TMPDIR}/blacklist.tmp|awk '{print $1}')" != "local" ];then
       cat ${TMPDIR}/pkglist-pre
@@ -1599,6 +1599,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     cleanup
   fi
 
+  if [ ${VERSION:0:4} == "2.84" ];then
+    LEGACYBLACKLIST=""
+  else
+    LEGACYBLACKLIST="-w"
+  fi
 
   SPKGPLUS_VERSION="1.7.0d1"
   VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"