diff options
| author | Antonio Hernández Blas <hba.nihilismus@gmail.com> | 2010-05-13 00:41:57 +0200 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-13 00:41:57 +0200 |
| commit | 4da74fd023a6f9a9fe3d3df5ec5e4787fe59791c (patch) | |
| tree | 0cc4bdcbdf32c062e8ffbd383f99457908e07d2c | |
| parent | feb3f66018da23ca17f0e3f1a7032fd1ccb031e6 (diff) | |
system/terminus-font: Updated for version 4.28
| -rw-r--r-- | system/terminus-font/doinst.sh | 12 | ||||
| -rw-r--r-- | system/terminus-font/terminus-font.SlackBuild | 14 | ||||
| -rw-r--r-- | system/terminus-font/terminus-font.info | 2 |
3 files changed, 5 insertions, 23 deletions
diff --git a/system/terminus-font/doinst.sh b/system/terminus-font/doinst.sh index 8014b83f37ef..cdcb786ebed3 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 520e30f8a7ce..dbfccc397861 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 63968886e915..dc5bde765934 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" |