2 files changed, 15 insertions, 12 deletions
diff --git a/development/ftjam/ftjam.SlackBuild b/development/ftjam/ftjam.SlackBuild
index 2e4c4d680b9f..a998a4ef2153 100644
--- a/development/ftjam/ftjam.SlackBuild
+++ b/development/ftjam/ftjam.SlackBuild
@@ -12,6 +12,7 @@ VERSION=2.5.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,8 +20,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 rm -rf $PKG
@@ -36,20 +42,15 @@ chmod -R u+w,go+r-w,a-s .
 # Works around a ftjam bug where jam0 segfaults.
 CFLAGS="$SLKCFLAGS -fno-strict-aliasing" \
 CXXFLAGS="$SLKCFLAGS -fno-strict-aliasing" \
-./configure --prefix=/usr
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX
 
 make
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README CHANGES RELNOTES Jambase *.html $PKG/usr/doc/$PRGNAM-$VERSION
@@ -59,4 +60,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/development/ftjam/ftjam.info b/development/ftjam/ftjam.info
index a3b69b0407c6..350426d441da 100644
--- a/development/ftjam/ftjam.info
+++ b/development/ftjam/ftjam.info
@@ -2,7 +2,9 @@ PRGNAM="ftjam"
 VERSION="2.5.2"
 HOMEPAGE="http://www.freetype.org/jam/"
 DOWNLOAD="http://downloads.sourceforge.net/freetype/ftjam-2.5.2.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="e61304b370ba06f68082f0219a196576"
+MD5SUM_x86_64=""
 MAINTAINER="Ferenc Deak"
 EMAIL="ferenc.deak@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"