5 files changed, 51 insertions, 46 deletions
diff --git a/office/abiword/README b/office/abiword/README
index 4b7be7d8a70e3..c1ae0a4a123fc 100644
--- a/office/abiword/README
+++ b/office/abiword/README
@@ -2,6 +2,6 @@ The AbiWord word processor is a lightweight and featureful
 productivity tool that is suitable for a wide variety of word
 processing tasks.
 
-AbiWord requires libgnomecanvas and libgnomeprintui, and due
-to those requirements, libgnomeprint and libgnomecups, all of
-which are available at SlackBuilds.org
+AbiWord requires gail, wv, libgnomecanvas, libgnomeprintui, 
+libgnomeprint, libgnomecups, and enchant, all of which are 
+available at SlackBuilds.org
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 4cdae80d84406..bede317460bac 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -22,13 +22,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
+# Now maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=abiword
-VERSION=2.4.6
+VERSION=2.6.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,18 +37,26 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION/abi || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -55,31 +64,29 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-gnome \
-  --disable-enchant \
-  || exit 1
-  
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT CREDITS.TXT \
-  README.TXT ../abiword-docs/Tutorials ../abiword-docs/Manual \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+  --enable-threads \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
-# Install the man page
-mkdir -p $PKG/usr/man/man1
-cat ../abiword-docs/man/abiword.1 | gzip -9 > $PKG/usr/man/man1/abiword.1.gz
+make
+make install DESTDIR=$PKG
 
-# Empty directory can go (unless someone has a valid reason for it to stay)
-# /usr/lib/bonobo  <-- nothing is in /usr/lib at all otherwise
-rm -rf $PKG/usr/lib
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # No need to clutter up the toplevel /usr/share/icons
 mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT CREDITS.TXT \
+  README.TXT  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index ba9a85c1fc8ad..537b38363305c 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,8 +1,8 @@
 PRGNAM="abiword"
-VERSION="2.4.6"
+VERSION="2.6.4"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://www.abisource.com/downloads/abiword/2.4.6/source/abiword-2.4.6.tar.gz"
-MD5SUM="30fbd0a9b539f15f54f90d3812a75266"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@sekurity.com"
-APPROVED="rworkman"
+DOWNLOAD="http://www.abisource.com/downloads/abiword/2.6.4/source/abiword-2.6.4.tar.gz"
+MD5SUM="16748b2d6e318e0e2a25581005e1943a"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED="Erik Hanson"
diff --git a/office/abiword/doinst.sh b/office/abiword/doinst.sh
index cbc484f9f170c..6c07a9fbbc304 100644
--- a/office/abiword/doinst.sh
+++ b/office/abiword/doinst.sh
@@ -1,3 +1,9 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
+fi
+
diff --git a/office/abiword/slack-desc b/office/abiword/slack-desc
index 406d1a41dc139..171be227a306c 100644
--- a/office/abiword/slack-desc
+++ b/office/abiword/slack-desc
@@ -1,12 +1,4 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-abiword: abiword (The AbiWord Word Processor)
+abiword: The AbiWord Word Processor
 abiword: 
 abiword: The AbiWord word processor is a lightweight and featureful
 abiword: productivity tool that is suitable for a wide variety of word