[pkgsrc/trunk]: pkgsrc/misc/fep - kill gcc-3 preprocessor warnings about #{el...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc/fep - kill gcc-3 preprocessor warnings about #{el...
From: christos <christos%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:08:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecd40e4ebe2f
branches:  trunk
changeset: 463353:ecd40e4ebe2f
user:      christos <christos%pkgsrc.org@localhost>
date:      Fri Nov 07 16:35:51 2003 +0000

description:
- kill gcc-3 preprocessor warnings about #{else,endif} TAG
- exit with the child's exit value and with non zero on error

diffstat:

 misc/fep/distinfo         |   26 ++--
 misc/fep/patches/patch-aa |    6 +-
 misc/fep/patches/patch-ab |   15 ++-
 misc/fep/patches/patch-ac |   14 +-
 misc/fep/patches/patch-ad |   50 ++++++++-
 misc/fep/patches/patch-ae |  235 +++++++++++++++++++++++++++++++++++++++++++++-
 misc/fep/patches/patch-af |   14 +-
 misc/fep/patches/patch-ag |   15 ++-
 misc/fep/patches/patch-ah |   15 ++-
 misc/fep/patches/patch-ai |   14 +-
 misc/fep/patches/patch-aj |   79 ++++++++++++---
 misc/fep/patches/patch-ak |  154 ++++++++++++++++--------------
 12 files changed, 499 insertions(+), 138 deletions(-)

diffs (truncated from 860 to 300 lines):

diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/distinfo
--- a/misc/fep/distinfo Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/distinfo Fri Nov 07 16:35:51 2003 +0000
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.3 2003/03/09 04:39:29 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/11/07 16:35:51 christos Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 Size (fep.tar.gz) = 40137 bytes
-SHA1 (patch-aa) = a24a99e7823e3e00a2356714b8bfed9224618d3a
-SHA1 (patch-ab) = 9f778dfbf3a2c427680edc50ee49bd42444d96f0
-SHA1 (patch-ac) = dca990ac75afa7f34ef9fbd1f58702d7a144a0e0
-SHA1 (patch-ad) = a507e7f8b7d2b21d09f0403fa243fcf7120afa78
-SHA1 (patch-ae) = 2c2fc7c43c4a8d641c76318df76f902ec3ccb62c
-SHA1 (patch-af) = d5e38e18b69ccd81a0d98385f7fb746c5c29b4e2
-SHA1 (patch-ag) = 6d2fd45f147fcad933589e548df939ae097e0239
-SHA1 (patch-ah) = 9e22fa41d866e916090c73c17f234f19d1d47fa3
-SHA1 (patch-ai) = 8b3208fe4d162357b763366bd9c8baa7272d30b5
-SHA1 (patch-aj) = c2d1950ddd1a1683148176c30e086599d824002e
-SHA1 (patch-ak) = 98b33fb196f2a300fa5ce947e466801b8fcf1af4
+SHA1 (patch-aa) = 1f8abf4fd9437fac506274d5bd02e641465ed19d
+SHA1 (patch-ab) = 33ed4137d8dc1006c57b3d2f77c736c5dcfd88f1
+SHA1 (patch-ac) = 35886a142911bc6da8b6661de86ab803d5f506f9
+SHA1 (patch-ad) = bd19298f8277a0385d3612a2a99f9f586eeb156c
+SHA1 (patch-ae) = aa6ca28dac7ebbca2f00513d8f60ef4064e13024
+SHA1 (patch-af) = d4422c9f033e16c8ad137723e4c82f051aad3b7b
+SHA1 (patch-ag) = 1bdc893ab86462fe1347ab8366f105bbed50fe87
+SHA1 (patch-ah) = d63de2c13396fa4657282433cf22f086d6141cdb
+SHA1 (patch-ai) = 409c63c5cb5283735ea83f047f65357caf9e6331
+SHA1 (patch-aj) = 3266b9c80e104290b62460acc73a1c1ab2accee4
+SHA1 (patch-ak) = d1b517c222d26c74c325773220039e1319a57554
+SHA1 (patch-al) = f82284b2ddea4d3ec8cc7d00e8654b1f28354796
+SHA1 (patch-am) = 9d8e7fb850cf08bfe80726a9cfad657adebd130d
diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/patches/patch-aa
--- a/misc/fep/patches/patch-aa Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/patches/patch-aa Fri Nov 07 16:35:51 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/02/07 03:18:08 christos Exp $
+$NetBSD: patch-aa,v 1.5 2003/11/07 16:35:51 christos Exp $
 
---- Makefile.orig      Wed Jun  9 22:51:22 1993
-+++ Makefile   Sun Feb  6 21:48:47 2000
+--- Makefile.orig      1993-06-09 22:51:22.000000000 -0400
++++ Makefile   2003-11-07 11:13:19.000000000 -0500
 @@ -15,17 +15,21 @@
  DISTRIBUTION\
        = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/patches/patch-ab
--- a/misc/fep/patches/patch-ab Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/patches/patch-ab Fri Nov 07 16:35:51 2003 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2000/02/07 03:18:10 christos Exp $
+$NetBSD: patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $
 
---- fep_alias.c.orig   Sun Nov 13 01:50:58 1988
-+++ fep_alias.c        Sun Feb  6 21:07:44 2000
+--- fep_alias.c.orig   1988-11-13 01:50:58.000000000 -0500
++++ fep_alias.c        2003-11-07 11:23:03.000000000 -0500
+@@ -3,7 +3,7 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
+-#endif lint
++#endif /* lint */
+ 
+ #include <stdio.h>
+ #include <ctype.h>
 @@ -18,7 +18,7 @@
  
  ALIAS alias_top = {"top", "top", (ALIAS *)0};
diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/patches/patch-ac
--- a/misc/fep/patches/patch-ac Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/patches/patch-ac Fri Nov 07 16:35:51 2003 +0000
@@ -1,9 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/02/07 03:18:10 christos Exp $
+$NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
 
---- fep_com.c.orig     Wed May 29 01:31:09 1991
-+++ fep_com.c  Sun Feb  6 21:47:53 2000
-@@ -6,7 +6,17 @@
- #endif lint
+--- fep_com.c.orig     1991-05-29 01:31:09.000000000 -0400
++++ fep_com.c  2003-11-07 11:22:46.000000000 -0500
+@@ -3,10 +3,20 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
+-#endif lint
++#endif /* lint */
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/patches/patch-ad
--- a/misc/fep/patches/patch-ad Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/patches/patch-ad Fri Nov 07 16:35:51 2003 +0000
@@ -1,11 +1,51 @@
-$NetBSD: patch-ad,v 1.2 2000/02/13 14:20:42 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $
 
---- fep_defs.h.orig    Mon May 10 01:23:33 1993
-+++ fep_defs.h Sun Feb 13 09:17:42 2000
-@@ -6,5 +6,5 @@
- #endif lint
+--- fep_defs.h.orig    1993-05-10 01:23:33.000000000 -0400
++++ fep_defs.h 2003-11-07 11:14:52.000000000 -0500
+@@ -3,9 +3,9 @@
+ #ifndef lint
+ # define FEP_DEFS \
+     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $ (SRA)"
+-#endif lint
++#endif /* lint */
  
 -#define       MAXCOMLEN               512     /* maximum command length */
 +#define       MAXCMDLEN               512     /* maximum command length */
  #define MAXARGS                       64      /* maximum number of arguments */
  #define ON                    1       /* on switch */
+ #define OFF                   0       /* off switch */
+@@ -31,11 +31,11 @@
+ # define isctlchar(c) (c && !iskanji(c) && (!(c&0140) || c=='\177'))
+ # define iswordchar(c)        (c && (iskanji(c) || isalnum(c) || iscntrl(c)))
+ # define isWordchar(c)        ((c) && !isspace((c)))
+-#else KANJI
++#else /* KANJI */
+ # define isctlchar(c) (c && (!(c&0140) || c=='\177'))
+ # define iswordchar(c)        (isalnum(c) || iscntrl(c))
+ # define isWordchar(c)        ((c) && !isspace((c)))
+-#endif KANJI
++#endif /* KANJI */
+ #define unctl(c)      (((c)=='\177') ? '?' : ((c) >= 040) ? (c) : (c)|0100)
+ #define toctrl(c)     ((c)&~0100)
+ #define ctrl(c)               ((c)&037)
+@@ -53,17 +53,17 @@
+ #ifdef KANJI
+ # define CHAR         unsigned char
+ # define CHARMASK     0377
+-#else KANJI
++#else /* KANJI */
+ # define CHAR         char
+ # define CHARMASK     0177
+-#endif KANJI
++#endif /* KANJI */
+ 
+ /*
+  * Only one machine I know alloca() works is vax.
+  */
+ #ifdef vax
+ # define ALLOCA
+-#endif vax
++#endif /* vax */
+ 
+ /*
+  * Typedef's
diff -r 689411e17a96 -r ecd40e4ebe2f misc/fep/patches/patch-ae
--- a/misc/fep/patches/patch-ae Fri Nov 07 16:34:41 2003 +0000
+++ b/misc/fep/patches/patch-ae Fri Nov 07 16:35:51 2003 +0000
@@ -1,8 +1,14 @@
-$NetBSD: patch-ae,v 1.2 2003/03/09 04:39:29 salo Exp $
+$NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
 
---- fep_edit.c.orig    1995-01-20 09:16:37.000000000 +0100
-+++ fep_edit.c 2003-03-09 05:26:37.000000000 +0100
-@@ -8,7 +8,17 @@
+--- fep_edit.c.orig    1995-01-20 03:16:37.000000000 -0500
++++ fep_edit.c 2003-11-07 11:25:48.000000000 -0500
+@@ -3,12 +3,22 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Id: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $ (SRA)";
+-#endif lint
++#endif /* lint */
+ 
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -98,7 +104,12 @@
            && curFuncTab[c] != send_eof
            && ! look_var ("ignore-eof")
            && CommandLine [0] == '\0'
-@@ -426,7 +465,7 @@
+@@ -422,11 +461,11 @@
+     register int i, nbyte = 1, currentNull;
+ #ifdef KANJI
+     CHAR byte2;
+-#endif KANJI
++#endif /* KANJI */
  
      currentNull = strlen (CommandLine);
  
@@ -107,6 +118,169 @@
          errorBell();
        return (0);
      }
+@@ -441,7 +480,7 @@
+       nbyte = 2;
+     }
+     else
+-#endif KANJI
++#endif /* KANJI */
+       putChar (c);
+     reverse_strcpy (
+       &CommandLine[CurrentPosition] + nbyte,
+@@ -453,7 +492,7 @@
+     if (nbyte > 1) {
+       CommandLine[CurrentPosition - 1] = byte2;
+     }
+-#endif KANJI
++#endif /* KANJI */
+     printS (&CommandLine [CurrentPosition]);
+ 
+     if (CommandLine[CurrentPosition] != '\0') {
+@@ -557,7 +596,7 @@
+ #ifdef KANJI
+           && !(CurrentPosition + 1 == position
+                   && iskanji (CommandLine[CurrentPosition]))
+-#endif KANJI
++#endif /* KANJI */
+       )
+           (void) forward_n_character (1);
+ }
+@@ -581,10 +620,10 @@
+ #ifdef KANJI
+ #define INC(i) if(iskanji(CommandLine[i])) i+=2; else i++;
+ #define DEC(i) if(i>=2 && iskanji_in_string(CommandLine, i-2)) i-=2; else i--;
+-#else KANJI
++#else /* KANJI */
+ #define INC(i) i++
+ #define DEC(i) i--
+-#endif KANJI
++#endif /* KANJI */
+ 
+ /*
+  * Move cursor to end of line
+@@ -642,7 +681,7 @@
+           i--;
+       }
+       else
+-#endif KANJI
++#endif /* KANJI */
+       putchar (BS);
+       i--;
+     }
+@@ -697,7 +736,7 @@
+           nchars++;
+       }
+     }
+-#else KANJI
++#else /* KANJI */
+     while (n--) {
+       i--, nchars++;
+       while (i > 0 && !iswordchar (CommandLine [i])) {
+@@ -707,7 +746,7 @@
+           i--, nchars++;
+       }
+     }
+-#endif KANJI
++#endif /* KANJI */
+     return (backward_n_character (nchars));
+ }
+ 
+@@ -758,7 +797,7 @@
+           nchars++;
+       }
+     }
+-#else KANJI
++#else /* KANJI */
+     while (n--) {
+       i--, nchars++;
+       while (i > 0 && !isWordchar (CommandLine [i]))
+@@ -766,7 +805,7 @@
+       while (i > 0 && isWordchar (CommandLine [i - 1]))
+           i--, nchars++;
+     }
+-#endif KANJI
++#endif /* KANJI */
+     return (backward_n_character (nchars));
+ }
+ 
+@@ -804,7 +843,7 @@
+       (void) putchar (CommandLine[i++]);
+     }
+     else
+-#endif KANJI
++#endif /* KANJI */
+     if (isctlchar(CommandLine[i])) {
+       (void) putchar (unctl (CommandLine [i]));
+       i++;
+@@ -819,7 +858,7 @@
+           (void) putchar (CommandLine[i++]);
+       }
+       else
+-#endif KANJI
++#endif /* KANJI */
+       putChar (CommandLine [i++]);
+     }
+ 
+@@ -1000,9 +1039,9 @@
+           i -= 2, nbyte += 2;
+       else
+           i -= 1, nbyte += 1;
+-#else KANJI
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/Xrender depend on Xrender 0.8 (rather than 0.8.3),...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/netatalk Add buildlink2.mk for net/netatalk. (Okay...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/Xrender depend on Xrender 0.8 (rather than 0.8.3),...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/netatalk Add buildlink2.mk for net/netatalk. (Okay...
Indexes:
Home | Main Index | Thread Index | Old Index