Sat Nov 2 18:52:12 UTC 201920191102185212

a/aaa_terminfo-6.1_20191026-x86_64-1.txz:  Upgraded.
a/cryptsetup-2.2.2-x86_64-1.txz:  Upgraded.
a/lvm2-2.03.06-x86_64-1.txz:  Upgraded.
d/Cython-0.29.14-x86_64-1.txz:  Upgraded.
l/ncurses-6.1_20191026-x86_64-1.txz:  Upgraded.
  Restore the --without-normal option to skip static libraries as used in 14.2.
  Thanks to Richard Narron.
x/xterm-349-x86_64-2.txz:  Rebuilt.
  In /etc/app-defaults/XTerm, use terminus-medium instead of terminus-bold.
  Thanks to igadoter.

6 files changed, 15 insertions, 27 deletions

diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild
index 383cc220..60f1eaf9 100755
--- a/source/a/cryptsetup/cryptsetup.SlackBuild
+++ b/source/a/cryptsetup/cryptsetup.SlackBuild
@@ -56,6 +56,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -100,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/cryptsetup-$VERSION \
   --build=$ARCH-slackware-linux || exit 1
 
-make || exit 1
+make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # __DISABLED__
diff --git a/source/a/lvm2/lvm.url b/source/a/lvm2/lvm.url
index 23553ce1..a27b093e 100644
--- a/source/a/lvm2/lvm.url
+++ b/source/a/lvm2/lvm.url
@@ -1 +1 @@
-ftp://sources.redhat.com/pub/lvm2/
+ftp://sourceware.org/pub/lvm2/
diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild
index 7c6542a3..8f561baa 100755
--- a/source/l/ncurses/ncurses.SlackBuild
+++ b/source/l/ncurses/ncurses.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2000-2011, 2013, 2014, 2015, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2000-2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -81,7 +81,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-gpm \
   --with-shared \
   --without-debug \
-  --disable-static \
+  --without-normal \
   --without-profile \
   --enable-symlinks \
   --enable-pc-files \
@@ -152,20 +152,6 @@ cp -a misc/termcap $PKG/etc/termcap
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# Remove static libraries:
-for file in libform.a libformw.a libmenu.a libmenuw.a libncurses++.a \
-  libncurses++w.a libncurses.a libncursesw.a libpanel.a libpanelw.a \
-  libtic.a libtinfo.a libcurses.a ; do
-  rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$file
-done
-
-# Check for new static residue:
-if ls $PKG/usr/lib${LIBDIRSUFFIX}/*.a 1> /dev/null 2> /dev/null ; then
-  echo "BAILING OUT.  A NEW STATIC LIBRARY HAS APPEARED:"
-  ls -l $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-  exit 1
-fi
-
 # Move the include files from /usr/include into /usr/include/ncurses,
 # then make symlinks back into /usr/include.
 ( cd $PKG/usr/include
diff --git a/source/l/ncurses/terminfo/xterm.terminfo.README b/source/l/ncurses/terminfo/xterm.terminfo.README
index 28cd13d6..398d9b26 100644
--- a/source/l/ncurses/terminfo/xterm.terminfo.README
+++ b/source/l/ncurses/terminfo/xterm.terminfo.README
@@ -1,4 +1,4 @@
-This is  based on the xterm terminfo definition file from xterm-331, but the
+This is based on the xterm terminfo definition file from xterm-331, but the
 xterm definition has been changed to remove use=ansi+rep which was causing
 problems with terminals that set themselves to xterm but aren't compatible
 with use=ansi+rep (including Konsole and the console app in OSX).
diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad
index 8b1eddad..bd0095f6 100644
--- a/source/x/xterm/linux-console-xterm.ad
+++ b/source/x/xterm/linux-console-xterm.ad
@@ -29,13 +29,13 @@ XTerm.vt100.bellIsUrgent: true
 XTerm.vt100.renderFont: false
 !   Use bitmap fonts by default.User can switch to ttyfonts from menu,
 !   if required. 
-XTerm.vt100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font1: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1
-XTerm.vt100.font2: -*-terminus-bold-r-normal-*-14-*-*-*-*-*-iso10646-1
-XTerm.vt100.font3: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1
-XTerm.vt100.font4: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font5: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1
-XTerm.vt100.font6: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1
+XTerm.vt100.font: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
+XTerm.vt100.font1: -*-terminus-medium-r-normal-*-12-*-*-*-*-*-iso10646-1
+XTerm.vt100.font2: -*-terminus-medium-r-normal-*-14-*-*-*-*-*-iso10646-1
+XTerm.vt100.font3: -*-terminus-medium-r-normal-*-16-*-*-*-*-*-iso10646-1
+XTerm.vt100.font4: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
+XTerm.vt100.font5: -*-terminus-medium-r-normal-*-24-*-*-*-*-*-iso10646-1
+XTerm.vt100.font6: -*-terminus-medium-r-normal-*-32-*-*-*-*-*-iso10646-1
 
 XTerm.vt100.faceName: monospace
 XTerm.vt100.faceSize: 14.0
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 53ec177a..7f650992 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xterm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}