CVS commit: pkgsrc/devel/patchutils

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Oct  5 15:22:53 UTC 2025

Modified Files:
        pkgsrc/devel/patchutils: Makefile PLIST distinfo

Log Message:
patchutils: updated to 0.4.4

0.4.4

Enhanced Git diff format support in filterdiff/lsdiff/grepdiff. Improved handling of Git diffs without traditional hunks, including proper support for file renames, binary file changes, and 
permission mode changes. Fixed exclusion filtering (-x) for multi-file Git diffs to prevent orphaned headers. Enhanced filename extraction to properly strip Git's a/ and b/ prefixes for consistent 
output. Added --git-prefixes=strip|keep option to control handling of Git filename prefixes, with 'keep' as default for backward compatibility (will change to 'strip' in version 0.5.0).

Fixed interdiff --color option handling and improved color output. Replaced external diff --color dependency with internal ANSI color codes.

Code improvements and build system enhancements. Added redirectfd() utility function to redirect stdout without reassignment. Enhanced CI testing with musl support for better compatibility testing. 
Fixed bash completion symlinks for better installation. Made grepdiff test case PCRE-aware to handle different regex library configurations properly.

Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview commands.

Updated bash completions.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/patchutils/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/patchutils/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/patchutils/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/patchutils/Makefile
diff -u pkgsrc/devel/patchutils/Makefile:1.32 pkgsrc/devel/patchutils/Makefile:1.33
--- pkgsrc/devel/patchutils/Makefile:1.32       Mon Aug 14 05:24:14 2023
+++ pkgsrc/devel/patchutils/Makefile    Sun Oct  5 15:22:53 2025
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.32 2023/08/14 05:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2025/10/05 15:22:53 adam Exp $
 
-DISTNAME=              patchutils-0.4.2
-PKGREVISION=           4
-CATEGORIES=            devel
-MASTER_SITES=          http://cyberelk.net/tim/data/patchutils/stable/
-EXTRACT_SUFX=          .tar.xz
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://cyberelk.net/tim/software/patchutils/
-COMMENT=               Some programs for manipulating patch files
-LICENSE=               gnu-gpl-v2
-
-DEPENDS+=              patch-[0-9]*:../../devel/patch
-#  WARNING: xmlto not available so not building doc
-TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto
+DISTNAME=      patchutils-0.4.4
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=twaugh/}
+EXTRACT_SUFX=  .tar.xz
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://cyberelk.net/tim/software/patchutils/
+COMMENT=       Some programs for manipulating patch files
+LICENSE=       gnu-gpl-v2
+
+# WARNING: xmlto not available so not building doc
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+DEPENDS+=      patch-[0-9]*:../../devel/patch
 
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            perl:run
+USE_TOOLS+=            bash:run gmake perl:run
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-patch=${PREFIX}/bin/gpatch
 
+REPLACE_BASH+=         scripts/editdiff.in scripts/espdiff.in
 REPLACE_PYTHON+=       patchview/gitdiff
+REPLACE_PYTHON+=       patchview/gitshow
 
-CHECK_PORTABILITY_SKIP+= tests/rediff2/run-test
-REPLACE_BASH+=         scripts/editdiff.in scripts/espdiff.in
-USE_TOOLS+=            bash:run
+CHECK_PORTABILITY_SKIP+=       tests/rediff2/run-test
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/patchutils/PLIST
diff -u pkgsrc/devel/patchutils/PLIST:1.2 pkgsrc/devel/patchutils/PLIST:1.3
--- pkgsrc/devel/patchutils/PLIST:1.2   Sun Dec 20 13:05:00 2020
+++ pkgsrc/devel/patchutils/PLIST       Sun Oct  5 15:22:53 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/12/20 13:05:00 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/10/05 15:22:53 adam Exp $
 bin/combinediff
 bin/dehtmldiff
 bin/editdiff
@@ -8,6 +8,8 @@ bin/fixcvsdiff
 bin/flipdiff
 bin/gitdiff
 bin/gitdiffview
+bin/gitshow
+bin/gitshowview
 bin/grepdiff
 bin/interdiff
 bin/lsdiff
@@ -25,6 +27,10 @@ man/man1/espdiff.1
 man/man1/filterdiff.1
 man/man1/fixcvsdiff.1
 man/man1/flipdiff.1
+man/man1/gitdiff.1
+man/man1/gitdiffview.1
+man/man1/gitshow.1
+man/man1/gitshowview.1
 man/man1/grepdiff.1
 man/man1/interdiff.1
 man/man1/lsdiff.1
@@ -32,4 +38,25 @@ man/man1/patchview.1
 man/man1/recountdiff.1
 man/man1/rediff.1
 man/man1/splitdiff.1
+man/man1/svndiff.1
+man/man1/svndiffview.1
 man/man1/unwrapdiff.1
+share/bash-completion/completions/combinediff
+share/bash-completion/completions/dehtmldiff
+share/bash-completion/completions/editdiff
+share/bash-completion/completions/espdiff
+share/bash-completion/completions/filterdiff
+share/bash-completion/completions/fixcvsdiff
+share/bash-completion/completions/flipdiff
+share/bash-completion/completions/gitdiff
+share/bash-completion/completions/gitdiffview
+share/bash-completion/completions/grepdiff
+share/bash-completion/completions/interdiff
+share/bash-completion/completions/lsdiff
+share/bash-completion/completions/patchview
+share/bash-completion/completions/recountdiff
+share/bash-completion/completions/rediff
+share/bash-completion/completions/splitdiff
+share/bash-completion/completions/svndiff
+share/bash-completion/completions/svndiffview
+share/bash-completion/completions/unwrapdiff

Index: pkgsrc/devel/patchutils/distinfo
diff -u pkgsrc/devel/patchutils/distinfo:1.11 pkgsrc/devel/patchutils/distinfo:1.12
--- pkgsrc/devel/patchutils/distinfo:1.11       Tue Oct 26 10:17:59 2021
+++ pkgsrc/devel/patchutils/distinfo    Sun Oct  5 15:22:53 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:17:59 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/10/05 15:22:53 adam Exp $
 
-BLAKE2s (patchutils-0.4.2.tar.xz) = 0547c732423b854fa8704021f59b2d29d7d521efdb4ab6397a125448156431b2
-SHA512 (patchutils-0.4.2.tar.xz) = 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
-Size (patchutils-0.4.2.tar.xz) = 159504 bytes
+BLAKE2s (patchutils-0.4.4.tar.xz) = 9e704d7e4a40b298b36338bfba21338c72396991e6003c04cdbd3da3089d75db
+SHA512 (patchutils-0.4.4.tar.xz) = 26f3ee959d7f8d7d5718ecf361436709559c62d6235114faac9a84442e9df4fb271f85eea5d96dae3969e96d88fdd9c1a9b5246696ef548fad71a8f29a026a84
+Size (patchutils-0.4.4.tar.xz) = 424248 bytes