desktop/un-fonts-core: Updated for version 1.0

5 files changed, 13 insertions, 31 deletions

diff --git a/desktop/un-fonts-core/README b/desktop/un-fonts-core/README
index 997756beb9a6..b37194d702c1 100644
--- a/desktop/un-fonts-core/README
+++ b/desktop/un-fonts-core/README
@@ -6,4 +6,4 @@ This package contains Core families (9 fonts)
 * UnDotum, UnDotumBold: sans-serif
 * UnGraphic, UnGraphicBold: sans-serif style
 * UnPilgi, UnPilgiBold: script
-* UnGungseo: cursive, brush-stroke
\ No newline at end of file
+* UnGungseo: cursive, brush-stroke
diff --git a/desktop/un-fonts-core/doinst.sh b/desktop/un-fonts-core/doinst.sh
index 2c2184ce0595..f7d24f5ca971 100644
--- a/desktop/un-fonts-core/doinst.sh
+++ b/desktop/un-fonts-core/doinst.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Update mkfontscale and mkfontdir:
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/TTF
@@ -12,14 +11,3 @@ if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
 
-# For some versions before Slackware 12.1
-if [ -x /usr/X11R6/bin/mkfontdir ]; then
-  ( cd /usr/X11R6/lib/X11/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-
-if [ -x /usr/X11R6/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
diff --git a/desktop/un-fonts-core/slack-desc b/desktop/un-fonts-core/slack-desc
index 634a8b2c4ace..a07100d150bc 100644
--- a/desktop/un-fonts-core/slack-desc
+++ b/desktop/un-fonts-core/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-un-fonts-core:  un-fonts-core  (Korean TrueType fonts)
+un-fonts-core: un-fonts-core (Korean TrueType fonts)
 un-fonts-core:
 un-fonts-core: This package contains Core families (9 fonts):
 un-fonts-core:
diff --git a/desktop/un-fonts-core/un-fonts-core.SlackBuild b/desktop/un-fonts-core/un-fonts-core.SlackBuild
index c77a38c240fd..208e15c9aa95 100644
--- a/desktop/un-fonts-core/un-fonts-core.SlackBuild
+++ b/desktop/un-fonts-core/un-fonts-core.SlackBuild
@@ -23,12 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=un-fonts-core
-PRGNAMALT=un-fonts
 VERSION=1.0
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAME=un-fonts
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,9 +40,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAMALT
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAMALT
+rm -rf $SRCNAME
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $SRCNAME
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -49,17 +50,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-
-# To determinate Xorg's location
-XPREF=$(pkg-config --variable=prefix x11) || true
-if [ "$XPREF" == "/usr" ]; then
-    FONTDIR="$PKG/usr/share/fonts/TTF"
-else
-    FONTDIR="$PKG/usr/X11R6/lib/X11/fonts/TTF"
-fi
-
-mkdir -p $FONTDIR/
-cp -a *.ttf $FONTDIR/
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a *.ttf $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -70,4 +62,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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/un-fonts-core/un-fonts-core.info b/desktop/un-fonts-core/un-fonts-core.info
index 0a851be9573c..c441791c058d 100644
--- a/desktop/un-fonts-core/un-fonts-core.info
+++ b/desktop/un-fonts-core/un-fonts-core.info
@@ -3,6 +3,8 @@ VERSION="1.0"
 HOMEPAGE="http://kldp.net/projects/unfonts"
 DOWNLOAD="http://kldp.net/frs/download.php/1425/un-fonts-core-1.0.tar.gz"
 MD5SUM="553aacd65143429b82b85d906c4ae90a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Christophe Nguyen"
 EMAIL="cnguyenminhtan@free.fr"
-APPROVED="David Somero"
+APPROVED="dsomero,rworkman"