misc/dos2unix: Updated for version 7.4.2

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

4 files changed, 28 insertions, 17 deletions

diff --git a/misc/dos2unix/README b/misc/dos2unix/README
index 150030612ca0..deb06ad6abee 100644
--- a/misc/dos2unix/README
+++ b/misc/dos2unix/README
@@ -14,11 +14,18 @@ to Mac by Erwin in 2010.
 
 Features:
     Native language support:
-    Dutch, English, Esperanto, German, and Spanish.
-    Automatically skips binary and non-regular files in-place, paired,
-    or stdio mode conversion.
+    Brazilian Portugese, Chinese (simplified/traditional),
+    Danish, Dutch, English, Esperanto, French, Friulian,
+    German, Hungarian, Japanese, Norwegian Bokmaal, Polish,
+    Russian, Serbian, Spanish, Swedish, Ukrainian,
+    and Vietnamese.
+    
+    In-place, paired, or stdio mode conversion.
     Keep original file dates option.
     7-bit and ISO conversion modes like SunOS dos2unix.
+    Conversion of Unicode UTF-16 files.
+    Handles Unicode Byte Order Mark (BOM).
+    Display file information.
 
 Dos2Unix includes:
     dos2unix - DOS/MAC to UNIX text file format converter.
diff --git a/misc/dos2unix/dos2unix.SlackBuild b/misc/dos2unix/dos2unix.SlackBuild
index 35095126ea0a..676270c6679b 100644
--- a/misc/dos2unix/dos2unix.SlackBuild
+++ b/misc/dos2unix/dos2unix.SlackBuild
@@ -1,5 +1,9 @@
 #!/bin/bash
+
 # Slackware build script for dos2unix
+
+# Copyright 2022 Brandon Pribula, BC Canada
+
 # copyright 2017-2020 Donald Cooley, South Haven, IN, USA
 
 # Ryan P.C. McQuen | Everett, WA
@@ -27,7 +31,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dos2unix
-VERSION=${VERSION:-7.4.1}
+VERSION=${VERSION:-7.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -82,13 +86,13 @@ else
 fi
 
 RPM_OPT_FLAGS="$SLKCFLAGS" \
-  make
+make
 make check
-make \
-  prefix=$PKG/usr \
-  docdir=$PKG/usr/doc/$PRGNAM-$VERSION \
-  mandir=$PKG/usr/man \
-  install
+make install \
+  prefix=/usr \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  mandir=/usr/man \
+  DESTDIR=$PKG
 
 # Put _all_ man pages under usr/man
 mv $PKG/usr/share/man/* $PKG/usr/man
@@ -100,8 +104,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/dos2unix/dos2unix.info b/misc/dos2unix/dos2unix.info
index 9ca31f2a2584..0dc9d22f3d56 100644
--- a/misc/dos2unix/dos2unix.info
+++ b/misc/dos2unix/dos2unix.info
@@ -1,10 +1,10 @@
 PRGNAM="dos2unix"
-VERSION="7.4.1"
+VERSION="7.4.2"
 HOMEPAGE="https://waterlan.home.xs4all.nl/dos2unix.html"
-DOWNLOAD="https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.1.tar.gz"
-MD5SUM="6b402c10899416707da60188cd6bb0f3"
+DOWNLOAD="https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.2.tar.gz"
+MD5SUM="4e8f8c230a72753b307fab69f8121ba4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="Brandon Pribula"
+EMAIL="b.pribs11@gmail.com"
diff --git a/misc/dos2unix/slack-desc b/misc/dos2unix/slack-desc
index 40424dc391d7..f78d986b856a 100644
--- a/misc/dos2unix/slack-desc
+++ b/misc/dos2unix/slack-desc
@@ -14,6 +14,6 @@ dos2unix: modeled after dos2unix/unix2dos under SunOS/Solaris. They have
 dos2unix: similar conversion modes, namely ascii, 7bit and iso.
 dos2unix:
 dos2unix:
-dos2unix: https://www.xs4all.nl/~waterlan/dos2unix.html
 dos2unix:
+dos2unix: Homepage: https://www.xs4all.nl/~waterlan/dos2unix.html
 dos2unix: