1 files changed, 18 insertions, 7 deletions
diff --git a/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
index 1a07f47c67..cb6d8b8d4c 100644
--- a/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
+++ b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for WenQuanYi Micro Hei
 
@@ -27,17 +27,28 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 
+# 20220218 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - stop all fontconfig-using apps from spewing warnings about bad
+#   syntax in 65-wqy-microhei.conf.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wqy-microhei-font-ttf
 VERSION=${VERSION:-0.2.0_beta}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
 SRCNAM=wqy-microhei
 SRCVERSION=$(echo $VERSION | tr _ -)
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,16 +65,16 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS.txt  ChangeLog.txt  INSTALL.txt  LICENSE_Apache2.txt  LICENSE_GPLv3.txt  README.txt \
+  AUTHORS.txt ChangeLog.txt LICENSE_Apache2.txt LICENSE_GPLv3.txt README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -76,5 +87,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE