Thu Jul 29 01:45:40 UTC 2010

a/aaa_terminfo-5.7-x86_64-2.txz:  Rebuilt.
a/dialog-1.1_20100428-x86_64-1.txz:  Upgraded.
a/ed-1.4-x86_64-1.txz:  Upgraded.
a/grep-2.6.3-x86_64-1.txz:  Upgraded.
a/hdparm-9.29-x86_64-1.txz:  Upgraded.
a/mtx-1.3.12-x86_64-1.txz:  Upgraded.
a/ncompress-4.2.4.3-x86_64-1.txz:  Upgraded.
a/patch-2.6.1-x86_64-1.txz:  Upgraded.
a/procps-3.2.8-x86_64-1.txz:  Upgraded.
a/sharutils-4.9-x86_64-1.txz:  Upgraded.
a/tcsh-6.17.00-x86_64-1.txz:  Upgraded.
a/tree-1.5.3-x86_64-1.txz:  Upgraded.
a/utempter-1.1.5-x86_64-1.txz:  Upgraded.
a/zoo-2.10_22-x86_64-1.txz:  Upgraded.
ap/a2ps-4.14-x86_64-5.txz:  Rebuilt.
ap/acct-6.5.4-x86_64-1.txz:  Upgraded.
ap/at-3.1.12-x86_64-1.txz:  Upgraded.
ap/aumix-2.9.1-x86_64-1.txz:  Upgraded.
ap/cdrdao-1.2.3-x86_64-1.txz:  Upgraded.
ap/diffstat-1.53-x86_64-1.txz:  Upgraded.
ap/enscript-1.6.5.2-x86_64-1.txz:  Upgraded.
ap/groff-1.20.1-x86_64-2.txz:  Rebuilt.
  Patched a bug in doc.tmac.  Thanks to Willy Sudiarto Raharjo.
ap/joe-3.7-x86_64-1.txz:  Upgraded.
ap/jove-4.16.0.73-x86_64-1.txz:  Upgraded.
ap/ksh93-2010_06_21-x86_64-1.txz:  Upgraded.
ap/linuxdoc-tools-0.9.66-x86_64-3.txz:  Rebuilt.
ap/lsscsi-0.24b1-x86_64-1.txz:  Upgraded.
ap/sc-7.16-x86_64-3.txz:  Rebuilt.
ap/texinfo-4.13a-x86_64-4.txz:  Rebuilt.
ap/sox-14.3.1-x86_64-1.txz:  Upgraded.
ap/vorbis-tools-1.4.0-x86_64-1.txz:  Upgraded.
ap/workbone-2.40-x86_64-4.txz:  Rebuilt.
d/gperf-3.0.4-x86_64-1.txz:  Upgraded.
d/make-3.82-x86_64-1.txz:  Upgraded.
d/pkg-config-0.25-x86_64-1.txz:  Upgraded.
d/strace-4.5.20-x86_64-1.txz:  Upgraded.
l/jre-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Runtime Environment
  Version 6.0 update 20.
l/libao-1.0.0-x86_64-1.txz:  Upgraded.
l/libvorbis-1.3.1-x86_64-1.txz:  Upgraded.
l/libogg-1.2.0-x86_64-1.txz:  Upgraded.
n/samba-3.5.4-x86_64-1.txz:  Upgraded.
extra/jdk-6/jdk-6u21-x86_64-1.txz:  Upgraded.
  Upgraded to Java(TM) 2 Platform Standard Edition Development Kit
  Version 6.0 update 21.

1 files changed, 26 insertions, 14 deletions

diff --git a/slackware64-current/source/a/grep/grep.SlackBuild b/slackware64-current/source/a/grep/grep.SlackBuild
index 1b2ac8e7e..0d182dac4 100755
--- a/slackware64-current/source/a/grep/grep.SlackBuild
+++ b/slackware64-current/source/a/grep/grep.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,12 +20,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=${VERSION:-2.5.4}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-2.6.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# 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
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-grep
@@ -39,13 +48,16 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf grep-$VERSION
-tar xvf $CWD/grep-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/grep-$VERSION.tar.xz || exit 1
 cd grep-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -60,6 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --bindir=/bin \
   --mandir=/usr/man \
   --infodir=/usr/info \
+  --docdir=/usr/doc/grep-$VERSION \
   --disable-perl-regexp \
   --build=$ARCH-slackware-linux
 
@@ -69,15 +82,6 @@ make install DESTDIR=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# ****************************************************************************
-# Makefile installs different binaries for each of grep, egrep, and fgrep
-# This is how we used to do it...
-#( cd $PKG/bin
-#  rm -f egrep ; ln -sf grep egrep
-#  rm -f fgrep ; ln -sf grep fgrep
-#)
-# ****************************************************************************
-
 # Make symlinks in /usr/bin:
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
@@ -98,9 +102,17 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/grep-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+  AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
   $PKG/usr/doc/grep-$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/*-$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