CVS commit: pkgsrc/shells/es

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 21:17:01 UTC 2025

Modified Files:
        pkgsrc/shells/es: distinfo
        pkgsrc/shells/es/patches: patch-ac patch-ad patch-ae patch-af

Log Message:
es: remove Interix support


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/shells/es/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/shells/es/patches/patch-ac
cvs rdiff -u -r1.7 -r1.8 pkgsrc/shells/es/patches/patch-ad
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/es/patches/patch-ae \
    pkgsrc/shells/es/patches/patch-af

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.18 pkgsrc/shells/es/distinfo:1.19
--- pkgsrc/shells/es/distinfo:1.18      Mon Jan 16 01:44:21 2023
+++ pkgsrc/shells/es/distinfo   Mon Apr 21 21:17:01 2025
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.18 2023/01/16 01:44:21 dholland Exp $
+$NetBSD: distinfo,v 1.19 2025/04/21 21:17:01 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-ac) = 978debd8079eedf7d09862e9946bfd9957c46732
-SHA1 (patch-ad) = 920dfc46dc5c8b74480b3dcf433aa25b4138494d
-SHA1 (patch-ae) = 3625310b30bbf64f24d6efbcd1864b7e8a92ff59
-SHA1 (patch-af) = 58f29fb3e35236810efc14f1b25fcc4412736404
+SHA1 (patch-ac) = 823dc9324247e6c9ec6f9fd7e2f7a4f92f86120c
+SHA1 (patch-ad) = 6407ebce9aa59489a4c418da51a7443c40d16cd4
+SHA1 (patch-ae) = 616a51a6d2472554583b0a8888fca33bbfbfd1f0
+SHA1 (patch-af) = 2ca4b142961395328bce9423c0ca65ec4df25eed
 SHA1 (patch-ag) = adc7c22ebc2f35f76f85a1ef25b2a1a18a19898e
 SHA1 (patch-ah) = 19427378a3e9a40681bad72921cd98f7a6b3a79d
 SHA1 (patch-ai) = 3d9beee005db42b4b7af1bc5529b23d1347a8778

Index: pkgsrc/shells/es/patches/patch-ac
diff -u pkgsrc/shells/es/patches/patch-ac:1.4 pkgsrc/shells/es/patches/patch-ac:1.5
--- pkgsrc/shells/es/patches/patch-ac:1.4       Thu Nov 10 22:18:33 2005
+++ pkgsrc/shells/es/patches/patch-ac   Mon Apr 21 21:17:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2005/11/10 22:18:33 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2025/04/21 21:17:01 wiz Exp $
 
 --- main.c~    Tue May 30 06:13:50 1995
 +++ main.c     Thu Apr 10 09:20:49 1997
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/10 22:18
  #endif
  
 -#if !HPUX && !defined(linux)
-+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__) && !defined(__DragonFly__)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
  extern int getopt (int argc, char **argv, const char *optstring);
  #endif
  extern int optind;

Index: pkgsrc/shells/es/patches/patch-ad
diff -u pkgsrc/shells/es/patches/patch-ad:1.7 pkgsrc/shells/es/patches/patch-ad:1.8
--- pkgsrc/shells/es/patches/patch-ad:1.7       Mon Jan 16 01:44:21 2023
+++ pkgsrc/shells/es/patches/patch-ad   Mon Apr 21 21:17:01 2025
@@ -1,7 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2023/01/16 01:44:21 dholland Exp $
+$NetBSD: patch-ad,v 1.8 2025/04/21 21:17:01 wiz Exp $
 
 - Use standard headers.
-- Handle setpgrp on Interix.
 - Don't bust portability to avoid union wait, it's no longer an issue.
 - Don't redeclare standard functions from stdlib.h, especiall since
   the qsort prototype is wrong.
@@ -18,15 +17,6 @@ $NetBSD: patch-ad,v 1.7 2023/01/16 01:44
  
  #if REQUIRE_IOCTL
  #include <sys/ioctl.h>
-@@ -239,7 +237,7 @@ extern int getgroups(int, int *);
-  * hacks to present a standard system call interface
-  */
- 
--#ifdef linux
-+#if defined(linux) || defined(__INTERIX)
- #include "unistd.h"
- #define setpgrp(a, b) setpgid(a, b)
- #endif
 @@ -268,14 +266,24 @@ 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

Index: pkgsrc/shells/es/patches/patch-ae
diff -u pkgsrc/shells/es/patches/patch-ae:1.2 pkgsrc/shells/es/patches/patch-ae:1.3
--- pkgsrc/shells/es/patches/patch-ae:1.2       Thu Mar 10 15:18:31 2005
+++ pkgsrc/shells/es/patches/patch-ae   Mon Apr 21 21:17:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2005/03/10 15:18:31 tv Exp $
+$NetBSD: patch-ae,v 1.3 2025/04/21 21:17:01 wiz Exp $
 
 --- util.c.orig        1995-05-30 07:13:52.000000000 -0400
 +++ util.c
@@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.2 2005/03/10 15:18
  
 +#include <sys/param.h>
 +
-+#if !(defined(BSD) && BSD >= 199306) && !defined(__INTERIX)
++#if !(defined(BSD) && BSD >= 199306)
 +/* agc - just use the system strerror here */
  /* strerror -- turn an error code into a string */
  extern char *strerror(int n) {
Index: pkgsrc/shells/es/patches/patch-af
diff -u pkgsrc/shells/es/patches/patch-af:1.2 pkgsrc/shells/es/patches/patch-af:1.3
--- pkgsrc/shells/es/patches/patch-af:1.2       Fri Sep 19 20:02:23 2008
+++ pkgsrc/shells/es/patches/patch-af   Mon Apr 21 21:17:01 2025
@@ -1,24 +1,8 @@
-$NetBSD: patch-af,v 1.2 2008/09/19 20:02:23 joerg Exp $
+$NetBSD: patch-af,v 1.3 2025/04/21 21:17:01 wiz Exp $
 
 --- config.h.orig      1995-05-30 13:13:53.000000000 +0200
 +++ config.h
-@@ -378,6 +378,15 @@
- #endif
- #endif
- 
-+#ifdef __INTERIX
-+#ifndef USE_WAIT3
-+#define USE_WAIT3             0
-+#endif
-+#ifndef       USE_SIGACTION
-+#define USE_SIGACTION         1
-+#endif
-+#endif
-+
- 
- /*
-  * default defaults -- don't change this section
-@@ -533,3 +542,5 @@
+@@ -533,3 +533,5 @@
  #undef        SYSV_SIGNALS
  #define       SYSV_SIGNALS            0
  #endif