From 7500f7a27d2ef642c54d42739eeeb25e46e0bb67 Mon Sep 17 00:00:00 2001
From: Paul Wisehart <wise@lupulin.net>
Date: Thu, 13 May 2010 00:28:56 +0200
Subject: libraries/cairomm: Updated for version 1.8.0

---
 libraries/cairomm/cairomm.SlackBuild | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'libraries/cairomm/cairomm.SlackBuild')

diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild
index e9d0806d78..7b13a8691f 100644
--- a/libraries/cairomm/cairomm.SlackBuild
+++ b/libraries/cairomm/cairomm.SlackBuild
@@ -23,20 +23,25 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairomm
-VERSION=${VERSION:-1.6.4}
+VERSION=${VERSION:-1.8.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CWD=$(pwd)		
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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
@@ -54,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -68,10 +74,11 @@ cp -a AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 # API reference docs are in here, but we don't need those
 rm -rf $PKG/usr/share/doc
+rmdir $PKG/usr/share
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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}
-- 
cgit v1.2.3