From d0c77a87aed72200ab1ebbf06e51b9d108717331 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Fri, 4 Aug 2023 22:17:22 -0400
Subject: [PATCH] development/colordiff: Updated for version 1.0.21, new
 maintainer.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/colordiff/colordiff.SlackBuild | 22 ++++++++++++----------
 development/colordiff/colordiff.info       | 10 +++++-----
 development/colordiff/doinst.sh            |  4 ----
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/development/colordiff/colordiff.SlackBuild b/development/colordiff/colordiff.SlackBuild
index 390a799eeb..4292f6fcea 100644
--- a/development/colordiff/colordiff.SlackBuild
+++ b/development/colordiff/colordiff.SlackBuild
@@ -2,9 +2,10 @@
 
 # Slackware build script for colordiff
 
-# Originally by Grigorios Bouzakis (grbzks@gmail.com)
-
-# Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
+# Originally by Grigorios Bouzakis
+# Previously maintained by Ryan P.C. McQuen, WA,
+# then maintained by Ricardo J. Barberis.
+# Now maintained by B. Watson (urchlay@slackware.uk).
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +25,10 @@
 # along with this program (most likely, a file named COPYING).  If
 # not, see <http://www.gnu.org/licenses/>.
 
+# 20230804 bkw:
+# - take over maintenance.
+# - update for v1.0.21.
+
 # 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
 # - fix download URL.
 # - get rid of useless INSTALL in doc dir.
@@ -31,9 +36,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=colordiff
-VERSION=${VERSION:-1.0.19}
+VERSION=${VERSION:-1.0.21}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -55,11 +60,8 @@ 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 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 mkdir -p $PKG/etc $PKG/usr/bin $PKG/usr/man/man1
 install -m 644 colordiffrc $PKG/etc/colordiffrc.new
diff --git a/development/colordiff/colordiff.info b/development/colordiff/colordiff.info
index 884d2e3074..407a1d518c 100644
--- a/development/colordiff/colordiff.info
+++ b/development/colordiff/colordiff.info
@@ -1,10 +1,10 @@
 PRGNAM="colordiff"
-VERSION="1.0.19"
+VERSION="1.0.21"
 HOMEPAGE="https://www.colordiff.org/"
-DOWNLOAD="http://distfiles.macports.org/colordiff/colordiff-1.0.19.tar.gz"
-MD5SUM="95788a711e1402c17a5cd8c8ab6f1ed5"
+DOWNLOAD="http://distfiles.macports.org/colordiff/colordiff-1.0.21.tar.gz"
+MD5SUM="fdff82efdcccc7e1bff28d943662b208"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ricardo J. Barberis"
-EMAIL="ricardo.barberis@gmail.com"
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/development/colordiff/doinst.sh b/development/colordiff/doinst.sh
index 704751bd12..83e55f14bf 100644
--- a/development/colordiff/doinst.sh
+++ b/development/colordiff/doinst.sh
@@ -1,15 +1,11 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 config etc/colordiffrc.new
-