Updated to 20100501

1 files changed, 42 insertions, 27 deletions

diff --git a/fontforge/build/fontforge.SlackBuild b/fontforge/build/fontforge.SlackBuild
index ce768a29..1c00a4c2 100755
--- a/fontforge/build/fontforge.SlackBuild
+++ b/fontforge/build/fontforge.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2006-2009  Eric Hameleers, Eindhoven, NL
+# Copyright 2006-2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -52,6 +52,8 @@
 #             * Update.
 # 20090914-1: 15/sep/2009 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 20100501-1: 29/may/2010 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh fontforge.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -60,8 +62,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=fontforge
-VERSION=${VERSION:-20090914}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-20100501}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -87,6 +88,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE[0]="$SRCDIR/${PRGNAM}_full-${VERSION}.tar.bz2"
 SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}_full-${VERSION}.tar.bz2"
+
 SOURCE[1]="$SRCDIR/cidmaps.tgz"
 SRCURL[1]="http://fontforge.sourceforge.net/cidmaps.tgz"
 
@@ -94,34 +96,47 @@ SRCURL[1]="http://fontforge.sourceforge.net/cidmaps.tgz"
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
-# Exit the script on errors:
-set -e
-trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
-# Catch unitialized variables:
-set -u
-P1=${1:-1}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 case "$ARCH" in
   i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  s390)      SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
+  *)         SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
 esac
 
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
+
 # Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
 mkdir -p $PKG             # place for the package to be built
-rm -rf $PKG/*             # We always erase old package's contents:
-mkdir -p $OUTPUT          # place for the package to be saved
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+                          # remove old log files
 
 # Source file availability:
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
@@ -160,6 +175,7 @@ if [ -d ${FREETYPE_DIR} ]; then
   echo ">>> Using freetype source in '$FREETYPE_DIR'"
   FREETYPE_OPTS="--with-freetype-src=${FREETYPE_DIR}"
 else
+  echo ">>> NOT using freetype source in '$FREETYPE_DIR' (missing)"
   FREETYPE_OPTS=""
 fi
 # Use bytecode interpreter?
@@ -187,12 +203,12 @@ mv *.cidmap ${PRGNAM}-${VERSION}/cidmap/
 
 cd ${PRGNAM}-${VERSION}
 
-# Support new libpng14:
-cat $SRCDIR/fontforge_png14.diff | patch -p1 --verbose \
-  tee $OUTPUT/patch-${PRGNAM}.log 
+## Support new libpng14:
+#cat $SRCDIR/fontforge_png14.diff | patch -p1 --verbose \
+#  tee $OUTPUT/patch-${PRGNAM}.log 
 
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
@@ -233,11 +249,7 @@ fi
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cat $SRCDIR/$(basename $0) | sed \
-  -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \
-  -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \
-  -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \
-  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
@@ -270,3 +282,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
+# Restore the original umask:
+umask ${_UMASK_}
+