Fixed the symlinking of subfont.ttf

1 files changed, 26 insertions, 17 deletions

diff --git a/MPlayer/build/MPlayer.SlackBuild b/MPlayer/build/MPlayer.SlackBuild
index 47af93e9..a492ad90 100755
--- a/MPlayer/build/MPlayer.SlackBuild
+++ b/MPlayer/build/MPlayer.SlackBuild
@@ -30,10 +30,18 @@ BUILD=${BUILD:-1}
 CODECSDIR=/usr/lib/codecs
 DEFSKIN=Blue      # Download more at http://www.mplayerhq.hu/design7/dload.html
 SKINVER=1.6
-FONT=iso-8859-1
-FONT_SIZE=18
 LANGUAGES="en nl fr de es"   # The default is to just use "en"
 
+# MPlayer will try to use one of the TrueType fonts present on the target
+# system for it's On Screen Display (OSD) font.
+# Slackware 11.0 ships with the Vera and DejaVu fonts, you may want to add
+# more fonts to this list. The first font found will be used by creating a
+# symbolic link "/usr/share/mplayer/subfont.ttf" to it.
+# The use of bitmapped fonts is considered deprecated, but you can still use
+# those if you want. Read http://www.mplayerhq.hu/DOCS/HTML/en/fonts-osd.html
+# if you want to know more about OSD font configuration.
+OSDFONTS="DejaVuSans.ttf Vera.ttf"
+
 DOCS="AUTHORS ChangeLog Copyright LICENSE README DOCS/HTML DOCS/tech"
 
 
@@ -212,16 +220,16 @@ config() {
 }
 
 # Configure a default TrueType font to use for the OSD :
-( cd usr/share/mplayer/
-  if [ ! -f subfont.ttf ]; then
-    for font in "DejaVuSans.ttf Vera.ttf"; do
-      if [ -f usr/X11R6/lib/X11/fonts/TTF/$font]; then
-        ln -sf /usr/X11R6/lib/X11/fonts/TTF/$font subfont.ttf
-        break
-      fi
-    done
-  fi
-)
+if [ ! -f usr/share/mplayer/subfont.ttf ]; then
+  for font in ${OSDFONTS}; do
+    if [ -f usr/X11R6/lib/X11/fonts/TTF/\${font} ]; then
+      ( cd usr/share/mplayer/
+        ln -sf /usr/X11R6/lib/X11/fonts/TTF/\${font} subfont.ttf
+      )
+      break
+    fi
+  done
+fi
 
 # Prepare the new configuration file
 config etc/mplayer.conf.new
@@ -232,13 +240,14 @@ EOINS
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-# Remove docs for superfluous languages:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+# Only keep the docs for languages that we want:
+mv $PKG/usr/doc/$PRGNAM-$VERSION/HTML $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/HTML
 for i in $LANGUAGES; do
-  [ -d $PKG/usr/doc/$PRGNAM-$VERSION/HTML/$i ] && \
-  mv $PKG/usr/doc/$PRGNAM-$VERSION/HTML/$i $PKG/usr/doc/$PRGNAM-$VERSION/html/
+  [ -d $PKG/usr/doc/$PRGNAM-$VERSION/html/$i ] && \
+  mv $PKG/usr/doc/$PRGNAM-$VERSION/html/$i $PKG/usr/doc/$PRGNAM-$VERSION/HTML/
 done
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/HTML
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/html
 # Save a sample of all configuration files:
 for i in etc/*.conf ; do
   cp $i $PKG/usr/doc/$PRGNAM-$VERSION/`basename $i`-sample