misc/figlet: Updated for version 222

1 files changed, 39 insertions, 22 deletions

diff --git a/misc/figlet/figlet.SlackBuild b/misc/figlet/figlet.SlackBuild
index 6f12e15693..4ced545df1 100644
--- a/misc/figlet/figlet.SlackBuild
+++ b/misc/figlet/figlet.SlackBuild
@@ -1,9 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for figlet
-
-# Written by David Woodfall dave@unrealize.co.uk
-# aka dive on irc.freenode.net/#slackware
+ 
+# Copyright 2009  David Woodfall <dave@unrealize.co.uk>
+# All rights reserved.
+#
+# aka dive in #slackware on freenode.net
+#
+# 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. FURTHERMORE I AM NOT LIABLE IF
+# YOUR DATA IS DESTROYED, YOUR HOUSE BURNS DOWN OR YOUR DOG RUNS OFF.
 
 PRGNAM=figlet
 VERSION=${VERSION:-222}
@@ -16,14 +36,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DESTDIR=$PKG/usr/bin
-FONTDIR=$PKG/usr/share/figlet
-MANDIR=$PKG/usr/man/man6
-
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT 
 cd $TMP
 rm -rf $PRGNAM$VERSION
 tar xvf $CWD/$PRGNAM$VERSION.tar.gz
@@ -35,23 +51,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Sed the CFLAGs into the Makefile
+# Need to fix the Makefile
+sed -i 's/local\///g' Makefile
+sed -i '/DEFAULTFONTDIR\ =\ fonts/d' Makefile
+
+ # Sed the CFLAGs into the Makefile
 if [ "$ARCH" = "i486" ]; then
     sed -i 's#CFLAGS = -g#CFLAGS=-O2 -march=i486 -mtune=i686#g' Makefile
 elif [ "$ARCH" = "i686" ]; then
     sed -i 's#CFLAGS = -g#CFLAGS=-O2 -march=i686 -mtune=i686#g' Makefile
+elif [ "$ARCH" = "x86_64" ]; then
+	sed -i 's#CFLAGS = -g#CFLAGS=-O2 -fPIC#g' Makefile
 fi
 
-# Need to fix the Makefile.
-sed -i 's/local\///g' Makefile
-sed -i '/DEFAULTFONTDIR\ =\ fonts/d' Makefile
-
 make all
+mkdir -p $PKG/usr/bin $PKG/usr/share/figlet $PKG/usr/man/man6
 chmod +x figlist
-mkdir -p $DESTDIR $FONTDIR $MANDIR
-cp figlet chkfont figlist $DESTDIR
-cp -a fonts/*.{flf,flc} $FONTDIR
-cp -a figlet.6 $MANDIR
+cp figlet chkfont figlist $PKG/usr/bin
+cp fonts/*.flf fonts/*.flc $PKG/usr/share/figlet
+cp figlet.6 $PKG/usr/man/man6
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -66,13 +84,12 @@ cp -a figlet.6 $MANDIR
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES FAQ LICENSE README figfont.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cp CHANGES LICENSE README FAQ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+# Make the package
 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}