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, 29 insertions, 16 deletions

diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild
index cbf9241f..2062a08a 100755
--- a/source/n/metamail/metamail.SlackBuild
+++ b/source/n/metamail/metamail.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2009, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,23 +21,34 @@
 
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=metamail
 VERSION=2.7
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
+# 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-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -56,7 +67,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-metamail
 
@@ -64,8 +74,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf metamail-$VERSION
-xz -dc $CWD/metamail-$VERSION.tar.xz | tar xvf - || exit 1
-cd metamail-$VERSION
+tar xvf $CWD/metamail-$VERSION.tar.xz || exit 1
+cd metamail-$VERSION || exit 1
 
 xz -dc $CWD/metamail_2.7-54.diff.xz | patch -p1 || exit 1
 xz -dc $CWD/metamail.automake.diff.xz | patch -p1 || exit 1
@@ -87,7 +97,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --program-prefix="" \
   --program-suffix="" \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 ( cd bin
   cat showexternal | perl -pi -e 's|sensible-pager|more|' > se
@@ -109,15 +119,18 @@ make $NUMJOBS || make || exit 1
 
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 ( cd fonts
-  make
+  make || exit 1
   mkdir -p $PKG/usr/share/metamail/fonts
   for file in *.pcf ; do
     cat $file > $PKG/usr/share/metamail/fonts/$file
   done
   cat fonts.alias > $PKG/usr/share/metamail/fonts/fonts.alias
   cat fonts.dir > $PKG/usr/share/metamail/fonts/fonts.dir
-)
+) || exit 1
 
 ( cd man
   mkdir -p $PKG/usr/man/man{1,5}
diff --git a/source/n/metamail/slack-desc b/source/n/metamail/slack-desc
index 65cdef8b..58d15739 100644
--- a/source/n/metamail/slack-desc
+++ b/source/n/metamail/slack-desc
@@ -1,8 +1,8 @@
 # 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
+# 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 leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
@@ -10,7 +10,7 @@ metamail: metamail (MIME extensions for mail)
 metamail:
 metamail: Metamail is an implementation of MIME, the Multipurpose Internet
 metamail: Mail Extensions, a proposed standard for multimedia mail on the
-metamail: Internet.  Metamail implements MIME, and also implements extensibility
+metamail: Internet. Metamail implements MIME, and also implements extensibility
 metamail: and configuration via the "mailcap" mechanism described in an
 metamail: informational RFC that is a companion to the MIME document.
 metamail: