[pkgsrc/trunk]: pkgsrc/misc/fep make it work on 64 bit machines

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/99f37e35a83e
branches:  trunk
changeset: 504392:99f37e35a83e
user:      christos <christos%pkgsrc.org@localhost>
date:      Sat Dec 10 22:10:47 2005 +0000

description:
make it work on 64 bit machines

diffstat:

 misc/fep/Makefile         |    4 +-
 misc/fep/distinfo         |   28 ++--
 misc/fep/patches/patch-aa |   14 +-
 misc/fep/patches/patch-ab |   36 ++++-
 misc/fep/patches/patch-ac |   58 +++++--
 misc/fep/patches/patch-ad |   40 ++++-
 misc/fep/patches/patch-ae |  149 +++++++++++++++------
 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 |  305 ++++++++++++++++++++++++++++++++++++++-------
 misc/fep/patches/patch-ak |   42 ++++-
 misc/fep/patches/patch-al |   21 ++-
 misc/fep/patches/patch-am |   22 +-
 15 files changed, 601 insertions(+), 196 deletions(-)

diffs (truncated from 1585 to 300 lines):

diff -r 21143d2aae34 -r 99f37e35a83e misc/fep/Makefile
--- a/misc/fep/Makefile Sat Dec 10 22:07:01 2005 +0000
+++ b/misc/fep/Makefile Sat Dec 10 22:10:47 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/09/29 14:31:11 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/10 22:10:47 christos Exp $
 
 DISTNAME=      fep
 PKGNAME=       fep-1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    misc
 MASTER_SITES=  ftp://ftp.sra.co.jp/pub/cmd/fep/
 
diff -r 21143d2aae34 -r 99f37e35a83e misc/fep/distinfo
--- a/misc/fep/distinfo Sat Dec 10 22:07:01 2005 +0000
+++ b/misc/fep/distinfo Sat Dec 10 22:10:47 2005 +0000
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.8 2005/09/13 19:40:59 christos Exp $
+$NetBSD: distinfo,v 1.9 2005/12/10 22:10:47 christos Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 Size (fep.tar.gz) = 40137 bytes
-SHA1 (patch-aa) = ea6b9663acc544e4e57c14f45468a03fc457e353
-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) = 232e8089aa6ea73e0335df9d25a2268360074531
-SHA1 (patch-ak) = c7e65cb589f9267a11b688a8773704c7e13ab8a3
-SHA1 (patch-al) = b6f57757e7374e3268e45ac0a294c45d0bff7258
-SHA1 (patch-am) = 4b19832075292802c1ddf2fdc9083b7379eb4066
+SHA1 (patch-aa) = f62c430e029bdf8e434d9e492831192209bd6aab
+SHA1 (patch-ab) = 7147246ff76e429d7738d5d0be8e3c75459e9352
+SHA1 (patch-ac) = 73738dbcbd081ad614e2bffb2937aa7574321dcb
+SHA1 (patch-ad) = 5f8bcaba41ec6670abd0b72795183f73fa147e28
+SHA1 (patch-ae) = b8e52d9b943c98b4ac3a6f2700e644c58f8e9438
+SHA1 (patch-af) = 693871ad76a86e4ed398168a7ca4377a99b10924
+SHA1 (patch-ag) = 31eae85cc799d3af285c9228997ad2f3d7fac144
+SHA1 (patch-ah) = aba9d7f7f5ff8711ef90336ed2323af66751c42a
+SHA1 (patch-ai) = 1102903b768dfbba91e2abad739c1d83ef0109bc
+SHA1 (patch-aj) = ea21f974f38e5595ca929f4e3338fe17a52af12a
+SHA1 (patch-ak) = 3ad3d79b87733fcbdfc234fb486fa01bee5abf8b
+SHA1 (patch-al) = cdd6f747b8758fb7b9a3bdc84678533c59f5de6c
+SHA1 (patch-am) = 6bc60fae9f09a62c9f6554c4450e63f70b28ad2d
diff -r 21143d2aae34 -r 99f37e35a83e misc/fep/patches/patch-aa
--- a/misc/fep/patches/patch-aa Sat Dec 10 22:07:01 2005 +0000
+++ b/misc/fep/patches/patch-aa Sat Dec 10 22:10:47 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2005/09/13 19:25:57 christos Exp $
+$NetBSD: patch-aa,v 1.8 2005/12/10 22:10:47 christos Exp $
 
 --- Makefile.orig      1993-06-09 22:51:22.000000000 -0400
-+++ Makefile   2004-02-20 09:37:24.000000000 -0500
-@@ -15,17 +15,24 @@
++++ Makefile   2005-12-10 17:00:00.000000000 -0500
+@@ -15,17 +15,30 @@
  DISTRIBUTION\
        = Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
  
@@ -23,15 +23,21 @@
 +.if exists(/dev/ptmx)
 +CFLAGS        += -DHAVE_PTMX
 +.endif
++.if exists(/usr/lib/libtermcap.a)
 +.if exists(/usr/lib/libcompat.a)
 +LDFLAGS = -ltermcap -lcompat
 +.else
  LDFLAGS = -ltermcap
 +.endif
++.elif exists(/usr/lib/libncurses.a)
++LDFLAGS = -lncurses
++.else
++LDFLAGS = -lcurses
++.endif
  
  all: $(TARGET)
  
-@@ -37,7 +44,7 @@
+@@ -37,7 +50,7 @@
  
  install: $(TARGET)
        install -s $(TARGET) $(INSTDIR)
diff -r 21143d2aae34 -r 99f37e35a83e misc/fep/patches/patch-ab
--- a/misc/fep/patches/patch-ab Sat Dec 10 22:07:01 2005 +0000
+++ b/misc/fep/patches/patch-ab Sat Dec 10 22:10:47 2005 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2003/11/11 10:42:32 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2005/12/10 22:10:47 christos Exp $
 
---- fep_alias.c.orig   Sun Nov 13 07:50:58 1988
-+++ fep_alias.c
-@@ -18,7 +18,7 @@ typedef struct _alias {
+--- fep_alias.c.orig   1988-11-13 01:50:58.000000000 -0500
++++ fep_alias.c        2005-12-10 16:59:27.000000000 -0500
+@@ -3,10 +3,11 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ab,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+-#endif lint
++#endif /* lint */
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ #include "fep_defs.h"
+ #include "fep_glob.h"
+ 
+@@ -18,7 +19,7 @@
  
  ALIAS alias_top = {"top", "top", (ALIAS *)0};
  ALIAS *alias_list = &alias_top;
@@ -11,7 +24,7 @@
  
  /*
   * Functions
-@@ -44,7 +44,7 @@ check_alias (comline)
+@@ -44,7 +45,7 @@
  
      while (isspace (*comline))
        ++comline;
@@ -20,3 +33,16 @@
        return ((CHAR *)0);
  
      argc = mkargv (comline, argv, MAXARGS);
+@@ -214,9 +215,9 @@
+     if (alloc == 0)
+       return (0);
+ 
+-    vp = (ALIAS *) calloc (sizeof (ALIAS), 1);
+-    vp->al_value = (char *)0;
+-    vp->al_next = (ALIAS *) 0;
++    vp = calloc (sizeof (ALIAS), 1);
++    vp->al_value = NULL;
++    vp->al_next = NULL;
+     vp->al_name = allocAndCopyThere (name);
+ 
+     vp->al_next = last->al_next;
diff -r 21143d2aae34 -r 99f37e35a83e misc/fep/patches/patch-ac
--- a/misc/fep/patches/patch-ac Sat Dec 10 22:07:01 2005 +0000
+++ b/misc/fep/patches/patch-ac Sat Dec 10 22:10:47 2005 +0000
@@ -1,9 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $
 
---- fep_com.c.orig     Wed May 29 07:31:09 1991
-+++ fep_com.c
-@@ -6,7 +6,17 @@ static char rcsid[]=
- #endif lint
+--- fep_com.c.orig     1991-05-29 01:31:09.000000000 -0400
++++ fep_com.c  2005-12-10 16:59:27.000000000 -0500
+@@ -3,11 +3,23 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+-#endif lint
++#endif /* lint */
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -18,9 +22,12 @@
  #include <sgtty.h>
 +#endif
  #include <ctype.h>
++#include <inttypes.h>
++#include <stdlib.h>
  #include <sys/param.h>
  #include <sys/file.h>
-@@ -31,7 +41,7 @@ executeBuiltInFunction (comline, more)
+ #include <sys/stat.h>
+@@ -31,7 +43,7 @@
      char *comline, **more;
  {
      register FunctionTableEnt *ftp;
@@ -29,7 +36,7 @@
      char *search_string();
      int argc;
  
-@@ -93,7 +103,7 @@ is_same_command (a, b)
+@@ -93,7 +105,7 @@
  
      while (*a && *b && *a == *b)
        ++a, ++b;
@@ -38,7 +45,7 @@
        return 1;
      else
        return 0;
-@@ -295,7 +305,7 @@ unalias (comline)
+@@ -295,7 +307,7 @@
  set (comline)
      char *comline;
  {
@@ -47,7 +54,7 @@
      char *cp, *index();
      char *argv[MAXARGS];
      int argc;
-@@ -352,8 +362,13 @@ unset(comline)
+@@ -352,8 +364,13 @@
  
  extern        int Transparency;
  extern        int Through;
@@ -63,7 +70,7 @@
  extern        int master, slave;
  extern        char slave_tty[];
  
-@@ -368,7 +383,11 @@ toggle_through()
+@@ -368,7 +385,11 @@
  {
      int r;
      int slave_fd;
@@ -75,7 +82,7 @@
  
      if (Through == OFF) {
  
-@@ -378,15 +397,26 @@ toggle_through()
+@@ -378,15 +399,26 @@
            return;
        }
  
@@ -102,7 +109,7 @@
        if (r < 0) {
            perror (slave_tty);
            (void) close (slave_fd);
-@@ -394,7 +424,11 @@ toggle_through()
+@@ -394,7 +426,11 @@
        (void) close (slave_fd);
      }
      else
@@ -114,7 +121,7 @@
  
      if (r < 0) {
        printf ("Can't change pty mode.\n");
-@@ -410,7 +444,11 @@ toggle_through()
+@@ -410,7 +446,11 @@
  fix_transparency()
  {
      int r;
@@ -126,7 +133,7 @@
  
      if (Through)
        return;
-@@ -418,11 +456,17 @@ fix_transparency()
+@@ -418,11 +458,17 @@
      if (slave < 0)
        return;
  
@@ -144,7 +151,7 @@
      if (r < 0) {
        perror (slave_tty);
        return;
-@@ -432,9 +476,19 @@ fix_transparency()
+@@ -432,9 +478,19 @@
       * If find slave tty mode is cbreak or raw, fix tty mode of stdout to
       * same mode as slave and set Transparency ON.
       */
@@ -165,7 +172,7 @@
            if (r < 0) {
                perror ("stdout");
                return;
-@@ -445,7 +499,11 @@ fix_transparency()
+@@ -445,7 +501,11 @@
      }
      else {
        if (Transparency == ON) {
@@ -178,7 +185,20 @@
            if (r < 0) {
                perror ("stdout");
                return;
-@@ -738,9 +796,9 @@ char *line;
+@@ -623,10 +683,10 @@
+ {
+     MORE *mp;
+ 
+-    mp = (MORE *) malloc (sizeof (MORE));
++    mp = malloc (sizeof (MORE));
+ 
+     if (mp == 0)
+-      return ((MORE*)0);
++      return (NULL);
+     else {
+       mp->cur_line = 0;
+       mp->max_line = maxline;
+@@ -738,9 +798,9 @@
  fep_pwd (line)
      char *line;
  {
@@ -190,7 +210,7 @@
      printf ("%s\n", cwd);
  }
  
-@@ -755,7 +813,7 @@ fep_echo (comline)
+@@ -755,7 +815,7 @@
      argc = mkargv (comline, argv, MAXARGS);
      
      argp = &argv[1];