CVS commit: pkgsrc/shells/zsh

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct  7 03:34:29 UTC 2025

Modified Files:
        pkgsrc/shells/zsh: Makefile distinfo
        pkgsrc/shells/zsh/patches: patch-configure.ac
Added Files:
        pkgsrc/shells/zsh/patches: patch-aczsh.m4

Log Message:
shells/zsh: Fix dynamic module build with GCC 14

* Reflect c11 use as USE_CC_FEATURES.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/shells/zsh/patches/patch-aczsh.m4
cvs rdiff -u -r1.11 -r1.12 pkgsrc/shells/zsh/patches/patch-configure.ac

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.107 pkgsrc/shells/zsh/Makefile:1.108
--- pkgsrc/shells/zsh/Makefile:1.107    Mon Apr 21 21:18:08 2025
+++ pkgsrc/shells/zsh/Makefile  Tue Oct  7 03:34:29 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2025/04/21 21:18:08 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2025/10/07 03:34:29 ryoon Exp $
 
 DISTNAME=      zsh-5.9
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +11,8 @@ HOMEPAGE=     https://zsh.sourceforge.io/
 COMMENT=       The Z shell
 LICENSE=       gnu-gpl-v2 AND zsh
 
-USE_LANGUAGES=         c c99
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c11
 USE_TOOLS+=            autoconf automake autoreconf makeinfo
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.80 pkgsrc/shells/zsh/distinfo:1.81
--- pkgsrc/shells/zsh/distinfo:1.80     Sun Mar 31 22:08:42 2024
+++ pkgsrc/shells/zsh/distinfo  Tue Oct  7 03:34:29 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2024/03/31 22:08:42 js Exp $
+$NetBSD: distinfo,v 1.81 2025/10/07 03:34:29 ryoon Exp $
 
 BLAKE2s (zsh-5.9.tar.xz) = 1ab2ab9dd0debc176bdefd661b62e102153c26f591e35916ccc7527c337d0530
 SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
@@ -7,4 +7,5 @@ SHA1 (patch-Completion_BSD_Command___bsd
 SHA1 (patch-Completion_Unix_Command___gpg) = 8eba031838b1cfb0bfadf0fa539e760fd1cb539c
 SHA1 (patch-Config_installfns.sh) = ef0b250a0121c0e4925022e02553aefa23e6cc8d
 SHA1 (patch-Src_jobs.c) = d4be7424283f22a5ce26ba6aebfe51f105c033ce
-SHA1 (patch-configure.ac) = b1f1d717d6a17a3e6c068fef345d16601361caff
+SHA1 (patch-aczsh.m4) = 2a6cae1ab379ad925598764bd7afd862c227da50
+SHA1 (patch-configure.ac) = 3010366b2e2579b04ee2e83e2912af9b8d966138

Index: pkgsrc/shells/zsh/patches/patch-configure.ac
diff -u pkgsrc/shells/zsh/patches/patch-configure.ac:1.11 pkgsrc/shells/zsh/patches/patch-configure.ac:1.12
--- pkgsrc/shells/zsh/patches/patch-configure.ac:1.11   Sun Mar 31 22:08:43 2024
+++ pkgsrc/shells/zsh/patches/patch-configure.ac        Tue Oct  7 03:34:29 2025
@@ -1,12 +1,39 @@
-$NetBSD: patch-configure.ac,v 1.11 2024/03/31 22:08:43 js Exp $
+$NetBSD: patch-configure.ac,v 1.12 2025/10/07 03:34:29 ryoon Exp $
 
 Fix SunOS flags.
 
 #include <time.h> for struct timespec, as per POSIX (fixes QNX).
 
+* For more strict check by GCC 14.
+
 --- configure.ac.orig  2022-05-08 06:18:22.000000000 +0000
 +++ configure.ac
-@@ -1165,6 +1165,7 @@ zsh_TYPE_EXISTS([
+@@ -585,7 +585,7 @@ fi
+ dnl  Checking if compiler correctly cast signed to unsigned.
+ AC_CACHE_CHECK(if signed to unsigned casting is broken,
+ zsh_cv_c_broken_signed_to_unsigned_casting,
+-[AC_RUN_IFELSE([AC_LANG_SOURCE([[main(){return((int)(unsigned char)((char) -1) == 
255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return((int)(unsigned char)((char) -1) == 
255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
+ AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING],
+ [Define to 1 if compiler incorrectly cast signed to unsigned.])
+ if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
+@@ -1046,6 +1046,7 @@ else
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/types.h>
+ 
++int
+ main() { return sizeof(off_t) < 8; }
+ ]])],[zsh_cv_off_t_is_64_bit=yes],[zsh_cv_off_t_is_64_bit=no],[zsh_cv_off_t_is_64_bit=no])])
+   if test x$zsh_cv_off_t_is_64_bit = xyes; then
+@@ -1056,6 +1057,7 @@ main() { return sizeof(off_t) < 8; }
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/types.h>
+ 
++int
+ main() { return sizeof(ino_t) < 8; }
+ ]])],[zsh_cv_ino_t_is_64_bit=yes],[zsh_cv_ino_t_is_64_bit=no],[zsh_cv_ino_t_is_64_bit=no])])
+   if test x$zsh_cv_ino_t_is_64_bit = xyes; then
+@@ -1165,6 +1167,7 @@ zsh_TYPE_EXISTS([
  dnl Check for struct timespec since POSIX only gained it in 2008
  zsh_TYPE_EXISTS([
  #define _GNU_SOURCE 1
@@ -14,7 +41,97 @@ Fix SunOS flags.
  #ifdef HAVE_SYS_TIME_H
  # include <sys/time.h>
  #endif
-@@ -2845,7 +2846,7 @@ char *argv[];
+@@ -1396,6 +1399,7 @@ zsh_cv_func_tgetent_accepts_null,
+ #include <stdlib.h>
+ int tgetent(char *, char *);
+ char *tgetstr(char *, char **);
++int
+ main()
+ {
+     char buf[4096];
+@@ -1424,6 +1428,7 @@ zsh_cv_func_tgetent_zero_success,
+ #include <stdlib.h>
+ int tgetent(char *, char*);
+ char *tgetstr(char *, char **);
++int
+ main()
+ {
+     char buf[4096];
+@@ -1862,7 +1867,7 @@ zsh_cv_rlim_t_is_longer,
+ #endif
+ #include <sys/resource.h>
+ #include <stdlib.h>
+-main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
++int main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
+ if test x$zsh_cv_rlim_t_is_longer = xyes; then
+   AC_CACHE_CHECK(if rlim_t is a quad,
+   zsh_cv_rlim_t_is_quad_t,
+@@ -1873,6 +1878,7 @@ if test x$zsh_cv_rlim_t_is_longer = xyes
+ #include <stdio.h>
+ #include <sys/resource.h>
+ #include <stdlib.h>
++int
+ main() { 
+   struct rlimit r;
+   char buf[20];
+@@ -1896,7 +1902,7 @@ else
+ #endif
+ #include <sys/resource.h>
+ #include <stdlib.h>
+-  main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
++  int main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
+   if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
+     AC_DEFINE(RLIM_T_IS_UNSIGNED)
+     DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
+@@ -2177,6 +2183,7 @@ zsh_cv_sys_fifo,
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
++int
+ main()
+ {
+     char c;
+@@ -2278,6 +2285,7 @@ zsh_cv_sys_link,
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++int
+ main()
+ {
+     int ret;
+@@ -2311,6 +2319,7 @@ zsh_cv_sys_killesrch,
+ #include <signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
++int
+ main()
+ {
+     int pid = (getpid() + 10000) & 0xffffff;
+@@ -2341,6 +2350,7 @@ int child=0;
+ void handler(sig)
+     int sig;
+ {if(sig==SIGCHLD) child=1;}
++int
+ main() {
+     struct sigaction act;
+     sigset_t set;
+@@ -2389,6 +2399,7 @@ case "x$zsh_working_tcsetpgrp" in
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++int
+ main() {
+     int fd;
+     int ret;
+@@ -2436,6 +2447,7 @@ if test x$ac_cv_func_getpwnam = xyes; th
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++int
+ main() {
+     struct passwd *pw1, *pw2;
+     char buf[1024], name[1024];
+@@ -2845,7 +2857,7 @@ char *argv[];
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
      aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
@@ -23,3 +140,11 @@ Fix SunOS flags.
      darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
      beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
      openbsd*)
+@@ -2945,6 +2957,7 @@ char *zsh_gl_sym_addr ;
+ 
+ extern int fred() ;
+ 
++int
+ main()
+ {
+     void * handle ;

Added files:

Index: pkgsrc/shells/zsh/patches/patch-aczsh.m4
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-aczsh.m4:1.3
--- /dev/null   Tue Oct  7 03:34:29 2025
+++ pkgsrc/shells/zsh/patches/patch-aczsh.m4    Tue Oct  7 03:34:29 2025
@@ -0,0 +1,62 @@
+$NetBSD: patch-aczsh.m4,v 1.3 2025/10/07 03:34:29 ryoon Exp $
+
+* For more strict check by GCC 14.
+
+--- aczsh.m4.orig      2025-10-07 01:32:32.704002119 +0000
++++ aczsh.m4
+@@ -44,6 +44,7 @@ AC_DEFUN(zsh_64_BIT_TYPE,
+ #include <sys/types.h>
+ #endif
+ 
++int
+ main()
+ {
+   $1 foo = 0; 
+@@ -146,6 +147,7 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle1, *handle2;
+@@ -229,6 +231,7 @@ char *zsh_gl_sym_addr ;
+ #endif
+ 
+ 
++int
+ main()
+ {
+     void *handle1, *handle2;
+@@ -304,6 +307,7 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+@@ -374,6 +378,7 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+@@ -448,6 +453,7 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+@@ -516,6 +522,7 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;