From ae3ec6324b49d7d3ae7cdc84cb0304d6d0ed44d3 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Wed, 8 Mar 2023 01:27:56 -0500
Subject: games/vera: Clean up douninst.sh.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/vera/douninst.sh     | 21 +++++----------------
 games/vera/vera.SlackBuild |  4 +++-
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'games/vera')

diff --git a/games/vera/douninst.sh b/games/vera/douninst.sh
index f452accdaa15c..1bef5020286ea 100644
--- a/games/vera/douninst.sh
+++ b/games/vera/douninst.sh
@@ -1,17 +1,6 @@
-# 20211015 bkw: I was going to have a douninst.sh that runs
-# /usr/bin/install-info --delete /usr/info/xroar.info.gz /usr/info/dir
-# but this won't work because removepkg has already deleted
-# /usr/info/xroar.info.gz before it runs douninst.sh. And you can't
-# use install-info to remove stuff *by name* from /usr/info/dir;
-# the info file must actually exist.
-# So the script has to manually remove the entry from the info dir,
-# and the Emulators section if it's become empty.
-
-if [ -e usr/info/dir ]; then
-  # Remove the entry first:
-  sed -i '/^\* V\.E\.R.\A\.:/d' usr/info/dir
-  # If the Dictionaries section is empty now, remove it too:
-  if grep -A1 '^Dictionaries$' usr/info/dir | tail -1 | grep -q '^$'; then
-    sed -i '/^Dictionaries$/,+1d' usr/info/dir
-  fi
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
 fi
diff --git a/games/vera/vera.SlackBuild b/games/vera/vera.SlackBuild
index 30b11422c3324..6c2eca316d211 100644
--- a/games/vera/vera.SlackBuild
+++ b/games/vera/vera.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230308 bkw: BUILD=3, make douninst.sh less fugly.
+
 # 20211015 bkw: BUILD=2
 # - fix character encoding and formatting.
 # - fix info node structure and dir entry.
@@ -22,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vera
 VERSION=${VERSION:-1.24}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-- 
cgit v1.2.3