academic/sword: Updated for version 1.6.0

4 files changed, 28 insertions, 24 deletions

diff --git a/academic/sword/README b/academic/sword/README
index 1fad26933c..98b6678b10 100644
--- a/academic/sword/README
+++ b/academic/sword/README
@@ -1,8 +1,7 @@
-The SWORD Project is an effort to create an ever expanding
-software package for research and study of God and His Word.
-The SWORD Bible Framework allows easy manipulation of Bible
-texts, commentaries, lexicons, dictionaries, etc. Many
-frontends are build using this framework. An installed module
-set may be shared between any frontend using the framework.
+The SWORD Project is an effort to create an ever expanding software package 
+for research and study of God and His Word.  The SWORD Bible Framework allows 
+easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc. 
+Many frontends are build using this framework. An installed module set may 
+be shared between any frontend using the framework.  
 
-Requires icu4c, also available from SlackBuilds.org
\ No newline at end of file
+This requires icu4c.
diff --git a/academic/sword/slack-desc b/academic/sword/slack-desc
index 4238f22145..4975d3cb58 100644
--- a/academic/sword/slack-desc
+++ b/academic/sword/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-------------------------------------------------------|
 sword: sword (Bible Text Manipluation Framework)
 sword:
-sword: The SWORD Project is an effort to create an ever expanding
-sword: software package for research and study of God and His Word.
-sword: The SWORD Bible Framework allows easy manipulation of Bible
-sword: texts, commentaries, lexicons, dictionaries, etc. Many
-sword: frontends are build using this framework. An installed module
-sword: set may be shared between any frontend using the framework.
+sword: The SWORD Project is an effort to create an ever expanding software
+sword: package for research and study of God and His Word. The SWORD Bible
+sword: Framework allows easy manipulation of Bible texts, commentaries,
+sword: lexicons, dictionaries, etc. Many frontends are build using this
+sword: framework. An installed module set may be shared between any
+sword: frontend using the framework.
 sword:
 sword: Homepage: http://www.crosswire.org/sword
 sword:
diff --git a/academic/sword/sword.SlackBuild b/academic/sword/sword.SlackBuild
index 57cebe857c..24b690a00c 100644
--- a/academic/sword/sword.SlackBuild
+++ b/academic/sword/sword.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sword
 
-# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
 # 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=sword
-VERSION=1.5.11
+VERSION=1.6.0
 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" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -60,12 +63,12 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-static \
   --with-icu \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -82,4 +85,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/sword/sword.info b/academic/sword/sword.info
index 9b3c76f4c2..a68b274b0e 100644
--- a/academic/sword/sword.info
+++ b/academic/sword/sword.info
@@ -1,8 +1,10 @@
 PRGNAM="sword"
-VERSION="1.5.11"
+VERSION="1.6.0"
 HOMEPAGE="http://www.crosswire.org/sword"
-DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.11.tar.gz"
-MD5SUM="84a13fd3cf767902de91368424f30baa"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.6/sword-1.6.0.tar.gz"
+MD5SUM="292ca38b2427168b19d629b48a428dde"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="Erik Hanson"