3 files changed, 28 insertions, 14 deletions
diff --git a/office/catdoc/catdoc.SlackBuild b/office/catdoc/catdoc.SlackBuild
index eddcd82466cc..44104ff2d48a 100644
--- a/office/catdoc/catdoc.SlackBuild
+++ b/office/catdoc/catdoc.SlackBuild
@@ -8,7 +8,7 @@
 PRGNAM=catdoc
 VERSION=${VERSION:-0.94.2}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -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,10 +47,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-debug
+  --disable-debug \
+  --build=$ARCH-slackware-linux
 
 make
 
@@ -61,6 +66,13 @@ cd doc
   cp -a catdoc.1 catppt.1 wordview.1 xls2csv.1 $PKG/usr/man/man1
 cd -
 
+mkdir -p $PKG/usr/share/catdoc
+cd charsets
+  rename .rpl .replchars *.rpl
+  rename .spc .specchars *.spc
+  cp -a *.txt *.replchars *.specchars $PKG/usr/share/catdoc
+cd -
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -74,13 +86,13 @@ cd -
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CODING.STD COPYING CREDITS INSTALL INSTALL.dos NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CODING.STD COPYING CREDITS INSTALL INSTALL.dos NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 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}
diff --git a/office/catdoc/catdoc.info b/office/catdoc/catdoc.info
index 7f487b85a478..0cec631070ce 100644
--- a/office/catdoc/catdoc.info
+++ b/office/catdoc/catdoc.info
@@ -1,8 +1,10 @@
 PRGNAM="catdoc"
 VERSION="0.94.2"
-HOMEPAGE="http://vitus.wagner.pp.ru/software/catdoc/"
+HOMEPAGE="http://vitus.wagner.pp.ru/~vitus/software/catdoc/"
 DOWNLOAD="http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz"
 MD5SUM="243e1680bb3e703616f5adecfee24491"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/office/catdoc/slack-desc b/office/catdoc/slack-desc
index 1ddd97d7e4fe..eed2b7042ff0 100644
--- a/office/catdoc/slack-desc
+++ b/office/catdoc/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 catdoc: catdoc (console MS Word files reader)
-catdoc: 
+catdoc:
 catdoc: catdoc reads MS Word file and prints readable ASCII text to stdout,
 catdoc: just like Unix cat command. It also able to produce correct escape
 catdoc: sequences if some UNICODE characters have to be represented specially
 catdoc: in your typesetting system such as (La)TeX.
-catdoc: 
-catdoc: 
-catdoc: 
-catdoc: 
-catdoc: 
+catdoc:
+catdoc:
+catdoc:
+catdoc:
+catdoc: