diff options
Diffstat (limited to 'source/a/less')
| -rwxr-xr-x | source/a/less/less.SlackBuild | 12 | ||||
| -rw-r--r-- | source/a/less/less.sysconfdir.diff | 15 |
2 files changed, 7 insertions, 20 deletions
diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild index 49a15eed4..3e6908daf 100755 --- a/source/a/less/less.SlackBuild +++ b/source/a/less/less.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -36,8 +36,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -63,7 +63,9 @@ cd $TMP rm -rf less-$VERSION tar xvf $CWD/less-$VERSION.tar.?z* || exit 1 cd less-$VERSION -zcat $CWD/less.sysconfdir.diff.gz | patch -p1 --verbose || exit 1 + +# Fix path in manpage: +sed -i "s,/usr/local/etc,/etc,g" less.nro chown -R root:root . find . \ diff --git a/source/a/less/less.sysconfdir.diff b/source/a/less/less.sysconfdir.diff deleted file mode 100644 index 25c5bb584..000000000 --- a/source/a/less/less.sysconfdir.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./less.nro.orig Mon May 27 17:14:24 2002 -+++ ./less.nro Mon May 27 17:14:46 2002 -@@ -947,10 +947,10 @@ - Otherwise, - .I less - looks in a standard place for the system-wide lesskey file: --On Unix systems, the system-wide lesskey file is /usr/local/etc/sysless. -+On Unix systems, the system-wide lesskey file is /etc/sysless. - (However, if - .I less --was built with a different sysconf directory than /usr/local/etc, -+was built with a different sysconf directory than /etc, - that directory is where the sysless file is found.) - On MS-DOS and Windows systems, the system-wide lesskey file is c:\\_sysless. - On OS/2 systems, the system-wide lesskey file is c:\\sysless.ini. |