From 16670f8cac2612a857fd20fac48a8803dc65fea6 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 10 Feb 2017 14:01:14 -0500
Subject: system/makepasswd: Updated for version 0.5.4, new maintainer.

---
 system/makepasswd/makepasswd.SlackBuild | 32 ++++++++++++++++++++------------
 system/makepasswd/makepasswd.info       | 10 +++++-----
 2 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'system')

diff --git a/system/makepasswd/makepasswd.SlackBuild b/system/makepasswd/makepasswd.SlackBuild
index 523b2f2879..27d0a4e0d3 100644
--- a/system/makepasswd/makepasswd.SlackBuild
+++ b/system/makepasswd/makepasswd.SlackBuild
@@ -2,16 +2,27 @@
 
 # Slackware build script for makepasswd
 
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Originally written by Pablo Santamaria (email removed)
+
+# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# had no license, modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170210 bkw:
+# - Take over maintenance
+# - Update for v0.5.4
+# - i486 => i586
+# - install HTML doc to /usr/doc/$PRGNAM-$VERSION, not /usr/man/html1
+# - script cosmetic cleanups
 
 PRGNAM=makepasswd
-VERSION=${VERSION:-0.5.3}
+VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-1}
 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
@@ -22,8 +33,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"
@@ -53,15 +64,12 @@ find -L . \
 
 make CFLAGS="$SLKCFLAGS"
 make PREFIX=$PKG/usr DATADIR=$PKG/usr MANDIR=$PKG/usr/man install
-rm -rf $PKG/usr/doc   # nothing useful
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/man/html1/ $PKG/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/makepasswd/makepasswd.info b/system/makepasswd/makepasswd.info
index bbcb0682b7..d90d9e9ca1 100644
--- a/system/makepasswd/makepasswd.info
+++ b/system/makepasswd/makepasswd.info
@@ -1,10 +1,10 @@
 PRGNAM="makepasswd"
-VERSION="0.5.3"
+VERSION="0.5.4"
 HOMEPAGE="http://defora.org/os/download/641"
-DOWNLOAD="http://defora.org/os/download/download/4323/makepasswd-0.5.3.tar.gz"
-MD5SUM="f9303ba52592555a45b11e35779ca11f"
+DOWNLOAD="http://defora.org/os/download/download/4438/makepasswd-0.5.4.tar.gz"
+MD5SUM="c3cf95279f2721c2b5bd5731c0e80d34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Santamaria"
-EMAIL="pablosantamaria@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
-- 
cgit v1.2.3-79-gdb01