CVS commit: pkgsrc/shells/zsh

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jan 18 14:12:41 UTC 2026

Modified Files:
        pkgsrc/shells/zsh: Makefile distinfo
Added Files:
        pkgsrc/shells/zsh/patches: patch-Completion_Unix_Command___imagemagick
            patch-Completion_Unix_Type___diff__options

Log Message:
shells/zsh: Assume diff(1) under NetBSD is GNU-like

* NetBSD has GNU or GNU compatible diff command in base.
* And complete .heic for display command from ImageMagick
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___imagemagick \
    pkgsrc/shells/zsh/patches/patch-Completion_Unix_Type___diff__options

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

Modified files:

Index: pkgsrc/shells/zsh/Makefile
diff -u pkgsrc/shells/zsh/Makefile:1.108 pkgsrc/shells/zsh/Makefile:1.109
--- pkgsrc/shells/zsh/Makefile:1.108    Tue Oct  7 03:34:29 2025
+++ pkgsrc/shells/zsh/Makefile  Sun Jan 18 14:12:41 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2025/10/07 03:34:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.109 2026/01/18 14:12:41 ryoon Exp $
 
 DISTNAME=      zsh-5.9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.81 pkgsrc/shells/zsh/distinfo:1.82
--- pkgsrc/shells/zsh/distinfo:1.81     Tue Oct  7 03:34:29 2025
+++ pkgsrc/shells/zsh/distinfo  Sun Jan 18 14:12:41 2026
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.81 2025/10/07 03:34:29 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2026/01/18 14:12:41 ryoon Exp $
 
 BLAKE2s (zsh-5.9.tar.xz) = 1ab2ab9dd0debc176bdefd661b62e102153c26f591e35916ccc7527c337d0530
 SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
 Size (zsh-5.9.tar.xz) = 3332400 bytes
 SHA1 (patch-Completion_BSD_Command___bsd__pkg) = fe0d9cc399fe185ce71a64431e4086ed07920cb8
 SHA1 (patch-Completion_Unix_Command___gpg) = 8eba031838b1cfb0bfadf0fa539e760fd1cb539c
+SHA1 (patch-Completion_Unix_Command___imagemagick) = fe997667e3314cd7b416bfecc7a88cfc41b305f5
+SHA1 (patch-Completion_Unix_Type___diff__options) = d748c21e30746f4af68232481d32b61d227cc924
 SHA1 (patch-Config_installfns.sh) = ef0b250a0121c0e4925022e02553aefa23e6cc8d
 SHA1 (patch-Src_jobs.c) = d4be7424283f22a5ce26ba6aebfe51f105c033ce
 SHA1 (patch-aczsh.m4) = 2a6cae1ab379ad925598764bd7afd862c227da50

Added files:

Index: pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___imagemagick
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___imagemagick:1.1
--- /dev/null   Sun Jan 18 14:12:42 2026
+++ pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___imagemagick       Sun Jan 18 14:12:41 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-Completion_Unix_Command___imagemagick,v 1.1 2026/01/18 14:12:41 ryoon Exp $
+
+--- Completion/Unix/Command/_imagemagick.orig  2025-06-17 11:31:49.990750312 +0000
++++ Completion/Unix/Command/_imagemagick
+@@ -12,7 +12,7 @@ typeset -A opt_args
+ #
+ # and certainly many other things...
+ 
+-formats=(jpg jpeg jp2 j2k jpc jpx jpf tif tiff miff ras bmp cgm dcx ps eps fig fits fpx gif mpeg pbm pgm ppm pcd pcl pdf pcx png rad rgb rgba rle sgi html shtml tga ttf uil xcf xwd xbm xpm yuv)
++formats=(jpg jpeg jp2 j2k jpc jpx jpf tif tiff miff ras bmp cgm dcx ps eps fig fits fpx gif heic mpeg pbm pgm ppm pcd pcl pdf pcx png rad rgb rgba rle sgi html shtml tga ttf uil xcf xwd xbm xpm yuv)
+ 
+ if (( $# )); then
+   _files "$@" -g "*.(#i)(${(j:|:)formats})(-.)"
Index: pkgsrc/shells/zsh/patches/patch-Completion_Unix_Type___diff__options
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-Completion_Unix_Type___diff__options:1.1
--- /dev/null   Sun Jan 18 14:12:42 2026
+++ pkgsrc/shells/zsh/patches/patch-Completion_Unix_Type___diff__options        Sun Jan 18 14:12:41 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-Completion_Unix_Type___diff__options,v 1.1 2026/01/18 14:12:41 ryoon Exp $
+
+--- Completion/Unix/Type/_diff_options.orig    2026-01-16 21:59:11.331321983 +0000
++++ Completion/Unix/Type/_diff_options
+@@ -25,7 +25,7 @@ _diff_palette() {
+   return ret
+ }
+ 
+-if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->.* ]]; then
++if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->.* ]] || [[ $OSTYPE = netbsd* ]]; then
+   # output formats
+   of="-y --side-by-side -n --rcs -e -f --ed -q --brief -c -C --context -u -U \
+   --unified --old-group-format --new-group-format --changed-group-format \