misc/misctools: Updated for version 2.5.5

4 files changed, 17 insertions, 8 deletions

diff --git a/misc/misctools/README b/misc/misctools/README
index 76e6dc03599d..3c7f1cfd59c7 100644
--- a/misc/misctools/README
+++ b/misc/misctools/README
@@ -3,4 +3,4 @@ but nevertheless useful. These include a binary dump program, a directory
 browser/selector, a file truncator, an ASCII-code lookup utility, a program
 for printing fortunes, a curses-based terminal lock program, and a few others.
 
-Building this depends on 'cbase', available in the SBo Libraries repo.
+This requires cbase.
diff --git a/misc/misctools/misctools.SlackBuild b/misc/misctools/misctools.SlackBuild
index a9a8ed760735..5cd16775e408 100644
--- a/misc/misctools/misctools.SlackBuild
+++ b/misc/misctools/misctools.SlackBuild
@@ -3,9 +3,10 @@
 # Slackware build script for MiscTools
 
 # Written by Menno Duursma <druiloor@zonnet.nl>
+
 # This program is free software. It comes without any warranty.
-# Granted WTFPLv2, as published by Sam Hocevar dec'04.
-# For details see http://sam.zoy.org/wtfpl/COPYING
+# Granted WTFPL, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=misctools
 VERSION=${VERSION:-2.5.5}
@@ -20,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -41,9 +45,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
@@ -60,13 +66,13 @@ done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/misctools/misctools.info b/misc/misctools/misctools.info
index 3ee1f579c4c8..beae0fbc105d 100644
--- a/misc/misctools/misctools.info
+++ b/misc/misctools/misctools.info
@@ -3,6 +3,8 @@ VERSION="2.5.5"
 HOMEPAGE="http://www.hyperrealm.com/main.php?s=misctools"
 DOWNLOAD="http://www.hyperrealm.com/misctools/misctools-2.5.5.tar.bz2"
 MD5SUM="b133836d9692feaf455481ac78d65364"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
 APPROVED="rworkman"
diff --git a/misc/misctools/slack-desc b/misc/misctools/slack-desc
index 0b5824c245df..0260658c4d5f 100644
--- a/misc/misctools/slack-desc
+++ b/misc/misctools/slack-desc
@@ -4,15 +4,16 @@
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
-      |-----handy-ruler------------------------------------------------------|
+
+         |-----handy-ruler------------------------------------------------------|
 misctools: misctools (Miscellaneous UNIX Utilities)
 misctools:
 misctools: A collection of small but useful utilities.
 misctools:
-misctools:
 misctools: misctools was written by Mark Lindner
 misctools:
 misctools:
 misctools:
 misctools:
 misctools:
+misctools: