5 files changed, 60 insertions, 17 deletions
diff --git a/office/aiksaurus/README b/office/aiksaurus/README
index a404186e4b..736094f721 100644
--- a/office/aiksaurus/README
+++ b/office/aiksaurus/README
@@ -1,12 +1,12 @@
-Aiksaurus is a set of libraries and applications which provide a thesaurus 
-(currently English only, based on Guttenburg's Moby thesaurus) using native 
-GUI on several platforms: UNIX (GTK+ & Qt), Win32 & MacOSX (Cocoa). The core 
-library itself is platform-independent. The principal language is C++, with 
-some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC.
+Aiksaurus is a set of libraries and applications which provide a thesaurus
+(currently English only, based on Guttenburg's Moby thesaurus) using native
+GUI on several platforms: UNIX (GTK+ & Qt), Win32 & MacOSX (Cocoa). The
+core library itself is platform-independent. The principal language is C++,
+with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC.
 
-Aiksausus plugins exist for AbiWord on UNIX and Win32; the library is also 
-used by Lyx; and the new Cocoa port provides a MacOSX NSService hook so that 
-Safari and other such applications can use this thesaurus without Aiksaurus
-specific development.
+Aiksausus plugins exist for AbiWord on UNIX and Win32; the library is also
+used by Lyx; and the new Cocoa port provides a MacOSX NSService hook so
+that Safari and other such applications can use this thesaurus without
+Aiksaurus-specific development.
 
-Use the command "aiksaurus" for cli component and "gaiksaurus" for gtk frontend.
+Use the command aiksaurus for cli component and gaiksaurus for gtk frontend.
diff --git a/office/aiksaurus/aiksaurus.SlackBuild b/office/aiksaurus/aiksaurus.SlackBuild
index 7fce2e5a9c..e9b865e537 100644
--- a/office/aiksaurus/aiksaurus.SlackBuild
+++ b/office/aiksaurus/aiksaurus.SlackBuild
@@ -40,6 +40,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -57,10 +58,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/include-fixes.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -76,9 +80,13 @@ make install DESTDIR=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS COPYING ChangeLog README README.W32 $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/aiksaurus/aiksaurus.info b/office/aiksaurus/aiksaurus.info
index aeded5da10..8003e15fe8 100644
--- a/office/aiksaurus/aiksaurus.info
+++ b/office/aiksaurus/aiksaurus.info
@@ -1,8 +1,10 @@
 PRGNAM="aiksaurus"
 VERSION="1.2.1"
 HOMEPAGE="http://aiksaurus.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/aiksaurus/aiksaurus-1.2.1.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz"
 MD5SUM="3eae03b7c49843ccc9262e52846ea6b4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@unrealize.co.uk"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/office/aiksaurus/include-fixes.patch b/office/aiksaurus/include-fixes.patch
new file mode 100644
index 0000000000..012c3c1d56
--- /dev/null
+++ b/office/aiksaurus/include-fixes.patch
@@ -0,0 +1,33 @@
+diff -ur aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp aiksaurus-1.2.1/base/aiksaurus.t.cpp
+--- aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp	2003-06-27 02:44:38.000000000 +0100
++++ aiksaurus-1.2.1/base/aiksaurus.t.cpp	2009-08-30 11:29:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ using AiksaurusImpl::AsciiCompare;
+ 
+diff -ur aiksaurus-1.2.1.orig/gtk/src/Display.h aiksaurus-1.2.1/gtk/src/Display.h
+--- aiksaurus-1.2.1.orig/gtk/src/Display.h	2002-07-11 11:09:37.000000000 +0100
++++ aiksaurus-1.2.1/gtk/src/Display.h	2009-08-30 11:28:17.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include <gtk/gtk.h>
+ #include <vector>
+ #include <string>
++#include <strings.h>
+ #include <new>
+ #include "Exception.h"
+ 
+diff -ur aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
+--- aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp	2002-01-12 02:02:12.000000000 +0000
++++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp	2009-08-30 11:29:11.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <gtk/gtk.h>
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ 
+ int main(int argc, char** argv)
diff --git a/office/aiksaurus/slack-desc b/office/aiksaurus/slack-desc
index de53c660fa..440064313a 100644
--- a/office/aiksaurus/slack-desc
+++ b/office/aiksaurus/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler-------------------------------------------------------|
+         |-----handy-ruler------------------------------------------------------|
 aiksaurus: Aiksaurus (CLI/GTK thesaurus)
-aiksaurus:
+aiksaurus: 
 aiksaurus: Aiksaurus is a set of libraries and applications which provide a 
 aiksaurus: thesaurus (currently English only, based on Guttenburg's Moby 
 aiksaurus: thesaurus) using native GUI on several platforms UNIX: (GTK+ & Qt), 
 aiksaurus: Win32 & MacOSX (Cocoa). The core library itself is platform-
 aiksaurus: independent. The principal language is C++, with some use of 
 aiksaurus: Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC.
-aiksaurus:
+aiksaurus: 
 aiksaurus: Homepage http://aiksaurus.sourceforge.net
-aiksaurus:
+aiksaurus: