From 7d8fda6e9a665cc78188bb5e0afc6c17bbc89d38 Mon Sep 17 00:00:00 2001
From: Dave Woodfall <dave@slackbuilds.org>
Date: Sat, 25 Apr 2020 03:46:40 +0100
Subject: misc/dvtm: Fix and install terminfo.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 misc/dvtm/doinst.sh       |  3 +++
 misc/dvtm/dvtm.SlackBuild | 23 ++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 misc/dvtm/doinst.sh

(limited to 'misc/dvtm')

diff --git a/misc/dvtm/doinst.sh b/misc/dvtm/doinst.sh
new file mode 100644
index 0000000000000..870a890ca1612
--- /dev/null
+++ b/misc/dvtm/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/tic ]; then
+  /usr/bin/tic -s usr/share/dvtm/dvtm.info >/dev/null 2>&1
+fi
diff --git a/misc/dvtm/dvtm.SlackBuild b/misc/dvtm/dvtm.SlackBuild
index 5a37858326caf..2d9f8706841cc 100644
--- a/misc/dvtm/dvtm.SlackBuild
+++ b/misc/dvtm/dvtm.SlackBuild
@@ -24,9 +24,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by slackbuilds.org
+
 PRGNAM=dvtm
 VERSION=${VERSION:-0.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,11 +73,25 @@ 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 {} \;
 
+# Strip the slackware way
+sed "/@${STRIP} dvtm/d" Makefile
+
+# Fix terminfo
+sed -i "s|f22.*$|&,|" dvtm.info
+
 CFLAGS="$SLKCFLAGS" \
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
 make
-make install DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man
-# binaries are already stripped
+make install \
+  PREFIX=/usr \
+  MANPREFIX=/usr/man \
+  DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# install terminfo
+install -D -m 0644 dvtm.info $PKG/usr/share/dvtm/dvtm.info
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -88,6 +104,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-- 
cgit v1.2.3