diff options
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 |
commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /source/ap/man | |
parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
download | current-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/man')
-rw-r--r-- | source/ap/man/doinst.sh | 7 | ||||
-rw-r--r-- | source/ap/man/makewhatis.bzcat.bugfix.diff | 18 | ||||
-rwxr-xr-x | source/ap/man/man.SlackBuild | 25 |
3 files changed, 38 insertions, 12 deletions
diff --git a/source/ap/man/doinst.sh b/source/ap/man/doinst.sh index 22fa61d1..5f73b985 100644 --- a/source/ap/man/doinst.sh +++ b/source/ap/man/doinst.sh @@ -10,5 +10,10 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config usr/lib/man.conf.new +# Move old config file if there's nothing in the way: +if [ -r usr/lib/man.conf -a ! -r etc/man.conf ]; then + mv usr/lib/man.conf etc/man.conf +fi +# Install new config file if none exists: +config etc/man.conf.new diff --git a/source/ap/man/makewhatis.bzcat.bugfix.diff b/source/ap/man/makewhatis.bzcat.bugfix.diff new file mode 100644 index 00000000..27ca6cbc --- /dev/null +++ b/source/ap/man/makewhatis.bzcat.bugfix.diff @@ -0,0 +1,18 @@ +From e488c56037adbcff4be255bb95feaedb147898e9 Mon Sep 17 00:00:00 2001 +From: mancha <mancha1 AT zoho1 DOT com> +Date: Sat, 18 Oct 2014 +Subject: awk like a boss + +"To fall-through, or not to fall-through, that is the transgression." + +--- a/src/makewhatis.sh ++++ b/src/makewhatis.sh +@@ -264,7 +264,7 @@ do + match(filename,"\\.z$") || match(filename,"\\.gz$"); + if (!use_zcat) + use_bzcat = match(filename,"\\.bz2"); +- if(!use_bzcat) ++ if (!use_bzcat && !use_zcat) + use_lzcat = match(filename,"\\.lzma"); + if (use_zcat || use_bzcat || use_lzcat ) { + filename_no_gz = substr(filename, 0, RSTART - 1); diff --git a/source/ap/man/man.SlackBuild b/source/ap/man/man.SlackBuild index a58b21a2..23c253c6 100755 --- a/source/ap/man/man.SlackBuild +++ b/source/ap/man/man.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +22,12 @@ VERSION=1.6g -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # 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 ) ;; @@ -38,8 +38,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-man -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -56,8 +56,11 @@ cd $TMP rm -rf $PKG mkdir -p $TMP $PKG rm -rf man-$VERSION -tar xvf $CWD/man-$VERSION.tar.xz -cd man-$VERSION +tar xvf $CWD/man-$VERSION.tar.xz || exit 1 +cd man-$VERSION || exit 1 + +# Fix conditional in makewhatis: +zcat $CWD/makewhatis.bzcat.bugfix.diff.gz | patch -p1 --verbose || exit 1 # In man.conf, set NROFF to "/usr/bin/nroff -mandoc" rather # than "/usr/bin/nroff -Tlatin1". This works better with @@ -72,10 +75,10 @@ find . \ -exec chmod 644 {} \; # configure doesn't care about CFLAGS -./configure +lang all +traditional -confdir /usr/lib${LIBDIRSUFFIX} -make CFLAGS="$SLKCFLAGS" -make install PREFIX=$PKG -mv $PKG/usr/lib${LIBDIRSUFFIX}/man.conf $PKG/usr/lib${LIBDIRSUFFIX}/man.conf.new +./configure +lang all +traditional -confdir /etc +make CFLAGS="$SLKCFLAGS" || exit 1 +make install PREFIX=$PKG || exit 1 +mv $PKG/etc/man.conf $PKG/etc/man.conf.new ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |