4 files changed, 14 insertions, 8 deletions
diff --git a/academic/link-grammar/README b/academic/link-grammar/README
index 133d73ae15ec..d122e6690de6 100644
--- a/academic/link-grammar/README
+++ b/academic/link-grammar/README
@@ -5,4 +5,4 @@ connecting pairs of words. The parser also produces a "constituent" (Penn
 tree-bank style phrase tree) representation of a sentence (showing noun
 phrases, verb phrases, etc.).
 
-This SlackBuild requires apache-ant and JDK (from /extra).
+This requires the jdk package (from /extra) and apache-ant.
diff --git a/academic/link-grammar/link-grammar.SlackBuild b/academic/link-grammar/link-grammar.SlackBuild
index c305e3999749..3723823d5e2d 100644
--- a/academic/link-grammar/link-grammar.SlackBuild
+++ b/academic/link-grammar/link-grammar.SlackBuild
@@ -6,7 +6,7 @@
 # This work is in the public domain
 
 PRGNAM=link-grammar
-VERSION=${VERSION:-4.3.7}
+VERSION=${VERSION:-4.5.8}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -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 
@@ -43,6 +46,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -68,4 +72,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/academic/link-grammar/link-grammar.info b/academic/link-grammar/link-grammar.info
index fc465325be93..7111b8da9e65 100644
--- a/academic/link-grammar/link-grammar.info
+++ b/academic/link-grammar/link-grammar.info
@@ -1,8 +1,10 @@
 PRGNAM="link-grammar"
-VERSION="4.3.7"
+VERSION="4.5.8"
 HOMEPAGE="http://www.abisource.org/projects/link-grammar/"
-DOWNLOAD="http://www.abisource.com/downloads/link-grammar/4.3.7/link-grammar-4.3.7.tar.gz"
-MD5SUM="6595a6c726a1e4388074f95ed04b7d10"
+DOWNLOAD="http://www.abisource.com/downloads/link-grammar/4.5.8/link-grammar-4.5.8.tar.gz"
+MD5SUM="2a68294ca315c1ca3bceb33bb8982a29"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michael Gabilondo"
 EMAIL="mgabilo{at}gmail{dot}com"
 APPROVED="rworkman"
diff --git a/academic/link-grammar/slack-desc b/academic/link-grammar/slack-desc
index caa738406f74..1bc48091bab8 100644
--- a/academic/link-grammar/slack-desc
+++ b/academic/link-grammar/slack-desc
@@ -7,7 +7,7 @@
 
             |-----handy-ruler-------------------------------------------------|
 link-grammar: Link Grammar Parser (syntactic parser of English)
-link-grammar: 
+link-grammar:
 link-grammar: The Link Grammar Parser is a syntactic parser of English, based
 link-grammar: on link grammar, an original theory of English syntax. Given a 
 link-grammar: sentence, the system assigns to it a syntactic structure, which 
@@ -15,5 +15,5 @@ link-grammar: consists of a set of labeled links connecting pairs of words.
 link-grammar: The parser also produces a "constituent" (Penn tree-bank style 
 link-grammar: phrase tree) representation of a sentence (showing noun phrases,
 link-grammar: verb phrases, etcetera).
-link-grammar: 
+link-grammar:
 link-grammar: Homepage: http://www.abisource.org/projects/link-grammar/