Update to 1.0.4

1 files changed, 23 insertions, 36 deletions

diff --git a/xapian-core/build/xapian-core.SlackBuild b/xapian-core/build/xapian-core.SlackBuild
index 477b7722..6b7df983 100755
--- a/xapian-core/build/xapian-core.SlackBuild
+++ b/xapian-core/build/xapian-core.SlackBuild
@@ -32,6 +32,9 @@
 # Changelog:
 # 0.9.10-1:  18/May/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+#              The source is patched a bit for better cooperation with recoll.
+# 1.0.4-1:   19/nov/2007 by Eric Hameleers <alien@slackware.com>
+#            * Update - recoll 1.9.0 can use xapian-core > 1.0
 # 
 # Run 'sh xapian-core.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -41,7 +44,7 @@
 
 # Set initial variables:
 PRGNAM=xapian-core
-VERSION=${VERSION:-0.9.10}
+VERSION=${VERSION:-1.0.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
@@ -61,9 +64,9 @@ OUTPUT=${OUTPUT:-/tmp}
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL="http://www.oligarchy.co.uk/xapian/${VERSION}/${PRGNAM}-${VERSION}.tar.gz"
 
-# recoll needs this patch:
-PATCH="$SRCDIR/xapNearDistrib.patch"
-PATCHURL="http://www.recoll.org/xapian/xapNearDistrib.patch"
+# recoll needs this patch, see http://www.lesbonscomptes.com/recoll/BUGS.txt:
+PATCH="$SRCDIR/xapNearDistrib-1.0.patch"
+PATCHURL="http://www.recoll.org/xapian/xapNearDistrib-1.0.patch"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -104,36 +107,23 @@ case "$ARCH" in
              ;;
 esac
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
-
+# Create working directories:
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
-# --- SOURCE FILE AVAILABILITY ---
 
+# Source file availability:
 if ! [ -f ${SOURCE} ]; then
   if ! [ "x${SRCURL}" == "x" ]; then
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
     [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
     echo "Source '`basename ${SOURCE}`' not available yet..."
     echo "Will download file to `dirname $SOURCE`"
-    wget -nv -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 ]; then
+    wget -nv -T 10 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
@@ -167,7 +157,7 @@ if [ "$P1" == "--download" ]; then
   exit 0
 fi
 
-# --- PACKAGE BUILDING ---
+# Build the software:
 
 echo "++"
 echo "|| $PRGNAM-$VERSION"
@@ -180,12 +170,12 @@ if `file ${SOURCE} | grep -q ": bzip2"`; then
 elif `file ${SOURCE} | grep -q ": gzip"`; then
   tar -xzvf ${SOURCE}
 fi
-chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
 cd ${PRGNAM}-${VERSION}
 ( cd api
   patch -p0 < $PATCH 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
 )
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
@@ -194,8 +184,7 @@ CFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-            --datarootdir=/usr \
-            --datadir=/usr/share \
+            --mandir=/usr/man \
             --docdir=/usr/doc/$PRGNAM \
             --disable-static \
             --program-prefix="" \
@@ -204,12 +193,10 @@ CFLAGS="$SLKCFLAGS" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-#
 # Install all the needed stuff to the package dir
-#
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
-if `which installwatch  > /dev/null 2>&1`; then
+if $(which installwatch > /dev/null 2>&1); then
   installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -230,13 +217,13 @@ fi
 #mv $PKG/usr/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/
 rm -rf $PKG/usr/doc/$PRGNAM
 
-# Compress the man page(s)
+# Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
   for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Strip binaries
+# Strip binaries:
 cd $PKG
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true