Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

2 files changed, 27 insertions, 25 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
diff --git a/source/x/dejavu-fonts-ttf/slack-desc b/source/x/dejavu-fonts-ttf/slack-desc
index a9952b57e..dc9d6c1d5 100644
--- a/source/x/dejavu-fonts-ttf/slack-desc
+++ b/source/x/dejavu-fonts-ttf/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
 dejavu-fonts-ttf: dejavu-fonts-ttf (DejaVu fonts)
 dejavu-fonts-ttf:
-dejavu-fonts-ttf: The DejaVu fonts are a font family based on the Bitstream Vera Fonts
-dejavu-fonts-ttf: (http://gnome.org/fonts/).  Its purpose is to provide a wider range
-dejavu-fonts-ttf: of characters (see http://dejavu.sf.net for more information) while
+dejavu-fonts-ttf: The DejaVu fonts are a font family based on the Bitstream Vera Fonts.
+dejavu-fonts-ttf: Its purpose is to provide a wider range of characters while
 dejavu-fonts-ttf: maintaining the original look and feel.
 dejavu-fonts-ttf:
-dejavu-fonts-ttf: DejaVu fonts are based on Bitstream Vera fonts version 1.10.
+dejavu-fonts-ttf: Homepage: http://dejavu-fonts.github.io
+dejavu-fonts-ttf:
 dejavu-fonts-ttf:
 dejavu-fonts-ttf:
 dejavu-fonts-ttf: