From e1ee9cc8e520fa1739ee09519c0f82a7a94be6bf Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Thu, 13 May 2010 00:33:45 +0200
Subject: libraries/wv: Updated for version 1.2.4

---
 libraries/wv/README        |  8 ++++----
 libraries/wv/wv.SlackBuild | 19 ++++++++++++-------
 libraries/wv/wv.info       | 10 ++++++----
 3 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'libraries')

diff --git a/libraries/wv/README b/libraries/wv/README
index 4154e0388c..4e502b1c5e 100644
--- a/libraries/wv/README
+++ b/libraries/wv/README
@@ -1,5 +1,5 @@
 wv (MS Word document import library)
-wv converts Word 2,6,7,8,9 files to html and latex. 
-The Word 2 conversion is still incomplete (no formatting), 
-but it will do a passable job extracting the text, which 
-is what you probably want anyway.
+
+wv converts Word 2,6,7,8,9 files to html and latex. The Word 2 conversion is 
+still incomplete (no formatting), but it will do a passable job extracting 
+the text, which is what you probably want anyway.
diff --git a/libraries/wv/wv.SlackBuild b/libraries/wv/wv.SlackBuild
index 2c06c44d62..a727f75c70 100644
--- a/libraries/wv/wv.SlackBuild
+++ b/libraries/wv/wv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wv
 
-# Copyright 2008 Robby Workman, Northport, Alabama, USA
+# Copyright 2008-2009 Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wv
-VERSION=1.2.1
+VERSION=1.2.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -60,19 +63,21 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 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 || 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 || true
 )
 
 ( cd $PKG/usr/man
@@ -88,4 +93,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/libraries/wv/wv.info b/libraries/wv/wv.info
index e8431f4220..4d79aa1348 100644
--- a/libraries/wv/wv.info
+++ b/libraries/wv/wv.info
@@ -1,8 +1,10 @@
 PRGNAM="wv"
-VERSION="1.2.1"
+VERSION="1.2.4"
 HOMEPAGE="http://wvware.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/wvware/wv-1.2.1.tar.gz"
-MD5SUM="d757080af4595839d5d82a1a573c692c"
+DOWNLOAD="http://downloads.sourceforge.net/wvware/wv-1.2.4.tar.gz"
+MD5SUM="c1861c560491f121e12917fa76970ac5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="David Somero"
+APPROVED="pprkut"
-- 
cgit v1.2.3