4 files changed, 36 insertions, 38 deletions
diff --git a/libraries/xapian-core/README b/libraries/xapian-core/README
index fd10516c95..dbb5e5dd47 100644
--- a/libraries/xapian-core/README
+++ b/libraries/xapian-core/README
@@ -1,8 +1,7 @@
-Xapian is an Open Source Search Engine Library, released under 
-the GPL. It's written in C++, with bindings to allow use from 
-Perl, Python, PHP, Java, Tcl, C#, and Ruby (so far!) Xapian is 
-a highly adaptable toolkit which allows developers to easily 
-add advanced indexing and search facilities to their own 
-applications. It supports the Probabilistic Information 
-Retrieval model and also supports a rich set of boolean query 
-operators.
+Xapian is an Open Source Search Engine Library released under the GPL. 
+It's written in C++, with bindings to allow use from Perl, Python, PHP, 
+Java, Tcl, C#, and Ruby (so far!).  Xapian is a highly adaptable toolkit 
+which allows developers to easily add advanced indexing and search 
+facilities to their own applications.  It supports the Probabilistic 
+Information Retrieval model and also supports a rich set of boolean 
+query operators.
diff --git a/libraries/xapian-core/slack-desc b/libraries/xapian-core/slack-desc
index 4a8b93903d..859757c4db 100644
--- a/libraries/xapian-core/slack-desc
+++ b/libraries/xapian-core/slack-desc
@@ -4,15 +4,17 @@
 # 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------------------------------------------------------|
+
+           |-----handy-ruler------------------------------------------------------|
 xapian-core: xapian-core (search engine library)
 xapian-core: 
-xapian-core: Xapian is an Open Source Search Engine Library, released under 
-xapian-core: the GPL. It's written in C++, with bindings to allow use from 
-xapian-core: Perl, Python, PHP, Java, Tcl, C#, and Ruby (so far!) Xapian is 
-xapian-core: a highly adaptable toolkit which allows developers to easily 
-xapian-core: add advanced indexing and search facilities to their own 
-xapian-core: applications. It supports the Probabilistic Information 
-xapian-core: Retrieval model and also supports a rich set of boolean query 
-xapian-core: operators.
+xapian-core: Xapian is an Open Source Search Engine Library released under the GPL.
+xapian-core: It's written in C++, with bindings to allow use from Perl, Python,
+xapian-core: PHP, Java, Tcl, C#, and Ruby (so far!).   Xapian is a highly adaptable
+xapian-core: toolkit which allows developers to easily add advanced indexing and 
+xapian-core: search facilities to their own applications.  It supports the
+xapian-core: Probabilistic Information Retrieval model and also supports a rich 
+xapian-core: set of boolean query operators.
+xapian-core:
 xapian-core: http://www.xapian.org/
+xapian-core:
diff --git a/libraries/xapian-core/xapian-core.SlackBuild b/libraries/xapian-core/xapian-core.SlackBuild
index 724baa51e2..e5ce3d5956 100644
--- a/libraries/xapian-core/xapian-core.SlackBuild
+++ b/libraries/xapian-core/xapian-core.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for xapian-core
 
-# Copyright 2007-2009 by titopoquito (titopoquito@gmail.com)
+# Written by titopoquito (titopoquito@gmail.com)
+
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
 #   the above copyright notice and this permission notice appear in all
@@ -21,19 +22,15 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org Project
-
 PRGNAM=xapian-core
-VERSION=1.0.13
+VERSION=${VERSION:-1.0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -66,7 +63,11 @@ rm -rf $PRGNAM-$VERSION
 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" \
@@ -76,6 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
   --build=$ARCH-slackware-linux
 
@@ -85,21 +87,16 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS HACKING PLATFORMS README \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Some doc files have been copied to $PKG/usr/share/doc, move them over to
-# /usr/doc so that they will be in $PRGNAM-$VERSION and not in $PRGNAM
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+# We don't need api docs, I don't think  --rworkman
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/apidoc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/xapian-core/xapian-core.info b/libraries/xapian-core/xapian-core.info
index f3b8dbb134..fec4e75e0c 100644
--- a/libraries/xapian-core/xapian-core.info
+++ b/libraries/xapian-core/xapian-core.info
@@ -1,10 +1,10 @@
 PRGNAM="xapian-core"
-VERSION="1.0.13"
+VERSION="1.0.21"
 HOMEPAGE="http://www.xapian.org/"
-DOWNLOAD="http://oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz"
-MD5SUM="5442e7ffc75abd853d1ab1d12667a3e9"
+DOWNLOAD="http://oligarchy.co.uk/xapian/1.0.21/xapian-core-1.0.21.tar.gz"
+MD5SUM="30188ec418c9cc48b43b86df577fd165"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="titopoquito"
 EMAIL="titopoquito@gmail.com"
-APPROVED="dsomero,rworkman"
+APPROVED="rworkman"