From 5784f758231fecf380aea814d62180a509bf35ab Mon Sep 17 00:00:00 2001
From: Phil Warner <pc_warner@yahoo.com>
Date: Wed, 12 May 2010 17:40:11 +0200
Subject: libraries/FreeImage: Updated for version 3.11.0

---
 libraries/FreeImage/FreeImage.SlackBuild | 17 +++++++++++------
 libraries/FreeImage/FreeImage.info       |  2 +-
 libraries/FreeImage/slack-desc           |  8 ++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'libraries')

diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index c34940693d..eafea1183e 100644
--- a/libraries/FreeImage/FreeImage.SlackBuild
+++ b/libraries/FreeImage/FreeImage.SlackBuild
@@ -19,10 +19,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
 
 set -e
@@ -43,14 +46,16 @@ find . \
 patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff
 patch -p1 < $CWD/Makefile.fip.DESTDIR.diff
 
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
-make install DESTDIR=$PKG
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip
-make -f Makefile.fip install DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make INSTALLDIR=/usr/lib${LIBDIRSUFFIX}
+make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX}
+make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/FreeImage/FreeImage.info b/libraries/FreeImage/FreeImage.info
index 0ed67665be..1cc6f652ac 100644
--- a/libraries/FreeImage/FreeImage.info
+++ b/libraries/FreeImage/FreeImage.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://downloads.sourceforge.net/freeimage/FreeImage3110.zip"
 MD5SUM="ad1db36414391417654ba7bf1c0277d3"
 MAINTAINER="Phil Warner"
 EMAIL="pc_warner@yahoo.com"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero,rworkman"
diff --git a/libraries/FreeImage/slack-desc b/libraries/FreeImage/slack-desc
index 922a9bb49f..8829cfff71 100644
--- a/libraries/FreeImage/slack-desc
+++ b/libraries/FreeImage/slack-desc
@@ -13,7 +13,7 @@ FreeImage: want to support popular graphics image formats like PNG, BMP,
 FreeImage: JPEG, TIFF and others needed by today's multimedia applications. 
 FreeImage: FreeImage is easy to use, fast, and multithreading safe.
 FreeImage: FreeImagePlus is a C++ wrapper for FreeImage.
-FreeImage: 
-FreeImage: http://freeimage.sourceforge.net/
-FreeImage: 
-FreeImage: 
+FreeImage:
+FreeImage: Homepage: http://freeimage.sourceforge.net/
+FreeImage:
+FreeImage:
-- 
cgit v1.2.3