CVS commit: pkgsrc/shells/zsh

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Mar 31 22:08:43 UTC 2024

Modified Files:
        pkgsrc/shells/zsh: Makefile distinfo options.mk
Added Files:
        pkgsrc/shells/zsh/patches: patch-configure.ac
Removed Files:
        pkgsrc/shells/zsh/patches: patch-configure

Log Message:
Fix shells/zsh on QNX


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/shells/zsh/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/zsh/patches/patch-configure
cvs rdiff -u -r0 -r1.11 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.105 pkgsrc/shells/zsh/Makefile:1.106
--- pkgsrc/shells/zsh/Makefile:1.105    Sun Nov  6 20:58:00 2022
+++ pkgsrc/shells/zsh/Makefile  Sun Mar 31 22:08:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2022/11/06 20:58:00 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2024/03/31 22:08:42 js Exp $
 
 DISTNAME=      zsh-5.9
 PKGREVISION=   2
@@ -12,7 +12,7 @@ COMMENT=      The Z shell
 LICENSE=       gnu-gpl-v2 AND zsh
 
 USE_LANGUAGES=         c c99
-USE_TOOLS+=            makeinfo
+USE_TOOLS+=            autoconf automake autoreconf makeinfo
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 TEXINFO_REQD=          4.0
@@ -77,6 +77,9 @@ SUBST_VARS.pkgdb=     PKG_DBDIR
 
 .include "options.mk"
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fiv
+
 post-install:
 .for f in FEATURES NEWS Etc/BUGS Etc/FAQ
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/zsh

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.79 pkgsrc/shells/zsh/distinfo:1.80
--- pkgsrc/shells/zsh/distinfo:1.79     Sun Nov  6 20:58:00 2022
+++ pkgsrc/shells/zsh/distinfo  Sun Mar 31 22:08:42 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2022/11/06 20:58:00 wiz Exp $
+$NetBSD: distinfo,v 1.80 2024/03/31 22:08:42 js Exp $
 
 BLAKE2s (zsh-5.9.tar.xz) = 1ab2ab9dd0debc176bdefd661b62e102153c26f591e35916ccc7527c337d0530
 SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
@@ -7,4 +7,4 @@ 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) = 1b757f0ba6611a206f2e9c4d3de5c11fc629a364
+SHA1 (patch-configure.ac) = b1f1d717d6a17a3e6c068fef345d16601361caff

Index: pkgsrc/shells/zsh/options.mk
diff -u pkgsrc/shells/zsh/options.mk:1.6 pkgsrc/shells/zsh/options.mk:1.7
--- pkgsrc/shells/zsh/options.mk:1.6    Sat Mar 16 14:01:45 2019
+++ pkgsrc/shells/zsh/options.mk        Sun Mar 31 22:08:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2019/03/16 14:01:45 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2024/03/31 22:08:42 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.zsh
 PKG_SUPPORTED_OPTIONS=         debug static
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=      --enable-zsh-mem
 .endif
 
 PLIST_VARS+=           dynamic
-.if !empty(PKG_OPTIONS:Mstatic)
+.if !empty(PKG_OPTIONS:Mstatic) || ${OPSYS} == "QNX"
 CONFIGURE_ARGS+=       --disable-dynamic
 .  if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS"
 LDFLAGS+=              -static

Added files:

Index: pkgsrc/shells/zsh/patches/patch-configure.ac
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-configure.ac:1.11
--- /dev/null   Sun Mar 31 22:08:43 2024
+++ pkgsrc/shells/zsh/patches/patch-configure.ac        Sun Mar 31 22:08:43 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure.ac,v 1.11 2024/03/31 22:08:43 js Exp $
+
+Fix SunOS flags.
+
+#include <time.h> for struct timespec, as per POSIX (fixes QNX).
+
+--- configure.ac.orig  2022-05-08 06:18:22.000000000 +0000
++++ configure.ac
+@@ -1165,6 +1165,7 @@ zsh_TYPE_EXISTS([
+ dnl Check for struct timespec since POSIX only gained it in 2008
+ zsh_TYPE_EXISTS([
+ #define _GNU_SOURCE 1
++#include <time.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ #endif
+@@ -2845,7 +2846,7 @@ char *argv[];
+     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
+     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
+     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
+-    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
++    solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
+     beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
+     openbsd*)