silc-client, silc-plugin and libwpd updates

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1246 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/net/im/silc-client/silc-client.SlackBuild b/net/im/silc-client/silc-client.SlackBuild
index 9f536554d4eafc9038971f83f3044c4a3b1416a4..4333d5786038255675ce85e4985795d5d904d5a9 100755 (executable)
--- a/net/im/silc-client/silc-client.SlackBuild
+++ b/net/im/silc-client/silc-client.SlackBuild
@@ -37,7 +37,7 @@ fi
 
 # default settings
 PACKAGE="silc-client"
-VERSION=${VERSION:=1.1-beta5}
+VERSION=${VERSION:=1.1-beta6}
 ARCH="${ARCH:=i486}"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}

diff --git a/net/im/silc-client/silc-client.build b/net/im/silc-client/silc-client.build
index 59d76cf125548a48208b9ad0d1444fb64f650a36..ab41f0add2c8602967cdacf09679ddbfae7d80a5 100755 (executable)
--- a/net/im/silc-client/silc-client.build
+++ b/net/im/silc-client/silc-client.build
@@ -44,14 +44,16 @@ fi
 # default settings
 PACKAGE="silc-client"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.1-beta5}
+VERSION=${VERSION:=1.1-beta6}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
+  export CFLAGS=-fPIC
   LIBDIR=/usr/lib64
+  #CONF_OPTIONS="--disable-asm"
   CONF_OPTIONS="--with-pic"
 else
   LIBDIR=/usr/lib
@@ -91,7 +93,7 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
   patch -p1 < $CWD/$PACKAGE-$VERSION.diff
 fi
 
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION $CONF_OPTIONS
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION "$CONF_OPTIONS"
 make || exit 32
 make install
 

diff --git a/net/im/silc-plugin/silc-plugin.SlackBuild b/net/im/silc-plugin/silc-plugin.SlackBuild
index 12ffdc49179683a9be9295c7bb2db2de5f97f03d..ddcb8fbabd11da6f76c50bfa671850c365a3893f 100755 (executable)
--- a/net/im/silc-plugin/silc-plugin.SlackBuild
+++ b/net/im/silc-plugin/silc-plugin.SlackBuild
@@ -37,7 +37,7 @@ fi
 
 # default settings
 PACKAGE="silc-plugin"
-VERSION=${VERSION:=1.1-beta5}
+VERSION=${VERSION:=1.1-beta6}
 ARCH="${ARCH:=i486}"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}

diff --git a/net/im/silc-plugin/silc-plugin.build b/net/im/silc-plugin/silc-plugin.build
index 0662708c010705d730e751d6094633c0dcc1cdec..f0bc7aa7c866b688fe0cd029ccca539e573e5d64 100755 (executable)
--- a/net/im/silc-plugin/silc-plugin.build
+++ b/net/im/silc-plugin/silc-plugin.build
@@ -44,14 +44,19 @@ fi
 # default settings
 PACKAGE="silc-plugin"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.1-beta5}
+VERSION=${VERSION:=1.1-beta6}
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
 
 if [ "$ARCH" == "x86_64" ]; then
+  export CFLAGS=-fPIC
   LIBDIR=/usr/lib64
+  #CONF_OPTIONS="--disable-asm"
+  #CONF_OPTIONS="--with-pic --disable-asm --with-pthreads=no"
+  export LDFLAGS="-L/lib64 -L/usr/lib64"
+  CONF_OPTIONS="--with-pic --with-pthreads=no --with-iconv=no"
 else
   LIBDIR=/usr/lib
 fi
@@ -84,8 +89,9 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
   patch -p1 < $CWD/$PACKAGE-$VERSION.diff
 fi
 
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION \
-            --enable-silc-plugin --without-silc-includes --with-simdir=$LIBDIR/irssi
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR $CONF_OPTIONS \
+            --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION \
+            --enable-silc-plugin --without-silc-includes --with-simdir=$LIBDIR/irssi/modules
 make || exit 32
 make install
 

diff --git a/patches/libwpd/libwpd.SlackBuild b/patches/libwpd/libwpd.SlackBuild
index 2884ff41704b9748808e9d1e5fe6d49dbd2109a1..7dd789abfd8cd72df6bcc4685784d12badd04aa0 100755 (executable)
--- a/patches/libwpd/libwpd.SlackBuild
+++ b/patches/libwpd/libwpd.SlackBuild
@@ -62,6 +62,9 @@ PACKAGE_EXT="gz"
 SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
 URL="http://easynews.dl.sourceforge.net/sourceforge/libwpd/$SRC"
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+mkdir -p $SRC_DIR
+
 if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi