From 4ea08f54913cb9b27631905c57f1adcfb9b599f5 Mon Sep 17 00:00:00 2001
From: luoyi <luoyi.ly@gmail.com>
Date: Thu, 13 May 2010 00:34:10 +0200
Subject: misc/fcitx: Updated for version 3.6.0

---
 misc/fcitx/fcitx.SlackBuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'misc/fcitx/fcitx.SlackBuild')

diff --git a/misc/fcitx/fcitx.SlackBuild b/misc/fcitx/fcitx.SlackBuild
index 3fd3565d6967..244cb8c6528a 100644
--- a/misc/fcitx/fcitx.SlackBuild
+++ b/misc/fcitx/fcitx.SlackBuild
@@ -5,8 +5,8 @@
 
 # Modified by the slackbuilds.org project.  --michiel
 PRGNAM=fcitx
-VERSION=${VERSION:-3.6.0rc}
-SRCVER=${PKGVER:-3.6.0-rc}
+VERSION=${VERSION:-3.6}
+SRCVER=${PKGVER:-3.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,10 +18,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
@@ -44,6 +47,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -61,7 +65,7 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/etc/profile.d
 cat $CWD/fcitx.sh > $PKG/etc/profile.d/fcitx.sh
-chmod 755 $PKG/etc/profile.d/fcitx.sh
+chmod 0755 $PKG/etc/profile.d/fcitx.sh
 
 sed -i -e 's/^/#/' $PKG/usr/share/fcitx/data/tables.conf 
 cat $CWD/fcitx.config > $PKG/usr/share/fcitx/data/config
@@ -76,4 +80,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}
-- 
cgit v1.2.3