CVS commit: pkgsrc/shells/es

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Jan 16 01:44:21 UTC 2023

Modified Files:
        pkgsrc/shells/es: Makefile distinfo
        pkgsrc/shells/es/patches: patch-ad

Log Message:
shells/es: configury fixes

Instead of patching in an increasingly long list of OSes to avoid
redefining <stdlib.h> functions on, just use #if 0. Should fix the
Solaris build.

While here, don't hardcode the traditional wait status encoding; it's
no longer necessary to work around union wait and baking it in
violates portability rules.

PKGREVISION -> 5


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/shells/es/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/shells/es/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/shells/es/patches/patch-ad

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/Makefile
diff -u pkgsrc/shells/es/Makefile:1.24 pkgsrc/shells/es/Makefile:1.25
--- pkgsrc/shells/es/Makefile:1.24      Tue Sep 11 23:25:08 2012
+++ pkgsrc/shells/es/Makefile   Mon Jan 16 01:44:21 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2012/09/11 23:25:08 asau Exp $
+# $NetBSD: Makefile,v 1.25 2023/01/16 01:44:21 dholland Exp $
 
 DISTNAME=      es-0.9-alpha1
 PKGNAME=       es-0.9a1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    shells
 MASTER_SITES=  ftp://ftp.sys.toronto.edu/pub/es/
 

Index: pkgsrc/shells/es/distinfo
diff -u pkgsrc/shells/es/distinfo:1.17 pkgsrc/shells/es/distinfo:1.18
--- pkgsrc/shells/es/distinfo:1.17      Tue Oct 26 11:18:37 2021
+++ pkgsrc/shells/es/distinfo   Mon Jan 16 01:44:21 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:18:37 nia Exp $
+$NetBSD: distinfo,v 1.18 2023/01/16 01:44:21 dholland Exp $
 
 BLAKE2s (es-0.9-alpha1.tar.gz) = 98e16fd1f4205f6f44d42ae439e806dcc6a5f5d236ba7304f636b781b254e58b
 SHA512 (es-0.9-alpha1.tar.gz) = ab33fbcd7673c4d40a2ff8750b6644827a78570203db56af5b2e5ba699feb50ebfafb652d82895ed40ecd22d4b33d987d1d669714242859a97584ab45fe7c5f2
@@ -6,7 +6,7 @@ Size (es-0.9-alpha1.tar.gz) = 125913 byt
 SHA1 (patch-aa) = 86c79243779566c16be156a4d89c41320c10b606
 SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
 SHA1 (patch-ac) = 978debd8079eedf7d09862e9946bfd9957c46732
-SHA1 (patch-ad) = 63bf69c25dc9e610b9375685459a1fd05ea66e1e
+SHA1 (patch-ad) = 920dfc46dc5c8b74480b3dcf433aa25b4138494d
 SHA1 (patch-ae) = 3625310b30bbf64f24d6efbcd1864b7e8a92ff59
 SHA1 (patch-af) = 58f29fb3e35236810efc14f1b25fcc4412736404
 SHA1 (patch-ag) = adc7c22ebc2f35f76f85a1ef25b2a1a18a19898e

Index: pkgsrc/shells/es/patches/patch-ad
diff -u pkgsrc/shells/es/patches/patch-ad:1.6 pkgsrc/shells/es/patches/patch-ad:1.7
--- pkgsrc/shells/es/patches/patch-ad:1.6       Thu Nov 10 22:18:33 2005
+++ pkgsrc/shells/es/patches/patch-ad   Mon Jan 16 01:44:21 2023
@@ -1,6 +1,12 @@
-$NetBSD: patch-ad,v 1.6 2005/11/10 22:18:33 joerg Exp $
+$NetBSD: patch-ad,v 1.7 2023/01/16 01:44:21 dholland Exp $
 
---- stdenv.h.orig      1995-05-30 07:13:53.000000000 -0400
+- 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.
+
+--- stdenv.h.orig      1995-05-30 11:13:53.000000000 +0000
 +++ stdenv.h
 @@ -44,9 +44,7 @@
  #include <signal.h>
@@ -21,15 +27,41 @@ $NetBSD: patch-ad,v 1.6 2005/11/10 22:18
  #include "unistd.h"
  #define setpgrp(a, b) setpgid(a, b)
  #endif
-@@ -283,6 +281,7 @@ extern int getgroups(int, int *);
+@@ -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
+  *    terms of the W* forms.
++ *
++ * Update: union wait is long dead, and the conventional exit status
++ * encoding seen here is not universal.
+  */
+ 
++#if 0
+ #define       SIFSIGNALED(status)     (((status) & 0xff) != 0)
+ #define       STERMSIG(status)        ((status) & 0x7f)
+ #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)
++#define       SCOREDUMP(status)       WCOREDUMP(status)
++#define       SIFEXITED(status)       (!SIFSIGNALED(status))
++#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 */
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX) && !defined(__APPLE__) && !defined(__DragonFly__)
++#if 0
  extern noreturn exit(int);
  extern noreturn abort(void);
  extern long strtol(const char *num, char **end, int base);
-@@ -290,6 +289,7 @@ extern void *qsort(
+@@ -290,6 +299,7 @@ extern void *qsort(
        void *base, size_t nmemb, size_t size,
        int (*compar)(const void *, const void *)
  );