1 files changed, 27 insertions, 6 deletions
diff --git a/source/n/openldap-client/openldap-client.SlackBuild b/source/n/openldap-client/openldap-client.SlackBuild
index 0131f63c..c23e17f4 100755
--- a/source/n/openldap-client/openldap-client.SlackBuild
+++ b/source/n/openldap-client/openldap-client.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,19 @@
 # OpenLDAP (clients/libraries only!)
 
 
-VERSION=2.3.43
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo openldap-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,8 +58,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf openldap-$VERSION
-tar xjvf $CWD/openldap-$VERSION.tar.bz2 || exit 1
-cd openldap-$VERSION
+tar xvf $CWD/openldap-$VERSION.tar.?z* || exit 1
+cd openldap-$VERSION || exit 1
 chown -R root:root .
 find . -perm 777 -exec chmod 755 {} \;
 find . -perm 664 -exec chmod 644 {} \;
@@ -57,6 +69,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var/lib \
   --sysconfdir=/etc \
+  --mandir=/usr/man \
   --with-cyrus-sasl \
   --with-tls \
   --with-readline \
@@ -89,9 +102,17 @@ EOF
 
 mkdir -p $PKG/usr/doc/openldap-$VERSION
 cp -a \
-  ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README \
+  ANNOUNCEMENT COPYRIGHT LICENSE README \
   $PKG/usr/doc/openldap-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+  touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
 # Remove man pages for the servers (not currently supported or shipped...
 # do they even work properly without the evil PAM?)
 find $PKG/usr/man -name slap* -exec rm -f {} \;