CVS commit: pkgsrc/shells/es

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Oct 18 08:34:57 UTC 2026

Modified Files:
        pkgsrc/shells/es: distinfo
        pkgsrc/shells/es/patches: patch-aa patch-ab patch-ad patch-ag

Log Message:
es: add missing header to fix build on -current

regen patches


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/shells/es/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/shells/es/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/es/patches/patch-ab
cvs rdiff -u -r1.8 -r1.9 pkgsrc/shells/es/patches/patch-ad
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/es/patches/patch-ag

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

Modified files:

Index: pkgsrc/shells/es/distinfo
diff -u pkgsrc/shells/es/distinfo:1.19 pkgsrc/shells/es/distinfo:1.20
--- pkgsrc/shells/es/distinfo:1.19      Mon Apr 21 21:17:01 2025
+++ pkgsrc/shells/es/distinfo   Sun Oct 18 08:34:57 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.19 2025/04/21 21:17:01 wiz Exp $
+$NetBSD: distinfo,v 1.20 2026/10/18 08:34:57 wiz Exp $
 
 BLAKE2s (es-0.9-alpha1.tar.gz) = 98e16fd1f4205f6f44d42ae439e806dcc6a5f5d236ba7304f636b781b254e58b
 SHA512 (es-0.9-alpha1.tar.gz) = ab33fbcd7673c4d40a2ff8750b6644827a78570203db56af5b2e5ba699feb50ebfafb652d82895ed40ecd22d4b33d987d1d669714242859a97584ab45fe7c5f2
 Size (es-0.9-alpha1.tar.gz) = 125913 bytes
-SHA1 (patch-aa) = 86c79243779566c16be156a4d89c41320c10b606
-SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
+SHA1 (patch-aa) = 4db76472949f54eea841c6ac7c0768b90c04e53e
+SHA1 (patch-ab) = bd62d280c7c79b8610f55509be414872dd2b8315
 SHA1 (patch-ac) = 823dc9324247e6c9ec6f9fd7e2f7a4f92f86120c
-SHA1 (patch-ad) = 6407ebce9aa59489a4c418da51a7443c40d16cd4
+SHA1 (patch-ad) = 6df3d97c2fa0df4f36e17c8f552fb419b404c45e
 SHA1 (patch-ae) = 616a51a6d2472554583b0a8888fca33bbfbfd1f0
 SHA1 (patch-af) = 2ca4b142961395328bce9423c0ca65ec4df25eed
-SHA1 (patch-ag) = adc7c22ebc2f35f76f85a1ef25b2a1a18a19898e
+SHA1 (patch-ag) = 613f968a257f2e540b81d34707250c8ce4e4ca68
 SHA1 (patch-ah) = 19427378a3e9a40681bad72921cd98f7a6b3a79d
 SHA1 (patch-ai) = 3d9beee005db42b4b7af1bc5529b23d1347a8778

Index: pkgsrc/shells/es/patches/patch-aa
diff -u pkgsrc/shells/es/patches/patch-aa:1.7 pkgsrc/shells/es/patches/patch-aa:1.8
--- pkgsrc/shells/es/patches/patch-aa:1.7       Sat Aug 19 00:20:37 2017
+++ pkgsrc/shells/es/patches/patch-aa   Sun Oct 18 08:34:57 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2017/08/19 00:20:37 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2026/10/18 08:34:57 wiz Exp $
 
---- Makefile.orig      1995-05-30 07:14:14.000000000 -0400
+--- Makefile.orig      1995-05-30 11:14:14.000000000 +0000
 +++ Makefile
-@@ -33,8 +33,8 @@
+@@ -33,8 +33,8 @@ CC   = cc
  SHELL = /bin/sh
  CC    = cc
  #CC   = gcc
@@ -13,17 +13,17 @@ $NetBSD: patch-aa,v 1.7 2017/08/19 00:20
  LDFLAGS       =
  LIBS  =
  
-@@ -53,6 +53,13 @@ OFILES      = access.o closure.o conv.o dict.
+@@ -52,6 +52,13 @@ GEN = esdump y.tab.c y.tab.h y.output token.h sigmsgs.
+         tree.o util.o var.o vec.o version.o y.tab.o
  OTHER = Makefile parse.y mksignal
  GEN   = esdump y.tab.c y.tab.h y.output token.h sigmsgs.c initial.c
- 
++
 +all: es
 +
 +install:
 +      ${BSD_INSTALL_PROGRAM} es ${DESTDIR}$(PREFIX)/bin
 +      ${BSD_INSTALL_SCRIPT} esdebug ${DESTDIR}$(PREFIX)/bin/esdebug
 +      ${BSD_INSTALL_MAN} es.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
-+
+ 
  es    : ${OFILES} initial.o
        ${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
- 

Index: pkgsrc/shells/es/patches/patch-ab
diff -u pkgsrc/shells/es/patches/patch-ab:1.1 pkgsrc/shells/es/patches/patch-ab:1.2
--- pkgsrc/shells/es/patches/patch-ab:1.1       Thu Feb 26 07:47:48 2004
+++ pkgsrc/shells/es/patches/patch-ab   Sun Oct 18 08:34:57 2026
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2026/10/18 08:34:57 wiz Exp $
 
---- prim-sys.c.orig    Tue May 30 06:13:51 1995
-+++ prim-sys.c Thu Apr 10 10:15:40 1997
-@@ -194,7 +194,7 @@
+--- prim-sys.c.orig    1995-05-30 11:13:51.000000000 +0000
++++ prim-sys.c
+@@ -13,6 +13,7 @@
+ #include <limits.h>
+ #endif
+ #endif
++#include <sys/stat.h>
+ 
+ PRIM(newpgrp) {
+       int pid;
+@@ -194,7 +195,7 @@ static void printlimit(const Limit *limit, Boolean har
  
  static void printlimit(const Limit *limit, Boolean hard) {
        struct rlimit rlim;
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.1 2004/02/26 07:47
        getrlimit(limit->flag, &rlim);
        if (hard)
                lim = rlim.rlim_max;
-@@ -209,11 +209,11 @@
+@@ -209,11 +210,11 @@ static void printlimit(const Limit *limit, Boolean har
                                lim /= suf->amount;
                                break;
                        }

Index: pkgsrc/shells/es/patches/patch-ad
diff -u pkgsrc/shells/es/patches/patch-ad:1.8 pkgsrc/shells/es/patches/patch-ad:1.9
--- pkgsrc/shells/es/patches/patch-ad:1.8       Mon Apr 21 21:17:01 2025
+++ pkgsrc/shells/es/patches/patch-ad   Sun Oct 18 08:34:57 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.8 2025/04/21 21:17:01 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2026/10/18 08:34:57 wiz Exp $
 
 - Use standard headers.
 - Don't bust portability to avoid union wait, it's no longer an issue.
@@ -17,7 +17,7 @@ $NetBSD: patch-ad,v 1.8 2025/04/21 21:17
  
  #if REQUIRE_IOCTL
  #include <sys/ioctl.h>
-@@ -268,14 +266,24 @@ extern int getgroups(int, int *);
+@@ -268,21 +266,32 @@ extern int getgroups(int, int *);
   *    others an integer.  we just renamed the first letter to s and
   *    let things be.  on some systems these could just be defined in
   *    terms of the W* forms.
@@ -32,7 +32,6 @@ $NetBSD: patch-ad,v 1.8 2025/04/21 21:17
  #define       SCOREDUMP(status)       ((status) & 0x80)
  #define       SIFEXITED(status)       (!SIFSIGNALED(status))
  #define       SEXITSTATUS(status)     (((status) >> 8) & 0xff)
--
 +#else
 +#define       SIFSIGNALED(status)     WIFSIGNALED(status)
 +#define       STERMSIG(status)        WTERMSIG(status)
@@ -41,9 +40,10 @@ $NetBSD: patch-ad,v 1.8 2025/04/21 21:17
 +#define       SEXITSTATUS(status)     WEXITSTATUS(status)
 +#endif
  
+-
  /*
   * the c library -- these should be in prototypes in standard headers
-@@ -283,6 +291,7 @@ extern int getgroups(int, int *);
+  */
  
  /* stdlib */
  

Index: pkgsrc/shells/es/patches/patch-ag
diff -u pkgsrc/shells/es/patches/patch-ag:1.2 pkgsrc/shells/es/patches/patch-ag:1.3
--- pkgsrc/shells/es/patches/patch-ag:1.2       Fri Sep 19 20:02:23 2008
+++ pkgsrc/shells/es/patches/patch-ag   Sun Oct 18 08:34:57 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2008/09/19 20:02:23 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2026/10/18 08:34:57 wiz Exp $
 
---- print.c.orig       1995-05-30 13:13:51.000000000 +0200
+--- print.c.orig       1995-05-30 11:13:51.000000000 +0000
 +++ print.c
 @@ -3,6 +3,8 @@
  #include "es.h"
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2008/09/19 20:02
  #define       MAXCONV 256
  
  /*
-@@ -90,7 +92,7 @@ static void intconv(Format *format, unsi
+@@ -90,7 +92,7 @@ static void intconv(Format *format, unsigned int radix
        if (flags & FMT_long)
                n = va_arg(format->args, long);
        else if (flags & FMT_short)
@@ -20,19 +20,19 @@ $NetBSD: patch-ag,v 1.2 2008/09/19 20:02
        else
                n = va_arg(format->args, int);
  
-@@ -267,12 +269,23 @@ extern int printfmt(Format *format, cons
+@@ -267,12 +269,23 @@ extern int fmtprint VARARGS2(Format *, format, const c
  
  extern int fmtprint VARARGS2(Format *, format, const char *, fmt) {
        int n = -format->flushed;
 -      va_list saveargs = format->args;
 +      va_list saveargs;
-+
+ 
 +#if 1
 +      va_copy(saveargs, format->args);
 +#else
 +      saveargs = format->args;
 +#endif
- 
++
        VA_START(format->args, fmt);
        n += printfmt(format, fmt);
        va_end(format->args);