From 1c604ddbdd10348cf0235c3a032ff25e9763959a Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Thu, 23 Jan 2020 04:21:03 -0500
Subject: system/st: Include terminfo files in package.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 system/st/doinst.sh     |  3 ---
 system/st/st.SlackBuild | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 system/st/doinst.sh

(limited to 'system/st')

diff --git a/system/st/doinst.sh b/system/st/doinst.sh
deleted file mode 100644
index 492b5a6c42..0000000000
--- a/system/st/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -e /usr/bin/tic ]; then
-  /usr/bin/tic -s usr/share/st/st.info >/dev/null 2>&1
-fi
diff --git a/system/st/st.SlackBuild b/system/st/st.SlackBuild
index 46a4408dee..2b519272ae 100644
--- a/system/st/st.SlackBuild
+++ b/system/st/st.SlackBuild
@@ -22,9 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by the SlackBuilds.org project
+
 PRGNAM=st
 VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -70,13 +72,22 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Now apply any other patches that users might have added
-for i in $(ls $CWD/patches); do
+for i in $(ls $CWD/patches 2>/dev/null); do
   echo "Applying patch $i"
   patch -p1 < $CWD/patches/$i
 done
 
 # Remove "tic" line from Makefile - we cannot do this here!
-sed -i "/^\t@tic/d" Makefile
+#sed -i "/^\t@tic/d" Makefile
+
+# 20200123 bkw: Actually, yes we can:
+sed -i "s|\\<tic\\>|& -o $PKG/usr/share/terminfo|" Makefile
+
+# Above sed command got broken by upstream (they removed the @)
+# so files were being written to the real /usr, not $PKG/usr.
+# Doing it this way means the terminfo stuff is cleanly removed
+# when the package is removed. tic won't create the dir, so:
+mkdir -p $PKG/usr/share/terminfo
 
 [ -f "$CWD/config.h" ] && cp -f $CWD/config.h config.h
 
@@ -86,10 +97,6 @@ make install \
   MANPREFIX=/usr/man \
   DESTDIR=$PKG
 
-# Incluse st.info in package
-mkdir -p $PKG/usr/share/st
-cp st.info $PKG/usr/share/st/
-
 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
 
@@ -102,7 +109,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $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