From 6fc158b510e7b17603ba42fb5cdc57dd64fd8364 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Tue, 8 Mar 2022 01:38:51 -0500
Subject: development/ldns: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/ldns/ldns.SlackBuild | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'development/ldns')

diff --git a/development/ldns/ldns.SlackBuild b/development/ldns/ldns.SlackBuild
index ecc7b134eb..9588369808 100644
--- a/development/ldns/ldns.SlackBuild
+++ b/development/ldns/ldns.SlackBuild
@@ -33,6 +33,11 @@
 # URL:        http://www.nlnetlabs.nl/projects/ldns/
 # -----------------------------------------------------------------------------
 
+# 20220308 bkw: Modified by SlackBuilds.org: fix build on 15.0:
+# - parallel makes are broken, use -j1.
+# - fix code that finds the /usr/share/vim/vimXX directory (it would
+#   fail if there were more than one of them).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ldns
@@ -49,9 +54,6 @@ 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -86,9 +88,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
@@ -116,7 +118,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-trust-anchor=/etc/$PRGNAM/root.key \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install DESTDIR=$PKG INSTALLVENDORMAN3DIR=/usr/man/man3 INSTALLDIRS=vendor
 python -m compileall $PKG/usr/lib*/python*/site-packages
 
@@ -134,9 +136,13 @@ sed -n '/Zone/,$p' $CWD/root-anchors.xml | sed -e 's|<[^>]*>||g' | \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changelog LICENSE README* doc/TODO $PKG/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/$(find /usr/share/vim -type d -name "vim[0-9]*")/syntax
-install -m 0644 libdns.vim \
-  $PKG/$(find /usr/share/vim -type d -name "vim[0-9]*")/syntax/$PRGNAM.vim
+# 20220308 bkw: it's fully possible for there to be multiple
+# /usr/share/vim/vim<version> directories. For one thing, if vim gets
+# upgraded while this package is installed... so go with what we hope
+# is the highest-numbered vim version here.
+VIMDIR="$(find /usr/share/vim -type d -name "vim[0-9]*" | sort | tail -1)/syntax"
+mkdir -p $PKG/$VIMDIR
+install -m 0644 libdns.vim $PKG/$VIMDIR/$PRGNAM.vim
 
 find $PKG -type f -perm 444 -exec chmod 0644 '{}' \;
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-- 
cgit v1.2.3