1 files changed, 31 insertions, 10 deletions
diff --git a/source/l/pcre/pcre.SlackBuild b/source/l/pcre/pcre.SlackBuild
index dd072319..0b589350 100755
--- a/source/l/pcre/pcre.SlackBuild
+++ b/source/l/pcre/pcre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=7.7
-ARCH=${ARCH:-x86_64}
+PKGNAM=pcre
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | 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
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -36,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -51,6 +64,7 @@ tar xvf $CWD/pcre-$VERSION.tar.bz2 || exit 1
 cd pcre-$VERSION
 
 chown -R root:root .
+
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
   -exec chmod 755 {} \; -o \
@@ -91,17 +105,24 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-mkdir -p $PKG/usr/doc/pcre-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL LICENCE NEWS NON-UNIX-USE README \
-  $PKG/usr/doc/pcre-$VERSION
-cd doc
-cp -a Tech.Notes html $PKG/usr/doc/pcre-$VERSION
-chown -R root:root $PKG/usr/doc/pcre-$VERSION
 # Eliminate redundant docs:
 rm -rf $PKG/usr/share/doc
 rmdir $PKG/usr/share
 
+mkdir -p $PKG/usr/doc/pcre-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL HACKING LICENCE NEWS NON-UNIX-USE README* \
+  $PKG/usr/doc/pcre-$VERSION
+( cd doc ; cp -a Tech.Notes html $PKG/usr/doc/pcre-$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 ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc