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, 22 insertions, 11 deletions

diff --git a/source/n/openldap-client/openldap-client.SlackBuild b/source/n/openldap-client/openldap-client.SlackBuild
index 80ec373f..c0d58d30 100755
--- a/source/n/openldap-client/openldap-client.SlackBuild
+++ b/source/n/openldap-client/openldap-client.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,11 @@
 
 # OpenLDAP (clients/libraries only!)
 
+cd $(dirname $0) ; CWD=$(pwd)
 
-VERSION=${VERSION:-$(echo openldap-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+PKGNAM=openldap-client
+VERSION=${VERSION:-$(echo openldap-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then
   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
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -50,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-openldap-client
 
@@ -58,8 +67,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf openldap-$VERSION
-tar xvf $CWD/openldap-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/openldap-$VERSION.tar.?z || exit 1
 cd openldap-$VERSION || exit 1
+
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -72,7 +82,6 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-cyrus-sasl \
   --with-tls \
-  --with-readline \
   --with-threads \
   --enable-debug \
   --enable-syslog \
@@ -82,13 +91,16 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --enable-shared \
   --disable-slapd \
-  --disable-slurpd
+  --build=$ARCH-slackware-linux || exit 1
 
 make depend || exit 1
-make -j4 || exit 1
+make -j7 || exit 1
 make test || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Fix permissions on shared libraries:
 chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so.*
 
@@ -119,7 +131,6 @@ fi
 # Remove man pages for the servers (not currently supported or shipped...
 # do they even work properly without the evil PAM?)
 find $PKG/usr/man -name slap* -exec rm -f {} \;
-find $PKG/usr/man -name slurp* -exec rm -f {} \;
 find $PKG/usr/man -type d -empty -exec rmdir {} \;
 
 # Compress and if needed symlink the man pages:
diff --git a/source/n/openldap-client/slack-desc b/source/n/openldap-client/slack-desc
index 939153bb..378cf14e 100644
--- a/source/n/openldap-client/slack-desc
+++ b/source/n/openldap-client/slack-desc
@@ -9,7 +9,7 @@
 openldap-client: openldap-client (OpenLDAP client programs)
 openldap-client:
 openldap-client: OpenLDAP is an open source implementation of the Lightweight
-openldap-client: Directory Access Protocol.  LDAP is a alternative to the X.500
+openldap-client: Directory Access Protocol. LDAP is a alternative to the X.500
 openldap-client: Directory Access Protocol (DAP). It uses the TCP/IP stack versus
 openldap-client: the overly complex OSI stack.
 openldap-client: