7 files changed, 15 insertions, 20 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index c92be7f4..d37ca076 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-33}
+BUILD=${BUILD:-34}
 
 # 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
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index f19cf59c..ddd8e693 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -677,9 +677,9 @@ EOF
       # rather than spawning subshells which is slow on ARM.  This will also speed up
       # install script processing on any platform.
       if [ -x /bin/bash ]; then
-        cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash
+        ( cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash )
       else
-        cd $ROOT/ ; sh $INSTDIR/doinst.sh
+        ( cd $ROOT/ ; sh $INSTDIR/doinst.sh )
       fi
     else # use locking
       # If bash is available, use sed to convert the install script to use pushd/popd
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
index 5a1c7dcd..ec9b4299 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -411,7 +411,7 @@ remove_packages() {
     fi
     # If there is an uninstall script, run it here:
     if [ -r $TMP/$PKGNAME ]; then
-     cd $ROOT/ ; sh $TMP/$PKGNAME
+     ( cd $ROOT/ ; sh $TMP/$PKGNAME )
      # Move the uninstall script to $LOG_DIR/removed_uninstall_scripts:
      mv $TMP/$PKGNAME $LOG_DIR/removed_uninstall_scripts
     fi
diff --git a/source/l/openjpeg/openjpeg.SlackBuild b/source/l/openjpeg/openjpeg.SlackBuild
index e6e69350..a33c632b 100755
--- a/source/l/openjpeg/openjpeg.SlackBuild
+++ b/source/l/openjpeg/openjpeg.SlackBuild
@@ -100,6 +100,7 @@ cd build
     -DBUILD_MJ2:BOOL=ON \
     -DBUILD_JPIP:BOOL=ON \
     -DBUILD_JP3D:BOOL=ON \
+    -DBUILD_STATIC_LIBS=OFF \
     .. || exit 1
 
   make $NUMJOBS || make || exit 1
diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild
index 73bab50b..c3c19bc5 100755
--- a/source/xap/hexchat/hexchat.SlackBuild
+++ b/source/xap/hexchat/hexchat.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hexchat
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -94,7 +94,7 @@ meson setup \
   -Dwith-text=true \
   -Dwith-ssl=true \
   -Dwith-lua=false \
-  -Dwith-python=python3 \
+  -Dwith-python=python3-embed \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
diff --git a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
index 7ad0bf49..47ac305c 100755
--- a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
+++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-panel-profiles
 VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,13 +80,14 @@ find . \
 # Configure, build, and install:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr --python=python3 || exit 1
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --python=python3 || exit 1
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Relocate man pages:
-mv $PKG/usr/share/man $PKG/usr
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
@@ -105,13 +106,6 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-rm -rf $PKG/usr/share/doc
-mkdir -p $PKG/usr/doc/xfce4-panel-profiles-$VERSION
-cp -a \
-  AUTHORS COPYING* NEWS README* TODO \
-  $PKG/usr/doc/xfce4-panel-profiles-$VERSION
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
 if [ -r ChangeLog ]; then
   DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
   cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
index e63d0b6a..50a0e111 100755
--- a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
+++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-taskmanager
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in