[pkgsrc/trunk]: pkgsrc/misc/fep Make patches apply again; use sed script in p...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f8c706154eb
branches:  trunk
changeset: 463443:5f8c706154eb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 11 10:42:32 2003 +0000

description:
Make patches apply again; use sed script in pre-build
to remove stuff after #endif to avoid RCS problems with patches (hi christos!).

diffstat:

 misc/fep/Makefile         |   8 ++++-
 misc/fep/distinfo         |  28 ++++++++--------
 misc/fep/patches/patch-aa |  10 ++--
 misc/fep/patches/patch-ab |  19 ++--------
 misc/fep/patches/patch-ac |  42 +++++++++++-------------
 misc/fep/patches/patch-ad |  26 ++++----------
 misc/fep/patches/patch-ae |  80 +++++++++++++++++++++-------------------------
 misc/fep/patches/patch-af |  18 ++++------
 misc/fep/patches/patch-ag |  17 ++-------
 misc/fep/patches/patch-ah |  17 ++-------
 misc/fep/patches/patch-ai |  26 ++++++--------
 misc/fep/patches/patch-aj |  64 ++++++++++++++++---------------------
 misc/fep/patches/patch-ak |  29 +++++-----------
 misc/fep/patches/patch-al |  21 +++--------
 misc/fep/patches/patch-am |  22 +++++-------
 15 files changed, 174 insertions(+), 253 deletions(-)

diffs (truncated from 1222 to 300 lines):

diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/Makefile
--- a/misc/fep/Makefile Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/Makefile Tue Nov 11 10:42:32 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/11 10:42:32 wiz Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
 #
 
@@ -19,4 +19,10 @@
 
 MANCOMPRESSED= yes
 
+pre-build:
+       cd ${WRKSRC} && \
+               for i in *.[ch]; do ${SED} "s,#endif lint,#endif /* lint */,g" $${i} > $${i}.new && \
+                       ${MV} -f $${i}.new $${i}; \
+               done
+
 .include "../../mk/bsd.pkg.mk"
diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/distinfo
--- a/misc/fep/distinfo Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/distinfo Tue Nov 11 10:42:32 2003 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.4 2003/11/07 16:35:51 christos Exp $
+$NetBSD: distinfo,v 1.5 2003/11/11 10:42:32 wiz Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 Size (fep.tar.gz) = 40137 bytes
-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
+SHA1 (patch-aa) = fd1fa7e7978d007bcccd55726d47ce66edd585f2
+SHA1 (patch-ab) = 3d05ad0b25a56ce588e7d31afa7685b18ca94bd6
+SHA1 (patch-ac) = 6f989e576260e95c035cb12c13d43b095414913b
+SHA1 (patch-ad) = 696b57cb1b282e01549995b1bbf51b10aa881f0b
+SHA1 (patch-ae) = dd89c7124376a77a3809a28025c2975fcdf445ab
+SHA1 (patch-af) = a2d8a7c9050ee89f66c211d1ed818091163a8858
+SHA1 (patch-ag) = 1a8cd62babb699ff85ec4e8ec56ef844f7f401c7
+SHA1 (patch-ah) = c08a2af68c59f254cd33969a98d2376047ae4f0f
+SHA1 (patch-ai) = f5b420c63c13612182ff5c093277e9a6bd608e48
+SHA1 (patch-aj) = 47983e99dd157e16b155e96d39bbea8039f291ad
+SHA1 (patch-ak) = c7e65cb589f9267a11b688a8773704c7e13ab8a3
+SHA1 (patch-al) = b6f57757e7374e3268e45ac0a294c45d0bff7258
+SHA1 (patch-am) = 4b19832075292802c1ddf2fdc9083b7379eb4066
diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/patches/patch-aa
--- a/misc/fep/patches/patch-aa Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/patches/patch-aa Tue Nov 11 10:42:32 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-aa,v 1.6 2003/11/11 10:42:32 wiz Exp $
 
---- Makefile.orig      1993-06-09 22:51:22.000000000 -0400
-+++ Makefile   2003-11-07 11:13:19.000000000 -0500
-@@ -15,17 +15,21 @@
+--- Makefile.orig      Thu Jun 10 04:51:22 1993
++++ Makefile
+@@ -15,17 +15,21 @@ OBJ        = fep_main.o fep_edit.o fep_hist.o f
  DISTRIBUTION\
        = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
  
@@ -28,7 +28,7 @@
  
  all: $(TARGET)
  
-@@ -37,7 +41,7 @@
+@@ -37,7 +41,7 @@ argv: fep_com.c
  
  install: $(TARGET)
        install -s $(TARGET) $(INSTDIR)
diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/patches/patch-ab
--- a/misc/fep/patches/patch-ab Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/patches/patch-ab Tue Nov 11 10:42:32 2003 +0000
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ab,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- 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 @@
+--- fep_alias.c.orig   Sun Nov 13 07:50:58 1988
++++ fep_alias.c
+@@ -18,7 +18,7 @@ typedef struct _alias {
  
  ALIAS alias_top = {"top", "top", (ALIAS *)0};
  ALIAS *alias_list = &alias_top;
@@ -20,7 +11,7 @@
  
  /*
   * Functions
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ check_alias (comline)
  
      while (isspace (*comline))
        ++comline;
diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/patches/patch-ac
--- a/misc/fep/patches/patch-ac Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/patches/patch-ac Tue Nov 11 10:42:32 2003 +0000
@@ -1,13 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- 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 */
+--- fep_com.c.orig     Wed May 29 07:31:09 1991
++++ fep_com.c
+@@ -6,7 +6,17 @@ static char rcsid[]=
+ #endif lint
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -24,7 +20,7 @@
  #include <ctype.h>
  #include <sys/param.h>
  #include <sys/file.h>
-@@ -31,7 +41,7 @@
+@@ -31,7 +41,7 @@ executeBuiltInFunction (comline, more)
      char *comline, **more;
  {
      register FunctionTableEnt *ftp;
@@ -33,7 +29,7 @@
      char *search_string();
      int argc;
  
-@@ -93,7 +103,7 @@
+@@ -93,7 +103,7 @@ is_same_command (a, b)
  
      while (*a && *b && *a == *b)
        ++a, ++b;
@@ -42,7 +38,7 @@
        return 1;
      else
        return 0;
-@@ -295,7 +305,7 @@
+@@ -295,7 +305,7 @@ unalias (comline)
  set (comline)
      char *comline;
  {
@@ -51,7 +47,7 @@
      char *cp, *index();
      char *argv[MAXARGS];
      int argc;
-@@ -352,8 +362,13 @@
+@@ -352,8 +362,13 @@ unset(comline)
  
  extern        int Transparency;
  extern        int Through;
@@ -67,7 +63,7 @@
  extern        int master, slave;
  extern        char slave_tty[];
  
-@@ -368,7 +383,11 @@
+@@ -368,7 +383,11 @@ toggle_through()
  {
      int r;
      int slave_fd;
@@ -79,7 +75,7 @@
  
      if (Through == OFF) {
  
-@@ -378,15 +397,26 @@
+@@ -378,15 +397,26 @@ toggle_through()
            return;
        }
  
@@ -106,7 +102,7 @@
        if (r < 0) {
            perror (slave_tty);
            (void) close (slave_fd);
-@@ -394,7 +424,11 @@
+@@ -394,7 +424,11 @@ toggle_through()
        (void) close (slave_fd);
      }
      else
@@ -118,7 +114,7 @@
  
      if (r < 0) {
        printf ("Can't change pty mode.\n");
-@@ -410,7 +444,11 @@
+@@ -410,7 +444,11 @@ toggle_through()
  fix_transparency()
  {
      int r;
@@ -130,7 +126,7 @@
  
      if (Through)
        return;
-@@ -418,11 +456,17 @@
+@@ -418,11 +456,17 @@ fix_transparency()
      if (slave < 0)
        return;
  
@@ -148,7 +144,7 @@
      if (r < 0) {
        perror (slave_tty);
        return;
-@@ -432,9 +476,19 @@
+@@ -432,9 +476,19 @@ fix_transparency()
       * If find slave tty mode is cbreak or raw, fix tty mode of stdout to
       * same mode as slave and set Transparency ON.
       */
@@ -169,7 +165,7 @@
            if (r < 0) {
                perror ("stdout");
                return;
-@@ -445,7 +499,11 @@
+@@ -445,7 +499,11 @@ fix_transparency()
      }
      else {
        if (Transparency == ON) {
@@ -182,7 +178,7 @@
            if (r < 0) {
                perror ("stdout");
                return;
-@@ -738,9 +796,9 @@
+@@ -738,9 +796,9 @@ char *line;
  fep_pwd (line)
      char *line;
  {
@@ -194,7 +190,7 @@
      printf ("%s\n", cwd);
  }
  
-@@ -755,7 +813,7 @@
+@@ -755,7 +813,7 @@ fep_echo (comline)
      argc = mkargv (comline, argv, MAXARGS);
      
      argp = &argv[1];
@@ -203,7 +199,7 @@
        putnewline = 0;
        ++argp;
      }
-@@ -791,7 +849,7 @@
+@@ -791,7 +849,7 @@ fep_command (comline)
      int argc;
      int i;
      char **argp;
diff -r 62a941436ad2 -r 5f8c706154eb misc/fep/patches/patch-ad
--- a/misc/fep/patches/patch-ad Tue Nov 11 10:30:41 2003 +0000
+++ b/misc/fep/patches/patch-ad Tue Nov 11 10:42:32 2003 +0000
@@ -1,21 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ad,v 1.4 2003/11/11 10:42:32 wiz Exp $
 
---- 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 */
+--- fep_defs.h.orig    Mon May 10 07:23:33 1993
++++ fep_defs.h
+@@ -6,5 +6,5 @@
+ #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'))
+@@ -32,9 +32,9 @@
  # define iswordchar(c)        (c && (iskanji(c) || isalnum(c) || iscntrl(c)))
  # define isWordchar(c)        ((c) && !isspace((c)))
 -#else KANJI
@@ -27,9 +21,7 @@
 +#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