summaryrefslogtreecommitdiffstats
path: root/source/a/less
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/a/less
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/a/less')
-rwxr-xr-xsource/a/less/less.SlackBuild12
-rw-r--r--source/a/less/less.sysconfdir.diff15
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.