3 files changed, 5 insertions, 23 deletions
diff --git a/system/terminus-font/doinst.sh b/system/terminus-font/doinst.sh
index 8014b83f37..cdcb786ebe 100644
--- a/system/terminus-font/doinst.sh
+++ b/system/terminus-font/doinst.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Update mkfontscale and mkfontdir:
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/misc
@@ -12,14 +11,3 @@ if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
 
-# For some versions before Slackware 12.0
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-  ( cd /usr/X11R6/lib/X11/fonts/misc
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-
-if [ -x /usr/X11R6/bin/fc-cache ]; then
-  /usr/X11R6/bin/fc-cache -f
-fi
diff --git a/system/terminus-font/terminus-font.SlackBuild b/system/terminus-font/terminus-font.SlackBuild
index 520e30f8a7..dbfccc3978 100644
--- a/system/terminus-font/terminus-font.SlackBuild
+++ b/system/terminus-font/terminus-font.SlackBuild
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -94,18 +94,10 @@ patchfailed() {
   #patch -p1 < $CWD/patches/terminus-font-$VERSION-kx3-ka2.diff || exit 1
 ) || patchfailed
 
-# Set the directory for X11 fonts
-XPREF=$(pkg-config --variable=prefix x11) || true
-if [ "$XPREF" = "/usr" ]; then
-  X11DIRFONTS=/usr/share/fonts/misc
-else
-  X11DIRFONTS=/usr/X11R6/lib/X11/fonts/local
-fi
-
 ./configure \
   --prefix=/usr \
   --psfdir=/usr/share/kbd/consolefonts \
-  --x11dir=$X11DIRFONTS
+  --x11dir=/usr/share/fonts/misc
 
 make
 make DESTDIR=$PKG TESTDIR= install install-uni install-ref
@@ -119,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/terminus-font/terminus-font.info b/system/terminus-font/terminus-font.info
index 63968886e9..dc5bde7659 100644
--- a/system/terminus-font/terminus-font.info
+++ b/system/terminus-font/terminus-font.info
@@ -3,6 +3,8 @@ VERSION="4.28"
 HOMEPAGE="http://www.is-vn.bg/hamster/"
 DOWNLOAD="http://www.is-vn.bg/hamster/terminus-font-4.28.tar.gz"
 MD5SUM="15bf2f17b625312383fd9dae0925a17e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Antonio Hernández Blas"
 EMAIL="hba.nihilismus@gmail.com"
 APPROVED="Michiel"