summaryrefslogtreecommitdiff
path: root/source/ap/nano
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/ap/nano
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
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/ap/nano')
-rwxr-xr-xsource/ap/nano/nano.SlackBuild11
-rw-r--r--source/ap/nano/slack-desc10
2 files changed, 11 insertions, 10 deletions
diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index b1833597..c3f8aed3 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -30,15 +30,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
# 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 ) ;;
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
ARCHQUADLET=""
elif [ "$ARCH" = "s390" ]; then
@@ -85,12 +85,13 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--infodir=/usr/info \
--mandir=/usr/man \
+ --docdir=/usr/doc/nano-$VERSION \
+ --datadir=/usr/share \
--program-prefix= \
--program-suffix= \
--enable-color \
--enable-multibuffer \
--enable-nanorc \
- --enable-all \
--enable-utf8 \
--disable-wrapping-as-root \
--build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
diff --git a/source/ap/nano/slack-desc b/source/ap/nano/slack-desc
index 8b9b54c8..504755f8 100644
--- a/source/ap/nano/slack-desc
+++ b/source/ap/nano/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
nano: nano (Nano's ANOther editor, an enhanced free Pico clone)
nano:
-nano: nano is a small, free, and friendly editor from the GNU project. It
-nano: aims to copy Pico's look and feel while providing additional (or
-nano: disabled by default) features that are missing from Pico, such as
-nano: "search and replace" or "go to line and column number".
+nano: nano is a small, free, and friendly editor. It aims to copy Pico's
+nano: look and feel while providing additional (or disabled by default)
+nano: features that are missing from Pico, such as "search and replace" or
+nano: "go to line and column number".
nano:
nano: Chris Allegretta is Nano's author.
nano:
-nano:
+nano: Homepage: http://www.nano-editor.org
nano: