system/fnt: Updated for version 1.5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 22 insertions, 44 deletions

diff --git a/system/fnt/README b/system/fnt/README
index d3eb846bc15d9..9f101e0b7a9e6 100644
--- a/system/fnt/README
+++ b/system/fnt/README
@@ -22,4 +22,6 @@ To uninstall a font
 
 $ fnt remove agave
 
-This work is licensed under the MIT License.
+To get a list of fonts that are available  and save it to a file do
+
+fnt search > fontlist
diff --git a/system/fnt/fnt.SlackBuild b/system/fnt/fnt.SlackBuild
index 90d27b88e3829..8e7f07ae68be9 100644
--- a/system/fnt/fnt.SlackBuild
+++ b/system/fnt/fnt.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fnt
 
-# Copyright 2022 Vijay Marcel
+# Copyright 2022-2024 Vijay Marcel
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,22 +25,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fnt
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  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
@@ -50,20 +40,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR
 
@@ -80,22 +56,10 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
-sed -i '2 i MANDIR=/usr/man'  makefile
-sed -i.bak '3d' makefile
-rm -rvf makefile.bak
-sed -i.bak '3d' makefile
-rm -rvf makefile.bak
-sed -i '3 i ZCOMPDIR=/usr/share/zsh/site-functions' makefile
-
+patch --verbose --unified  <  $CWD/makefile.patch
 make
 make install DESTDIR=$PKG
 
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
 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
 
@@ -105,6 +69,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.md  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/fnt/fnt.info b/system/fnt/fnt.info
index c68df9224287c..95b799b80c9f4 100644
--- a/system/fnt/fnt.info
+++ b/system/fnt/fnt.info
@@ -1,8 +1,8 @@
 PRGNAM="fnt"
-VERSION="1.4.1"
+VERSION="1.5"
 HOMEPAGE="https://github.com/alexmyczko/fnt"
-DOWNLOAD="https://github.com/alexmyczko/fnt/archive/1.4.1/fnt-1.4.1.tar.gz"
-MD5SUM="b9ca2f91096a715e13287dd8dc9d4744"
+DOWNLOAD="https://github.com/alexmyczko/fnt/archive/1.5/fnt-1.5.tar.gz"
+MD5SUM="e2d25c7845bc2617f618a0701f7ceabe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="chafa lcdf-typetools"
diff --git a/system/fnt/makefile.patch b/system/fnt/makefile.patch
new file mode 100644
index 0000000000000..cbfac98aeb7a1
--- /dev/null
+++ b/system/fnt/makefile.patch
@@ -0,0 +1,11 @@
+--- makefile	2023-08-22 18:06:03.000000000 +0530
++++ makefile1	2024-02-05 18:00:30.130997385 +0530
+@@ -1,6 +1,6 @@
+ BINDIR=/usr/bin
+-MANDIR=/usr/share/man
+-ZCOMPDIR=/usr/local/share/zsh/site-functions
++MANDIR=/usr/man
++ZCOMPDIR=/usr/share/zsh/site-functions
+ VERSION=1.3
+ 
+ all: