From ab5d6d619fe4a1740d69f2882fd7e753fe1a5ede Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Thu, 7 May 2015 14:04:07 -0400
Subject: system/man-db: Updated for version 2.7.1, libpipeline 1.4.0.

---
 system/man-db/man-db.SlackBuild | 16 +++++++++++++---
 system/man-db/man-db.info       | 12 ++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'system/man-db')

diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
index 1b1ccfc37c..acfb405f3f 100644
--- a/system/man-db/man-db.SlackBuild
+++ b/system/man-db/man-db.SlackBuild
@@ -6,13 +6,18 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150507 bkw:
+# - update for 2.7.1.
+# - fix homepage in .info file.
+# - had to update libpipeline to 1.4.0.
+
 # 20140924 bkw:
 # - update for 2.7.0.1, which fixes the clash between man-db's zsoelim
 #   and groff's zsoelim.
 # - update README and README.Slackware slightly.
 
 PRGNAM=man-db
-VERSION=${VERSION:-2.7.0.1}
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,7 +74,7 @@ mkdir -p $TMP $PKG $OUTPUT
 # Instead of making it a separate build and external dep, we'll just
 # bundle it here.
 LIBNAM=libpipeline
-LIBVER=1.3.1
+LIBVER=1.4.0
 
 cd $TMP
 rm -rf $LIBNAM-$LIBVER
@@ -112,8 +117,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# The circumlocutions below are needed because doing it the sane way:
+# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline"
+# gets broken by libtool (it *insists* on replacing -lpipeline with
+# /usr/lib64/libpipeline.so, which will fail if it's an older version).
+LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
 libpipeline_CFLAGS="-I$PKG/usr/include" \
-libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline" \
+libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
index d1304b39b6..b16e777ba4 100644
--- a/system/man-db/man-db.info
+++ b/system/man-db/man-db.info
@@ -1,10 +1,10 @@
 PRGNAM="man-db"
-VERSION="2.7.0.1"
-HOMEPAGE="http://savannah.nongnu.org/projects/man-db"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.7.0.1.tar.xz \
-          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.3.1.tar.gz"
-MD5SUM="7961179a2d8fb4c8f3947c92e80ee232 \
-        31a34830c0f8a6d40ee373df51f04baa"
+VERSION="2.7.1"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.7.1.tar.xz \
+          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.4.0.tar.gz"
+MD5SUM="88d32360e2ed18e05de9b528ad336fd8 \
+        660f4ac9340834a231d1516746d03d28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3