5 files changed, 72 insertions, 24 deletions
diff --git a/system/sboui/README b/system/sboui/README
index c0b18491ea..dafb1bdd8f 100644
--- a/system/sboui/README
+++ b/system/sboui/README
@@ -1,9 +1,25 @@
-sboui is an ncurses-based user interface for sbopkg, sbotools, and similar tools
-to manage packages built from SlackBuilds.org scripts. Unlike other Slackware
-system administration tools with dialog-based user interfaces, sboui is written
-in C++ utilizing low-level ncurses library calls. It features a two-pane listing
-of software groups and names, multiple filters, searching, forward and inverse
-dependency resolution, tagging multiple packages to apply batch changes,
-configurable colors, and more. In addition to supporting the well-known SBo
-package managers, it also includes a built-in package manager, and it is easy to
-make it work with custom tools.
+sboui is a package management tool for SlackBuilds.org (SBo). It features an
+ncurses user interface that combines the user-friendliness typically found in a
+GUI with the efficiency, light weight, and portability of a text interface. It
+can function as a stand-alone package manager or serve as a front-end to sbopkg,
+sbotools, or custom package managers. Its main features include forward and
+inverse dependency resolution, blacklisting, storing build options for scripts,
+a menu bar, full mouse and keyboard support, and more.
+
+Build options:
+
+INSTALL_SYSTRAY_NOTIFIER=yes|no (default no): install a cronjob to sync the
+  local repository hourly and display a system tray notification when SBo
+  package updates are available. To use the system tray notifier, add
+  sboui-update-notifier as a startup application for your desktop environment or
+  window manager.
+
+GRAPHICAL_SU=kdesu|gksu|ktsuss (default kdesu): change the graphical su command
+  for launching sboui from the .desktop file and system tray notifier. gksu or
+  ktsuss becomes a dependency if selected here.
+
+TERMINAL_EMULATOR=(user choice; default xterm) set the terminal emulator to run
+  sboui via the .desktop file and system tray notifier.
+
+USE_NINJA=yes|no (default no): use ninja instead of GNU Make for the build. If
+  enabled, ninja becomes a dependency.
diff --git a/system/sboui/doinst.sh b/system/sboui/doinst.sh
index 338272d717..68000a3b0b 100644
--- a/system/sboui/doinst.sh
+++ b/system/sboui/doinst.sh
@@ -13,3 +13,13 @@ config() {
 config etc/sboui/sboui.conf.new
 config etc/sboui/sboui-backend.conf.new
 config etc/sboui/package_blacklist.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/sboui/sboui.SlackBuild b/system/sboui/sboui.SlackBuild
index 7651d38bf9..b1903adfdd 100644
--- a/system/sboui/sboui.SlackBuild
+++ b/system/sboui/sboui.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sboui
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,15 +69,37 @@ 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 {} \;
 
+# Build options
+USE_NINJA="${USE_NINJA:-no}"
+GRAPHICAL_SU="${GRAPHICAL_SU:-kdesu}"
+TERMINAL_EMULATOR="${TERMINAL_EMULATOR:-xterm}"
+INSTALL_SYSTRAY_NOTIFIER="${INSTALL_SYSTRAY_NOTIFIER:-no}"
+if [ "$USE_NINJA" == "yes" ]; then
+  GENERATOR="Ninja"
+  BUILDCMD="ninja"
+else
+  GENERATOR="Unix Makefiles"
+  BUILDCMD="make"
+fi
+if [ "$INSTALL_SYSTRAY_NOTIFIER" == "yes" ]; then
+  NOTIFIER="ON"
+else
+  NOTIFIER="OFF"
+fi
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_BUILD_TYPE:STRING="Release" \
+    -DGRAPHICAL_SU:STRING="$GRAPHICAL_SU" \
+    -DTERMINAL_EMULATOR:STRING="$TERMINAL_EMULATOR" \
+    -DINSTALL_SYSTRAY_NOTIFIER:BOOL="$NOTIFIER" \
+    -G "$GENERATOR" ..
+  $BUILDCMD
+  DESTDIR=$PKG $BUILDCMD install
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/sboui/sboui.info b/system/sboui/sboui.info
index 1e2d7b1dab..1fc1d7cf8b 100644
--- a/system/sboui/sboui.info
+++ b/system/sboui/sboui.info
@@ -1,8 +1,8 @@
 PRGNAM="sboui"
-VERSION="1.1"
+VERSION="2.0"
 HOMEPAGE="https://github.com/montagdude/sboui"
-DOWNLOAD="https://github.com/montagdude/sboui/archive/1.1/sboui-1.1.tar.gz"
-MD5SUM="4ee722aacd76e571b8aa8e6618bf860f"
+DOWNLOAD="https://github.com/montagdude/sboui/archive/2.0/sboui-2.0.tar.gz"
+MD5SUM="389b1e02f840863db6b82ec1250c4c1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"
diff --git a/system/sboui/slack-desc b/system/sboui/slack-desc
index c39a8c4037..071d1aa91d 100644
--- a/system/sboui/slack-desc
+++ b/system/sboui/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-sboui: sboui (ncurses-based user interface for SBo package managers)
+sboui: sboui (ncurses SBo package management tool)
 sboui:
-sboui: sboui is an ncurses-based user interface for sbopkg, sbotools, and
-sboui: similar tools to manage packages built from SlackBuilds.org scripts.
-sboui: It features a two-pane listing of groups and names, multiple filters,
-sboui: searching, dependency resolution, tagging, configurable colors, and
-sboui: more.
+sboui: sboui is a package management tool for SlackBuilds.org (SBo). It
+sboui: features an ncurses user interface that combines the user-friendliness
+sboui: typically found in a GUI with the efficiency, light weight, and
+sboui: portability of a text interface. It can function as a stand-alone
+sboui: package manager or serve as a front-end to sbopkg, sbotools, or
+sboui: custom package managers.
 sboui:
 sboui: homepage: https://github.com/montagdude/sboui
 sboui:
-sboui: