system/artwiz-aleczapka: Reworked (split cursor font out)

The cursor font is not in a separate package.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 90 insertions, 64 deletions

diff --git a/system/artwiz-aleczapka/README b/system/artwiz-aleczapka/README
index bd925d196e..860c26d785 100644
--- a/system/artwiz-aleczapka/README
+++ b/system/artwiz-aleczapka/README
@@ -1,13 +1,8 @@
 This is a set of artwiz fonts that is compatible with fontconfig/Xft-2.0.
 
-There are tarballs for several different languages (encodings?) available from
-the artwiz-aleczapka website.  Take a look at the $FONTLANG variable in the
-SlackBuild when building a non-English package.  All languages should be able
-to coexist on the same machine.  The artwiz cursors are available in the
-English tarball.
+This script can also build the alternate language versions which contain more
+Latin-1 glyphs.  Download the appropriate tarball from the artwiz-aleczapka
+website and set $FONTLANG to "de" or "se".  See the SlackBuild script for more
+info.  All languages should be able to coexist on the same machine.
 
-After installation you will need to restart X for the changes to take effect.
-
-After uninstallation you may need to run "mkfontscale" and "mkfontdir" in
-/usr/share/fonts/misc so that X can find the appropriate cursor font the
-next time it starts.
+After installation you may need to restart X for it to use the new fonts.
diff --git a/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild b/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
index 766372d7d9..104f2dc920 100644
--- a/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
+++ b/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
@@ -1,20 +1,31 @@
 #!/bin/sh
 
 # Slackware build script for artwiz-aleczapka
-# Written by Kyle Guinn <elyk03@gmail.com>
 
-set -e
-
-# To make a package for fonts other than English, run the script as, for
-# example, "FONTLANG=de ./artwiz-aleczapka.SlackBuild".  You will need to
-# download the correct tarball and place it in this directory.  See the
-# SourceForge download page for the available tarballs.
-FONTLANG=${FONTLANG:-en}
+# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=artwiz-aleczapka-$FONTLANG
-VERSION=1.3
+PRGNAM=artwiz-aleczapka
+VERSION=${VERSION:-1.3}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -22,35 +33,58 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# All of the fonts advertise themselves as being ISO-8859-1 encoded, although
+# some are not.  (CP437 is a better match for some.)  The "en" source has most
+# of the ASCII subset complete, and the "de" and "se" sources add a few glyphs
+# for Latin-1 characters that are important to those languages.  However these
+# alternative languages have the font family and face names suffixed with
+# ".de" and ".se" so their usefulness is questionable.
+#
+# To make a package for fonts other than English, run the script as, for
+# example, "FONTLANG=de ./artwiz-aleczapka.SlackBuild".  You will need to
+# download the correct tarball and place it in this directory.  See the
+# SourceForge download page for the available tarballs.
+FONTLANG=${FONTLANG:-en}
+
+# Careful, the various source packages contain different sets of docs.
+# This pattern for $DOCS is common to all; the other files seem uninteresting.
+SRCNAM=$PRGNAM-$FONTLANG-sources
+DOCS="AUTHORS COPYING README*"
+
+# Add a -$FONTLANG suffix to the package name when building one of the
+# alternate language packages.  All can be installed simultaneously.
+# This fits with the source's theme of suffixing the filenames and the font
+# family and face names in the non-English versions.
+if [ ! "${FONTLANG}" = "en" ]; then
+  PRGNAM=$PRGNAM-$FONTLANG
+  PKG=$PKG-$FONTLANG
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-# The English package contains a cursor font.  To avoid clobbering the
-# existing one (from the x/font-cursor-misc package), rename it.
-# TODO:  Figure out and document how to set the default cursor font.
-if [ -e cursor.pcf ]; then
-  mv cursor.pcf artwiz-cursor.pcf
-fi
+chmod -R u+w,go-w,a+rX-st .
 
-gzip -9 *.pcf
-mkdir -p $PKG/usr/share/fonts/misc
-cp -a *.pcf.gz $PKG/usr/share/fonts/misc
+for bdf in *.bdf; do
+  pcf=$(basename $bdf .bdf).pcf
+  bdftopcf -o $pcf $bdf
+  install -m 0644 -D $pcf $PKG/usr/share/fonts/misc/$pcf
+done
+find $PKG/usr/share/fonts/misc -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/artwiz-aleczapka.SlackBuild > \
   $PKG/usr/doc/$PRGNAM-$VERSION/artwiz-aleczapka.SlackBuild
 
 mkdir -p $PKG/install
-# Fix the package name in the slack-desc file
-sed s/FONTLANG/$FONTLANG/g $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/system/artwiz-aleczapka/artwiz-aleczapka.info b/system/artwiz-aleczapka/artwiz-aleczapka.info
index d501738468..b6c5e1f495 100644
--- a/system/artwiz-aleczapka/artwiz-aleczapka.info
+++ b/system/artwiz-aleczapka/artwiz-aleczapka.info
@@ -1,8 +1,8 @@
 PRGNAM="artwiz-aleczapka"
 VERSION="1.3"
 HOMEPAGE="http://artwizaleczapka.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2"
-MD5SUM="6c6c704f2f08f9d6308d366423dfa90e"
+DOWNLOAD="http://downloads.sourceforge.net/artwizaleczapka/artwiz-aleczapka-en-sources-1.3.tar.bz2"
+MD5SUM="3de7de7aa635eb6160fac01d678f8b72"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/artwiz-aleczapka/doinst.sh b/system/artwiz-aleczapka/doinst.sh
index 79208337b7..887e064938 100644
--- a/system/artwiz-aleczapka/doinst.sh
+++ b/system/artwiz-aleczapka/doinst.sh
@@ -1,12 +1,9 @@
 #!/bin/sh
-# Update mkfontscale and mkfontdir:
+# Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/misc
-    mkfontscale .
-    mkfontdir .
-  )
+  /usr/bin/mkfontscale /usr/share/fonts/misc
+  /usr/bin/mkfontdir /usr/share/fonts/misc
 fi
-# Update the X font indexes:
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
diff --git a/system/artwiz-aleczapka/slack-desc b/system/artwiz-aleczapka/slack-desc
index f5d2912877..cec6b35ca4 100644
--- a/system/artwiz-aleczapka/slack-desc
+++ b/system/artwiz-aleczapka/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
-                         |-----handy-ruler------------------------------------------------------|
-artwiz-aleczapka-FONTLANG: artwiz-aleczapka (Artwiz Fonts Revisited)
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG: This is a set of improved artwiz fonts that is 
-artwiz-aleczapka-FONTLANG: compatible with fontconfig/Xft-2.0.
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
-artwiz-aleczapka-FONTLANG:
+                |-----handy-ruler------------------------------------------------------|
+artwiz-aleczapka: artwiz-aleczapka (Artwiz Fonts Revisited)
+artwiz-aleczapka:
+artwiz-aleczapka: This is a set of improved artwiz fonts that is 
+artwiz-aleczapka: compatible with fontconfig/Xft-2.0.
+artwiz-aleczapka:
+artwiz-aleczapka:
+artwiz-aleczapka:
+artwiz-aleczapka:
+artwiz-aleczapka:
+artwiz-aleczapka:
+artwiz-aleczapka: