5 files changed, 61 insertions, 22 deletions
diff --git a/misc/dwdiff/README b/misc/dwdiff/README
index 3ddc5c5bdb..6bdfcf26cb 100644
--- a/misc/dwdiff/README
+++ b/misc/dwdiff/README
@@ -1,11 +1,12 @@
-dwdiff is a diff program that operates at the word level instead of the
-line level. It is different from wdiff in that it allows the user to
-specify what should be considered whitespace, and in that it takes an
-optional list of characters that should be considered delimiters.
-Delimiters are single characters that are treated as if they are words,
-even when there is no whitespace separating them from preceding words or
-delimiters. dwdiff is mostly commandline compatible with wdiff. Only the
---autopager, --terminal and --avoid-wraps options are not supported.
+dwdiff is a diff program that operates at the word level instead of
+the line level. It is different from wdiff in that it allows the user
+to specify what should be considered whitespace, and in that it takes
+an optional list of characters that should be considered delimiters.
+Delimiters are single characters that are treated as if they are
+words, even when there is no whitespace separating them from preceding
+words or delimiters. dwdiff is mostly commandline compatible with
+wdiff. Only the --autopager, --terminal and --avoid-wraps options are
+not supported.
 
 The default output from dwdiff is the new text, with the deleted and
 inserted parts annotated with markers. Command line options are
@@ -14,5 +15,5 @@ available to change both what is printed, and the markers.
 If you wish to have nl manpages and/or de, fr, nl, ru localization pass
 'NLS="de fr nl ru"' (or whichever of them is wanted) to the SlackBuild.
 
-If you wish to enable the handling of Unicode text, pass "UNICODE=yes" to
-the SlackBuild script.
+If you wish to enable the handling of Unicode text, pass "UNICODE=yes"
+to the SlackBuild script.
diff --git a/misc/dwdiff/config.pkg.patch b/misc/dwdiff/config.pkg.patch
new file mode 100644
index 0000000000..2cf3efd515
--- /dev/null
+++ b/misc/dwdiff/config.pkg.patch
@@ -0,0 +1,12 @@
+diff -ru dwdiff-2.1.4.orig/config.pkg dwdiff-2.1.4/config.pkg
+--- dwdiff-2.1.4.orig/config.pkg	2020-12-13 06:38:01.000000000 -0500
++++ dwdiff-2.1.4/config.pkg	2021-10-26 09:04:45.389583300 -0400
+@@ -11,6 +11,8 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++INSTALLDIRS="mandir"
++
+ EXTENSIONS="c verbose_compile gettext"
+ 
+ SWITCHES="+unicode +dwfilter"
diff --git a/misc/dwdiff/dwdiff.SlackBuild b/misc/dwdiff/dwdiff.SlackBuild
index 99485977fd..1a9690b08d 100644
--- a/misc/dwdiff/dwdiff.SlackBuild
+++ b/misc/dwdiff/dwdiff.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dwdiff
 # Written by slakmagik <slakmagik@gmail.com>
 # Released under the WTFPL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dwdiff
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+fi
+
 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"
@@ -49,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -58,8 +68,10 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch for configure --mandir
+patch -p1 < $CWD/config.pkg.patch
 # Patch for a build failure if not building with unicode.
-patch -p1 < $CWD/doDiff.c.patch
+patch -p1 < $CWD/src-option.c.patch
 
 # This is one messed up makefile - and its configure doesn't accept '--build'
 CC="gcc -fgnu89-inline" \
@@ -88,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/dwdiff/dwdiff.info b/misc/dwdiff/dwdiff.info
index baaf8cfee3..a5f37453fb 100644
--- a/misc/dwdiff/dwdiff.info
+++ b/misc/dwdiff/dwdiff.info
@@ -1,8 +1,8 @@
 PRGNAM="dwdiff"
-VERSION="2.0.1"
+VERSION="2.1.4"
 HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-DOWNLOAD="https://os.ghalkes.nl/dist/dwdiff-2.0.1.tgz"
-MD5SUM="1d87b54187515ecbfa803df505999e79"
+DOWNLOAD="https://os.ghalkes.nl/dist/dwdiff-2.1.4.tar.bz2"
+MD5SUM="4e7b332b1e9e1a9b6f119f39532ed24f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/dwdiff/src-option.c.patch b/misc/dwdiff/src-option.c.patch
new file mode 100644
index 0000000000..682fbbea85
--- /dev/null
+++ b/misc/dwdiff/src-option.c.patch
@@ -0,0 +1,14 @@
+diff -ru dwdiff-2.1.4.orig/src/option.c dwdiff-2.1.4/src/option.c
+--- dwdiff-2.1.4.orig/src/option.c	2020-12-13 06:38:01.000000000 -0500
++++ dwdiff-2.1.4/src/option.c	2021-10-26 08:48:13.189583300 -0400
+@@ -470,8 +470,10 @@
+ 	option.output = stdout;
+ 
+ 	initOptions();
++#ifdef USE_UNICODE
+   UErrorCode error = U_ZERO_ERROR;
+ 	ONLY_UNICODE(option.decomposition = unorm2_getNFDInstance(&error);)
++#endif
+ 
+ 	option.needStartStop = true;
+