1 files changed, 20 insertions, 18 deletions
diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
index 834523bf2..1255dce6e 100755
--- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
+++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,30 +20,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dejavu-fonts-ttf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ARCH=noarch
-BUILD=1
+BUILD=${BUILD:-3}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-dejavu-fonts-ttf
 
-# I suppose we'll be nice and try to fetch this if
-# you know the version you want.
-if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
-  if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 ]; then
-    if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.xz ]; then
-      lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
-    fi
-  fi
-fi
-if [ -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
-  gzip -d $CWD/dejavu-fonts-ttf-$VERSION.tar.gz
-  xz -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -61,6 +55,14 @@ find . \
 mkdir -p $PKG/usr/share/fonts/TTF/
 cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF/
 
+# Rename the 57-* config files to 61-* config files, so that the font choices
+# do not override the preferred list in 600-latin.conf:
+( cd fontconfig
+  for file in 57-* ; do
+    mv $file 61-$(echo $file | cut -f 2- -d -)
+  done
+)
+# Install config files:
 mkdir -p $PKG/etc/fonts/conf.avail
 mkdir -p $PKG/etc/fonts/conf.d
 ( cd fontconfig