misc/discount: Updated for version 2.2.7d, new maintainer.

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

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

3 files changed, 33 insertions, 57 deletions

diff --git a/misc/discount/README b/misc/discount/README
index ffa5bab9fb74..14d818f134dd 100644
--- a/misc/discount/README
+++ b/misc/discount/README
@@ -1,3 +1,5 @@
+discount (implementation of Markdown text to html language in C)
+
 Discount is an implementation of John Gruber's Markdown text to HTML
 language written by David Loren Parsons. There's not much that
 differentiates it from any of the existing Markdown implementations
diff --git a/misc/discount/discount.SlackBuild b/misc/discount/discount.SlackBuild
index cb260d21247b..53903f2ec016 100644
--- a/misc/discount/discount.SlackBuild
+++ b/misc/discount/discount.SlackBuild
@@ -2,31 +2,22 @@
 
 # Slackware build script for discount
 
-# Copyright 2022 Brandon Pribula, BC Canada
-# Copyright 2018-2020 Donald Cooley, South Haven, Indiana USA
-# Copyright (c) 2011-2015, Antonio Hernández Blas <hba.nihilismus@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 1.- Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Original author: Antonio Hernández Blas.
+# Formerly maintained by Donald Cooley and later Brandon Pribula.
+# Now maintained by B. Watson (urchlay@slackware.uk).
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230914 bkw:
+# - take over maintenance.
+# - update for v2.2.7d.
+# - don't install VERSION in doc dir.
+# - add MAKETEST option, disabled by default, to run 'make test'.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=discount
-VERSION=${VERSION:-2.2.7b}
+VERSION=${VERSION:-2.2.7d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +30,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -71,20 +59,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+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 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # Disable ldconfig use during 'make install'
 sed -i 's/LDCONFIG=.*$/LDCONFIG=true/g' configure.inc
 
 # Fix file permission
-sed -i 's/PROG_INSTALL -m 444/PROG_INSTALL -m 644/g' configure.inc
+sed -i '/PROG_INSTALL/s,-m 444,-m 644,g' configure.inc
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -104,28 +89,17 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make -j1
 
-mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include}
-make install.everything DESTDIR=$PKG
+[ "${MAKETEST:-no}" = "yes" ] && make -j1 test
 
-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
-
-if [ -d $PKG/usr/share/man ]; then
-  mv $PKG/usr/share/man $PKG/usr
-fi
-
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    find . -type f -exec gzip -9 {} \;
-    for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-  )
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYRIGHT CREDITS README VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include}
+make -j1 install.everything DESTDIR=$PKG
+strip $PKG/usr/bin/* $PKG/usr/lib*/*.so.*.*.*
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYRIGHT CREDITS README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/discount/discount.info b/misc/discount/discount.info
index 3beb60fc3709..4accb9cdce92 100644
--- a/misc/discount/discount.info
+++ b/misc/discount/discount.info
@@ -1,10 +1,10 @@
 PRGNAM="discount"
-VERSION="2.2.7b"
+VERSION="2.2.7d"
 HOMEPAGE="https://www.pell.portland.or.us/~orc/Code/discount/"
-DOWNLOAD="https://github.com/Orc/discount/archive/v2.2.7b/discount-2.2.7b.tar.gz"
-MD5SUM="634f5368ebed3c6cc9bf5b317d5939d9"
+DOWNLOAD="https://github.com/Orc/discount/archive/v2.2.7d/discount-2.2.7d.tar.gz"
+MD5SUM="5081a7d74b0986f8e288bca53f367500"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brandon Pribula"
-EMAIL="b.pribs11@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"