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.

6 files changed, 185 insertions, 154 deletions

diff --git a/source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch b/source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch
new file mode 100644
index 000000000..47c2001a6
--- /dev/null
+++ b/source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch
@@ -0,0 +1,128 @@
+diff -up a2ps-4.14/doc/regex.texi_old a2ps-4.14/doc/regex.texi
+--- a2ps-4.14/doc/regex.texi_old	2002-03-04 19:46:24.000000000 +0100
++++ a2ps-4.14/doc/regex.texi	2008-05-16 11:34:42.000000000 +0200
+@@ -121,7 +121,7 @@ Regular Expression Syntax
+ 
+ * Syntax Bits::
+ * Predefined Syntaxes::
+-* Collating Elements vs. Characters::
++* Collating Elements vs Characters::
+ * The Backslash Character::
+ 
+ Common Operators
+@@ -305,7 +305,7 @@ In the following sections, we describe t
+ @menu
+ * Syntax Bits::
+ * Predefined Syntaxes::
+-* Collating Elements vs. Characters::
++* Collating Elements vs Characters::
+ * The Backslash Character::
+ @end menu
+ 
+@@ -470,7 +470,7 @@ operator (based on how @code{RE_NO_BK_PA
+ @end table
+ 
+ 
+-@node Predefined Syntaxes, Collating Elements vs. Characters, Syntax Bits, Regular Expression Syntax
++@node Predefined Syntaxes, Collating Elements vs Characters, Syntax Bits, Regular Expression Syntax
+ @section Predefined Syntaxes
+ 
+ If you're programming with Regex, you can set a pattern buffer's
+@@ -552,8 +552,8 @@ The predefined syntaxes--taken directly 
+    | RE_NO_BK_VBAR          | RE_UNMATCHED_RIGHT_PAREN_ORD)
+ @end example
+ 
+-@node Collating Elements vs. Characters, The Backslash Character, Predefined Syntaxes, Regular Expression Syntax
+-@section Collating Elements vs.@: Characters
++@node Collating Elements vs Characters, The Backslash Character, Predefined Syntaxes, Regular Expression Syntax
++@section Collating Elements vs@: Characters
+ 
+ @sc{posix} generalizes the notion of a character to that of a
+ collating element.  It defines a @dfn{collating element} to be ``a
+@@ -577,7 +577,7 @@ collating element.  For example, the Spa
+ Since @sc{posix}'s ``collating element'' preserves the essential idea of
+ a ``character,'' we use the latter, more familiar, term in this document.
+ 
+-@node The Backslash Character,  , Collating Elements vs. Characters, Regular Expression Syntax
++@node The Backslash Character,  , Collating Elements vs Characters, Regular Expression Syntax
+ @section The Backslash Character
+ 
+ @cindex @samp{\}
+diff -up a2ps-4.14/doc/a2ps.texi_old a2ps-4.14/doc/a2ps.texi
+--- a2ps-4.14/doc/a2ps.texi_old	2008-05-16 11:34:21.000000000 +0200
++++ a2ps-4.14/doc/a2ps.texi	2008-05-16 11:42:11.000000000 +0200
+@@ -371,11 +371,11 @@ Contributions
+ 
+ Frequently asked questions
+ 
+-* Why Does ...?::               Questions on Error
+-* How Can I ...?::              a2ps' How-To
+-* Please tell me...::           Existential Questions on a2ps
++* Why Does?::                   Questions on Error
++* How Can I?::                  a2ps' How-To
++* Please tell me::              Existential Questions on a2ps
+ 
+-Why Does...?
++Why Does?
+ 
+ * It Prints Nothing::           The printer issues nothing
+ * It Prints in Simplex::        While I asked for Duplex
+@@ -385,7 +385,7 @@ Why Does...?
+ * It Says my File is Binary::   And refuses to print it
+ * It Refuses to Change the Font Size::
+ 
+-How Can I ...?
++How Can I?
+ 
+ * Leave Room for Binding::      Specifying Margins
+ * Print stdin::                 Using a2ps in a pipe chain
+@@ -395,7 +395,7 @@ How Can I ...?
+ * Non PostScript Printers::     Using GhostScript
+ * Man Pages with Underlines::   Now it Prints With Italics
+ 
+-Please tell me...
++Please tell me
+ 
+ * Is a2ps Y2K compliant?::      Printing dates in short format
+ * The Options Have Changed::    Respect The Users
+@@ -6198,13 +6198,13 @@ question about the options, etc.  It has
+ suggestions, not to contact the authors.
+ 
+ @menu
+-* Why Does ...?::               Questions on Error
+-* How Can I ...?::              a2ps' How-To
+-* Please tell me...::           Existential Questions on a2ps
++* Why Does?::                   Questions on Error
++* How Can I?::                  a2ps' How-To
++* Please tell me::              Existential Questions on a2ps
+ @end menu
+ 
+-@node Why Does ...?
+-@section Why Does...?
++@node Why Does?
++@section Why Does?
+ 
+ Error related questions.
+ 
+@@ -6426,8 +6426,8 @@ Note that the `pure' options (no side-ef
+ virtual pages are @samp{--columns} and @samp{--rows}.
+ 
+ @c -----------------------------How can I ? ------------------------------
+-@node How Can I ...?
+-@section How Can I ...?
++@node How Can I?
++@section How Can I?
+ 
+ A mini how-to on @pack{}.
+ 
+@@ -6561,8 +6561,8 @@ Use @samp{a2ps --pro=ul}.
+ 
+ 
+ @c -------------------------- Please Tell me ? ------------------------------
+-@node Please tell me...
+-@section Please tell me...
++@node Please tell me
++@section Please tell me
+ 
+ Wondering something?
+ 
diff --git a/source/ap/a2ps/a2ps-texi-comments.patch b/source/ap/a2ps/a2ps-texi-comments.patch
new file mode 100644
index 000000000..8ccf6f540
--- /dev/null
+++ b/source/ap/a2ps/a2ps-texi-comments.patch
@@ -0,0 +1,17 @@
+--- a2ps-4.14/doc/a2ps.texi.texifail	2013-03-26 12:50:06.624762058 +0000
++++ a2ps-4.14/doc/a2ps.texi	2013-03-26 14:44:10.204929702 +0000
+@@ -22,12 +22,12 @@
+ @c `a2ps'.  Avoid those quotes.
+ @iftex
+ @macro pack
+-@code{@value{PACKAGE}}@c
++@code{@value{PACKAGE}}
+ @end macro
+ @end iftex
+ @ifnottex
+ @macro pack
+-@value{PACKAGE}@c
++@value{PACKAGE}
+ @end macro
+ @end ifnottex
+ 
diff --git a/source/ap/a2ps/a2ps.SlackBuild b/source/ap/a2ps/a2ps.SlackBuild
index 6df5f4d0d..e9dc3d578 100755
--- a/source/ap/a2ps/a2ps.SlackBuild
+++ b/source/ap/a2ps/a2ps.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,33 +20,40 @@
 #  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=a2ps
-PKGNAM2=psutils
-VERSION=${VERSION:-4.14}
-A2PS=${A2PS:-4.14}
-PSUTILS=${PSUTILS:-1.17}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+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
 
-CWD=$(pwd)
+# 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 "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-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,46 +63,15 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-# First, build and install psutils:
 cd $TMP
-tar xvf $CWD/$PKGNAM2-${PSUTILS}.tar.gz || exit 1
-cd $PKGNAM2
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
-zcat $CWD/psutils.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1
-zcat $CWD/psutils.destdir.diff.gz | patch -p1 --verbose -E --backup --suffix=.orig || exit 1
-
-# Build and install:
-make -f Makefile.unix || exit 1
-make -f Makefile.unix install DESTDIR=$PKG || exit 1
-
-# Add a documentation directory for psutils:
-mkdir -p $PKG/usr/doc/$PKGNAM2-$PSUTILS
-cp -a \
-  LICENSE README \
-  $PKG/usr/doc/$PKGNAM2-$PSUTILS
-
-# Build, install and delete temporary psutils package for a2ps
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
-echo "Installing temporary $PKGNAM2 package (this will be removed when the SlackBuild finishes)"
-/sbin/installpkg $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
-rm $TMP/$PKGNAM2-${PSUTILS}-$ARCH-$BUILD.txz || exit 1
-
-# Then, build a2ps:
-cd $TMP
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
-cd $PKGNAM-$A2PS
-
-zcat $CWD/a2ps.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+zcat $CWD/a2ps.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/a2ps-4.14-texinfo-nodes.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/a2ps-texi-comments.patch.gz | patch -p1 --verbose || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -116,15 +92,14 @@ lispdir="/usr/share/emacs/site-lisp" \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --with-medium=letter \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
-make || exit 1
+make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Remove temporary psutils package:
-echo "Removing temporary psutils package"
-/sbin/removepkg $PKGNAM2-${PSUTILS}-$ARCH-$BUILD || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -132,8 +107,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/a2ps-$VERSION
-cp -a ABOUT-NLS ANNOUNCE AUTHORS COPYING \
-  FAQ INSTALL NEWS README THANKS TODO \
+cp -a \
+  ANNOUNCE AUTHORS COPYING* FAQ NEWS README* THANKS TODO \
   $PKG/usr/doc/a2ps-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/ap/a2ps/psutils.destdir.diff b/source/ap/a2ps/psutils.destdir.diff
deleted file mode 100644
index f547b791e..000000000
--- a/source/ap/a2ps/psutils.destdir.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- psutils/Makefile.unix.old	1997-11-03 23:52:00.000000000 +0000
-+++ psutils/Makefile.unix	2008-09-10 08:31:00.000000000 +0000
-@@ -25,9 +25,9 @@
- 
- OS = UNIX
- 
--BINDIR = /usr/bin
-+BINDIR = ${DESTDIR}/usr/bin
- SCRIPTDIR = $(BINDIR)
--INCLUDEDIR = /usr/share/psutils
-+INCLUDEDIR = ${DESTDIR}/usr/share/psutils
- PERL = /usr/bin/perl
- 
- BINMODE = 0755
-@@ -36,7 +36,7 @@
- INSTALL = install -c -m $(BINMODE)
- INSTALLMAN = install -c -m $(MANMODE)
- MANEXT = 1
--MANDIR = /usr/man/man$(MANEXT)
-+MANDIR = ${DESTDIR}/usr/man/man$(MANEXT)
- 
- CC = gcc
- CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
-@@ -219,28 +219,28 @@
- install: install.bin install.script install.man install.include
- 
- install.bin: $(BIN)
--	-mkdir $(BINDIR)
-+	-mkdir -p $(BINDIR)
- 	@for i in $(BIN); do \
- 		echo Installing $$i; \
- 		$(INSTALL) $$i $(BINDIR); \
- 	done
- 
- install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
--	-mkdir $(SCRIPTDIR)
-+	-mkdir -p $(SCRIPTDIR)
- 	@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
- 		echo Installing $$i; \
- 		$(INSTALL) $$i $(SCRIPTDIR); \
- 	done
- 
- install.include: $(INCLUDES)
--	-mkdir $(INCLUDEDIR)
-+	-mkdir -p $(INCLUDEDIR)
- 	@for i in $(INCLUDES); do \
- 		echo Installing $$i; \
- 		$(INSTALLMAN) $$i $(INCLUDEDIR); \
- 	done
- 
- install.man: $(MANPAGES)
--	-mkdir $(MANDIR)
-+	-mkdir -p $(MANDIR)
- 	@for i in $(MANPAGES); do \
- 		echo Installing manual page for $$i; \
- 		$(INSTALLMAN) $$i $(MANDIR)/$$i; \
diff --git a/source/ap/a2ps/psutils.diff b/source/ap/a2ps/psutils.diff
deleted file mode 100644
index 4af32bd7f..000000000
--- a/source/ap/a2ps/psutils.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
---- psutils.orig/Makefile.unix	Tue Mar 11 14:52:59 1997
-+++ psutils/Makefile.unix	Thu Jan 18 20:53:36 2001
-@@ -19,16 +19,16 @@
- # psnup puts multiple logical pages on one physical page
- # psresize scales and moves pages to fit on different paper sizes
- 
--PAPER=a4
-+PAPER=letter
- 
- # Makefile for PSUtils under Unix
- 
- OS = UNIX
- 
--BINDIR = /usr/local/bin
-+BINDIR = /usr/bin
- SCRIPTDIR = $(BINDIR)
--INCLUDEDIR = /usr/local/share/psutils
--PERL = /usr/local/bin/perl
-+INCLUDEDIR = /usr/share/psutils
-+PERL = /usr/bin/perl
- 
- BINMODE = 0755
- MANMODE = 0644
-@@ -36,7 +36,7 @@
- INSTALL = install -c -m $(BINMODE)
- INSTALLMAN = install -c -m $(MANMODE)
- MANEXT = 1
--MANDIR = /usr/local/share/man/man$(MANEXT)
-+MANDIR = /usr/man/man$(MANEXT)
- 
- CC = gcc
- CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/source/ap/a2ps/slack-desc b/source/ap/a2ps/slack-desc
index 6cdc18957..96ac8d8ad 100644
--- a/source/ap/a2ps/slack-desc
+++ b/source/ap/a2ps/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
+# 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------------------------------------------------------|
 a2ps: a2ps (any to PostScript filter)
 a2ps:
-a2ps: GNU a2ps is an Any to PostScript filter.  Of course it processes
-a2ps: plain text files, but also pretty prints quite a few popular
-a2ps: programming languages.  Also contained in this package is psutils, a
-a2ps: collection of programs for manipulating PostScript files.
+a2ps: GNU a2ps is an Any to PostScript filter. Of course it processes plain
+a2ps: text files, but also pretty prints quite a few popular programming
+a2ps: languages.
+a2ps:
+a2ps: Homepage: https://www.gnu.org/software/a2ps/
+a2ps:
 a2ps:
-a2ps: a2ps is used by Apsfilter, so be sure to install this package if you
-a2ps: plan to do any printing.
 a2ps:
 a2ps: