network/dothost: New maintainer, noarch.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 23 insertions, 33 deletions

diff --git a/network/dothost/README b/network/dothost/README
index 92be91a80f18..ad593774417d 100644
--- a/network/dothost/README
+++ b/network/dothost/README
@@ -1,3 +1,5 @@
+dothost (DNS lookup utility with Graphviz output)
+
 dothost is a DNS lookup utility, which produces output in Graphviz
 format. It does this, not by using Graphviz, but by using the graph-easy
 Perl module also available at slackbuilds.org
diff --git a/network/dothost/dothost.SlackBuild b/network/dothost/dothost.SlackBuild
index 3c551900109c..23e7c278cfc8 100644
--- a/network/dothost/dothost.SlackBuild
+++ b/network/dothost/dothost.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for dothost
 
+# Copyright 2023 B. Watson (urchlay@slackware.uk)
 # Copyright 2018-2020 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
@@ -22,25 +23,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230223 bkw: BUILD=2
+# - new maintainer.
+# - ARCH=noarch (no compiled code, no lib64 dir).
+# - cosmetics in slack-desc and README.
+# - simplify build.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dothost
 VERSION=${VERSION:-0.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -59,29 +57,19 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-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 {} \;
-
-# Install to /usr instead of /usr/local
-sed -i 's_/usr/local_/usr_' Makefile
-
-# Install man pages into /usr/man instead of /usr/share/man
-sed -i 's_/share/man_/man_' Makefile
-
-make
-make install DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-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
+make install PREFIX=/usr mandir=/usr/man DESTDIR=$PKG
 
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+# no need for the man page in /usr/doc
+rm -f doc/*.1
+cp -a doc/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/dothost/dothost.info b/network/dothost/dothost.info
index d4cfa2b9b965..37de1d7117a0 100644
--- a/network/dothost/dothost.info
+++ b/network/dothost/dothost.info
@@ -6,5 +6,5 @@ MD5SUM="2f95fb6cd01458b9e848b4fdbe9aba79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="graph-easy"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/network/dothost/slack-desc b/network/dothost/slack-desc
index 69fa54c838e8..4bbbff2c9054 100644
--- a/network/dothost/slack-desc
+++ b/network/dothost/slack-desc
@@ -12,8 +12,8 @@ dothost: dothost is a DNS lookup utility, which produces output in Graphviz
 dothost: format. It does this, not by using Graphviz, but by using the
 dothost: graph-easy Perl module also available at slackbuilds.org
 dothost:
+dothost: https://jwilk.net/software/dothost
 dothost:
 dothost:
-dothost: https://jwilk.net/software/dothost
 dothost:
 dothost: