system/dieharder: Switch to i586, change option + upd maint email.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 19 insertions, 14 deletions

diff --git a/system/dieharder/README b/system/dieharder/README
index d2ea4959c8..8d0e5a94fe 100644
--- a/system/dieharder/README
+++ b/system/dieharder/README
@@ -5,9 +5,10 @@ and includes a battery of pseudorandom number generators (PRNG) and
 testing algorithms for research and cryptographic applications.
 
 The software saw its last release in 2011, and patches are applied
-mostly to overcome differences with newer versions of autoconf.  This
+mostly to overcome differences in newer versions of autoconf.  This
 build installs the dieharder program as well as the libdieharder
 shared libraries that can be called from your program code.
 
 If you have latex2html installed and want the PDF manual, execute the
-build script like so: PDFMAN=yes ./dieharder.SlackBuild
+build script like so:
+  MANPDF=yes sh dieharder.SlackBuild
diff --git a/system/dieharder/dieharder.SlackBuild b/system/dieharder/dieharder.SlackBuild
index c60c20f4ae..885aeffe20 100644
--- a/system/dieharder/dieharder.SlackBuild
+++ b/system/dieharder/dieharder.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-# SlackBuild for dieharder, 3 May 2016
-# Arthur W. Green <lynx@panix.com>
+# SlackBuild for dieharder, 5 January 2017
+# Arthur W. Green <awg@posteo.us>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification,
@@ -28,12 +28,12 @@
 
 PRGNAM=dieharder
 VERSION=${VERSION:-3.31.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,11 +67,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . -exec chmod -R u+w,go-w,a+rX-st {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # apply patches, mostly to appease crusty autoconf.
 patch -p1 < $CWD/$PRGNAM.patch
-mkdir -p manual/m4  # a useless stub.
+mkdir -p manual/m4  # a stub.
 
 ./autogen.sh
 
@@ -83,8 +87,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-shared \
   --disable-static \
+  --enable-shared \
   --with-gnu-ld \
   --build=$ARCH-slackware-linux
 
@@ -99,8 +103,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING NOTES AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
-if [ "${PDFMAN:-no}" = "yes" ]; then
-  ( cd manual; make pdf ) 
+if [ "${MANPDF:-no}" = "yes" ]; then
+  ( cd manual; make pdf )
   cp -a manual/dieharder.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 fi
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/dieharder/dieharder.info b/system/dieharder/dieharder.info
index 8bfe7226f0..e4a204c9ce 100644
--- a/system/dieharder/dieharder.info
+++ b/system/dieharder/dieharder.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Arthur W. Green"
-EMAIL="lynx@panix.com"
+EMAIL="awg@posteo.us"