From 4da74fd023a6f9a9fe3d3df5ec5e4787fe59791c Mon Sep 17 00:00:00 2001
From: Antonio Hernández Blas
Date: Thu, 13 May 2010 00:41:57 +0200
Subject: system/terminus-font: Updated for version 4.28

---
 system/terminus-font/terminus-font.SlackBuild | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'system/terminus-font/terminus-font.SlackBuild')

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}
-- 
cgit v1.2.3