[pkgsrc/trunk]: pkgsrc/misc/fep use -u0 to make this patch to avoid $Id$ from...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3b7f437fb74
branches:  trunk
changeset: 499195:d3b7f437fb74
user:      christos <christos%pkgsrc.org@localhost>
date:      Tue Sep 13 19:40:59 2005 +0000

description:
use -u0 to make this patch to avoid $Id$ from being expanded.

diffstat:

 misc/fep/distinfo         |    4 +-
 misc/fep/patches/patch-aj |  312 +++++++--------------------------------------
 2 files changed, 53 insertions(+), 263 deletions(-)

diffs (truncated from 474 to 300 lines):

diff -r 75c709c3570d -r d3b7f437fb74 misc/fep/distinfo
--- a/misc/fep/distinfo Tue Sep 13 19:39:46 2005 +0000
+++ b/misc/fep/distinfo Tue Sep 13 19:40:59 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/09/13 19:25:57 christos Exp $
+$NetBSD: distinfo,v 1.8 2005/09/13 19:40:59 christos Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
@@ -12,7 +12,7 @@
 SHA1 (patch-ag) = 1a8cd62babb699ff85ec4e8ec56ef844f7f401c7
 SHA1 (patch-ah) = c08a2af68c59f254cd33969a98d2376047ae4f0f
 SHA1 (patch-ai) = f5b420c63c13612182ff5c093277e9a6bd608e48
-SHA1 (patch-aj) = b8f53a04a078c730bb69e9d55b4a50f21c360c99
+SHA1 (patch-aj) = 232e8089aa6ea73e0335df9d25a2268360074531
 SHA1 (patch-ak) = c7e65cb589f9267a11b688a8773704c7e13ab8a3
 SHA1 (patch-al) = b6f57757e7374e3268e45ac0a294c45d0bff7258
 SHA1 (patch-am) = 4b19832075292802c1ddf2fdc9083b7379eb4066
diff -r 75c709c3570d -r d3b7f437fb74 misc/fep/patches/patch-aj
--- a/misc/fep/patches/patch-aj Tue Sep 13 19:39:46 2005 +0000
+++ b/misc/fep/patches/patch-aj Tue Sep 13 19:40:59 2005 +0000
@@ -1,64 +1,37 @@
-$NetBSD: patch-aj,v 1.4 2005/09/13 19:25:57 christos Exp $
+$NetBSD: patch-aj,v 1.5 2005/09/13 19:40:59 christos Exp $
 
 --- fep_main.c.orig    1993-06-09 22:53:06.000000000 -0400
-+++ fep_main.c 2004-02-20 09:50:33.000000000 -0500
-@@ -3,15 +3,25 @@
- #ifndef lint
- static char rcsid[]=
- "$Id: patch-aj,v 1.4 2005/09/13 19:25:57 christos Exp $ (SRA)";
++++ fep_main.c 2005-09-13 15:38:02.000000000 -0400
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
- #include <stdio.h>
- #include <signal.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
+@@ -13 +13,8 @@
 -#include <sys/file.h>
 +#ifdef TERMIOS
++#include <stdlib.h>
++#include <fcntl.h>
 +#include <termios.h>
-+#ifdef __linux__
 +#ifndef _POSIX_VDISABLE
 +#define _POSIX_VDISABLE '\0'
 +#endif
-+#include <stdlib.h>
-+#endif
 +#else
- #include <sgtty.h>
-+#endif
+@@ -14,0 +22,2 @@
 +#include <sys/file.h>
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/errno.h>
-@@ -30,7 +40,7 @@
- #ifdef STAT
-   static char fep_statrc[] = FEP_STAT;
- #endif
++#endif
+@@ -33 +42 @@
 -#endif lint
 +#endif /* lint */
- 
- char  *myself;                        /* the command name */
- char  *prompt = "";                   /* prompt string */
-@@ -38,9 +48,9 @@
-                                       /* delimiter characters */
- int   master;                         /* file discriptor for pty master */
- int   slave;                          /* file discriptor for pty slave */
+@@ -41,3 +50,3 @@
 -int   mastermask;                     /* 1<<master */
 -int   stdinmask;                      /* 1<<fileno(stdin) */
 -int   selectmask;                     /* stdinmask | mastermask */
 +fd_set        mastermask;                     /* 1<<master */
 +fd_set        stdinmask;                      /* 1<<fileno(stdin) */
 +fd_set        selectmask;                     /* stdinmask | mastermask */
- int   selectnfds;                     /* max (fileno(stdin), master) + 1*/
- int   child_pid;                      /* child pid */
- int   ptyflag = ON;                   /* flag to use pty or not */
-@@ -48,27 +58,34 @@
- int   debug = OFF;                    /* debug switch */
- int   auto_tty_fix = ON;              /* fix tty mode automaticaly */
- FILE  *script_fp = NULL;              /* script file pointer */
+@@ -51 +60 @@
 -int   catchsig();                     /* function take care SIGCHILD */
 +void  catchsig __P((int));            /* function take care SIGCHILD */
- 
+@@ -53,3 +62,8 @@
 -struct        sgttyb initial_ttymode;         /* initial tty mode */
 -struct        sgttyb master_ttymode;          /* master tty mode */
 -struct        sgttyb slave_ttymode;           /* slave tty mode */
@@ -70,186 +43,82 @@
 +struct        ttystruct initial_ttymode;              /* initial tty mode */
 +struct        ttystruct master_ttymode;               /* master tty mode */
 +struct        ttystruct slave_ttymode;                /* slave tty mode */
- 
- int   lines;                          /* terminal line size */
- int   columns;                        /* terminal coulumn size */
- char  *term_clear;                    /* terminal clear code */
- 
+@@ -61 +75 @@
 -void  (*sighup)(), (*sigchld)(), (*sigtstp)();
 +void  (*sighup) __P((int)), (*sigchld) __P((int)), (*sigtstp) __P((int));
-                                       /* function buffer for signal */
- 
+@@ -63,0 +78 @@
 +#ifdef TIOCSETN
- struct        tchars tchars_buf;              /* tty characters */
- struct        ltchars ltchars_buf;            /* tty characters */
+@@ -65,0 +81 @@
 +#endif
- int   lmode_buf;                      /* local mode */
- int   line_desc;                      /* line descipline */
- #ifdef KANJI
- struct        jtchars jtchars_buf;            /* kanji tty characters */
- int   kmode_buf;                      /* kanji mode */
+@@ -71 +87 @@
 -#endif KANJI
 +#endif /* KANJI */
- 
- char  master_tty[16];                 /* master tty name */
- char  slave_tty[16];                  /* slave tty name */
-@@ -112,6 +129,10 @@
- 
-     myself = argv[0];
- 
+@@ -114,0 +131,4 @@
 +    setvbuf(stdin, NULL, _IONBF, 0);
 +    setvbuf(stdout, NULL, _IONBF, 0);
 +    setvbuf(stderr, NULL, _IONBF, 0);
 +
-     /*
-      * Initialize binding table
-      */
-@@ -172,7 +193,7 @@
-                   histlen = atoi (argv[1]);
-               }
-               else {
+@@ -175 +195 @@
 -                  histlen = atoi (&argv[1] + 2);
 +                  histlen = atoi (argv[1] + 2);
-               }
-               break;
- 
-@@ -276,7 +297,7 @@
- fix_signal ()
- {
- #ifdef SIGWINCH
+@@ -279 +299 @@
 -    int sigwinch();
 +    void sigwinch __P((int));
- #endif
- 
-     sighup = signal (SIGHUP, terminate);
-@@ -336,7 +357,7 @@
-       if (Through == OFF && Transparency == OFF && script_fp)
-           fwrite (inputline, sizeof(CHAR), strlen (inputline), script_fp);
-     }
+@@ -339 +359 @@
 -    terminate ();
 +    terminate (0);
- }
- 
- #define INPUT_BUFFER_SIZE 1024
-@@ -384,7 +405,8 @@
- {
-     char c;
-     int n;
+@@ -387 +407,2 @@
 -    int nfound, readfd, writefd = 0, execptfd = 0;
 +    int nfound;
 +    fd_set readfd, writefd, exceptfd;
- #ifdef USE_TIMEOUT
-     struct timeval **timeout = auto_tty_fix ? timeout_list : notimeout;
- #else
-@@ -396,9 +418,8 @@
-     /*
-      * Sorry, this cording depends to an implementation of getc().
-      */
+@@ -399,3 +420,2 @@
 -#   define CHAR_IN_BUFFER (stdin->_cnt)
 -    if (CHAR_IN_BUFFER)
 -      goto RETURNCHAR;
 +    FD_ZERO(&writefd);
 +    FD_ZERO(&exceptfd);
- 
- RETRY:
-     readfd = selectmask;
-@@ -409,13 +430,13 @@
-     while ((nfound = select (selectnfds, &readfd, 0, 0, *timeout)) < 0)
-       if (errno != EINTR) {
-               perror ("select");
+@@ -412 +432 @@
 -              terminate();
 +              terminate(1);
-       }
- 
-     /*
-      * Found output from pty.
-      */
+@@ -418 +438 @@
 -    if (readfd & mastermask) {
 +    if (FD_ISSET(master, &readfd)) {
-       int nbyte;
- 
-       /*
-@@ -451,7 +472,7 @@
-     /*
-      * Found input from terminal
-      */
+@@ -454 +474 @@
 -    if (CHAR_IN_BUFFER || readfd & stdinmask) {
 +    if (FD_ISSET(fileno(stdin), &readfd)) {
- 
- #ifndef USE_TIMEOUT
-       /*
-@@ -467,8 +488,8 @@
-       RETURNCHAR:
-       if ((c = getc (stdin)) == EOF) {
-           if (debug)
+@@ -470,2 +490,2 @@
 -              printf ("EOF chatched\n");
 -          terminate ();
 +              printf ("EOF catched\n");
 +          terminate (1);
-       }
-       else
-           return (c & CHARMASK);
-@@ -596,7 +617,7 @@
- 
- swallow_output()
- {
+@@ -599 +619 @@
 -    int readfd = mastermask;
 +    fd_set readfd = mastermask;
-     int r;
-     int nbyte;
-     int ncount = 10;
-@@ -604,7 +625,7 @@
-     while (
-       ncount-- &&
-       select (selectnfds, &readfd, 0, 0, TIMEOUT_NOBLOCK) > 0 &&
+@@ -607 +627 @@
 -      readfd & mastermask
 +      FD_ISSET(master, &mastermask)
-     ) {
-       nbyte = buf_read (master, output_buffer);
-       if (nbyte > 0) {
-@@ -636,21 +657,23 @@
- #include <sys/m_wait.h>
- #endif
- 
+@@ -639 +659,3 @@
 -catchsig()
 +void
 +catchsig(n)
 +    int n;
- {
+@@ -641 +663 @@
 -    union wait status;
 +    int status;
-     struct rusage   ru;
- 
-     if (wait3 (&status, WNOHANG | WUNTRACED, &ru) != child_pid)
-       return;
-     if (WIFSTOPPED (status) /* || WIFSIGNALED (status) */) {
-       if (debug) {
+@@ -648 +670 @@
 -          message ("Child has sttoped!!\n");
 +          message ("Child has stopped!!\n");
-       }
-       suspend ();
-       return;
-     }
+@@ -653 +675 @@
 -    terminate ();
 +    terminate (WEXITSTATUS(status));
- }
- 
- exec_to_command(argv)
-@@ -675,13 +698,37 @@
-     dup2 (slave, 2);
-     (void) close (slave);
- 
+@@ -677,0 +700,3 @@
 +#ifdef TERMIOS
 +    tcsetattr(0, TCSANOW, &slave_ttymode);
 +#elif defined(TIOCSETN)
-     ioctl (0, TIOCSETN, (char *) & slave_ttymode);
+@@ -679 +704 @@
 -
 +#endif
-     execvp (*argv, argv, 0);