5 files changed, 9 insertions, 10 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index d905da669..a06357512 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=util-linux
 VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3  | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 ADJTIMEXVERS=1.29
 SETSERIALVERS=2.17
@@ -150,7 +150,7 @@ configure_with_python(){
   --enable-mesg \
   --enable-partx \
   --enable-pg \
-  --enable-raw \
+  --disable-raw \
   --enable-rename \
   $LOGIN_OPTIONS \
   --enable-schedutils \
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index f86924ff6..3f04afb5a 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glib2
 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/glib2/libglib2.csh b/source/l/glib2/libglib2.csh
index a1b675615..c598e193a 100644
--- a/source/l/glib2/libglib2.csh
+++ b/source/l/glib2/libglib2.csh
@@ -14,9 +14,8 @@
 #       If this environment variable is set, GLib assumes that filenames are
 #       in the locale encoding rather than in UTF-8.
 
-# If the LANG you have set contains any form of "UTF", we will guess you are
-# using a UTF-8 locale.  Hopefully we're correct.
-echo $LANG | grep -iq UTF
+# Determine if the locale is UTF-8:
+locale charmap 2> /dev/null | grep -q UTF-8
 if ($status == 0) then
   setenv G_FILENAME_ENCODING "@locale"
 endif
diff --git a/source/l/glib2/libglib2.sh b/source/l/glib2/libglib2.sh
index 9b9fdc69f..449a752cc 100644
--- a/source/l/glib2/libglib2.sh
+++ b/source/l/glib2/libglib2.sh
@@ -14,9 +14,8 @@
 #       If this environment variable is set, GLib assumes that filenames are
 #       in the locale encoding rather than in UTF-8.
 
-# If the LANG you have set contains any form of "UTF", we will guess you are
-# using a UTF-8 locale.  Hopefully we're correct.
-if echo $LANG | grep -iq UTF ; then
+# Determine if the locale is UTF-8:
+if locale charmap 2> /dev/null | grep -q UTF-8 ; then
   export G_FILENAME_ENCODING="@locale"
 fi
 
diff --git a/source/l/tidy-html5/tidy-html5.SlackBuild b/source/l/tidy-html5/tidy-html5.SlackBuild
index 70402eaad..81f0d1856 100755
--- a/source/l/tidy-html5/tidy-html5.SlackBuild
+++ b/source/l/tidy-html5/tidy-html5.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tidy-html5
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -96,6 +96,7 @@ cd cmake-build
     -DDOC_INSTALL_DIR="doc" \
     -DMAN_INSTALL_DIR=/usr/man \
     -DTIDY_CONSOLE_SHARED=ON \
+    -DMAN_INSTALL_DIR=/usr/man/man1 \
     .. || exit 1
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1