From b76270bf9e6dd375e495fec92140a79a79415d27 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 19 May 2010 08:58:23 +0000
Subject: Slackware 13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!
---
 source/a/less/less.SlackBuild | 31 ++++++++++++++++++++-----------
 source/a/less/lesspipe.sh     |  1 +
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'source/a/less')

diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild
index 64335957..49a15eed 100755
--- a/source/a/less/less.SlackBuild
+++ b/source/a/less/less.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005-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
@@ -21,19 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-less
+VERSION=${VERSION:-$(echo less-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
-VERSION=${VERSION:-418}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+# 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" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -45,14 +48,20 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-less
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf less-$VERSION
-tar xvf $CWD/less-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/less-$VERSION.tar.?z* || exit 1
 cd less-$VERSION
 zcat $CWD/less.sysconfdir.diff.gz | patch -p1 --verbose || exit 1
 
diff --git a/source/a/less/lesspipe.sh b/source/a/less/lesspipe.sh
index 2d660522..7850a488 100644
--- a/source/a/less/lesspipe.sh
+++ b/source/a/less/lesspipe.sh
@@ -45,6 +45,7 @@ lesspipe() {
   *.1.gz|*.2.gz|*.3.gz|*.4.gz|*.5.gz|*.6.gz|*.7.gz|*.8.gz|*.9.gz|*.n.gz|*.man.gz) # compressed *roff src?
     if gzip -dc "$1" | file - | grep roff 1> /dev/null ; then
       gzip -dc "$1" | nroff -S -mandoc -
+    else gzip -dc "$1"  2>/dev/null
     fi ;;
   *.1.bz2|*.2.bz2|*.3.bz2|*.4.bz2|*.5.bz2|*.6.bz2|*.7.bz2|*.8.bz2|*.9.bz2|*.n.bz2|*.man.bz2) # compressed *roff src?
     if bzip2 -dc "$1" | file - | grep roff 1> /dev/null ; then
-- 
cgit v1.2.3