[pkgsrc/trunk]: pkgsrc/net/tinyfugue Make this package build with gcc-4. Pat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94a73d29d182
branches:  trunk
changeset: 514880:94a73d29d182
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 20 03:37:04 2006 +0000

description:
Make this package build with gcc-4.  Patches provided by John D. Baker
in PR pkg/33764.

diffstat:

 net/tinyfugue/distinfo         |   4 +++-
 net/tinyfugue/patches/patch-aa |  23 +++++++++++++++++++++++
 net/tinyfugue/patches/patch-ad |  23 +++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletions(-)

diffs (71 lines):

diff -r 03dc1b3a7fa1 -r 94a73d29d182 net/tinyfugue/distinfo
--- a/net/tinyfugue/distinfo    Mon Jun 19 23:27:34 2006 +0000
+++ b/net/tinyfugue/distinfo    Tue Jun 20 03:37:04 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/06/20 03:37:04 minskim Exp $
 
 SHA1 (tf-40s1.tar.gz) = 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746
 RMD160 (tf-40s1.tar.gz) = 2852daa3363bb134f29cc25d3177e9599ecacc1f
@@ -6,5 +6,7 @@
 SHA1 (tf-40s1-mccp-patch.gz) = 9a8d12ef8a6e0b6c315e6ae83efcbd179a930a6a
 RMD160 (tf-40s1-mccp-patch.gz) = af0d27a8b3585c8cc61669c79f26a8382c272424
 Size (tf-40s1-mccp-patch.gz) = 7182 bytes
+SHA1 (patch-aa) = 8e6d68c7017ab4f4294451bd0d808f48e413f9b6
 SHA1 (patch-ab) = 1849febe594874cc41b42e3d69a121e3f934112c
 SHA1 (patch-ac) = fddc7d415ca8716be1fc45c95a5b5e6888cbf1ae
+SHA1 (patch-ad) = 4ff9f85b0b05857560b00e354496a9ed2a01e6e2
diff -r 03dc1b3a7fa1 -r 94a73d29d182 net/tinyfugue/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tinyfugue/patches/patch-aa    Tue Jun 20 03:37:04 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2006/06/20 03:37:04 minskim Exp $
+
+--- src/history.h.orig 1999-03-06 14:43:24.000000000 -0800
++++ src/history.h
+@@ -12,6 +12,18 @@
+ 
+ # ifndef NO_HISTORY
+ 
++typedef struct History {      /* circular list of Alines, and logfile */
++    struct Aline **alines;
++    int size;                 /* actual number of lines currently saved */
++    int maxsize;              /* maximum number of lines that can be saved */
++    int first;                        /* position of first line in circular array */
++    int last;                 /* position of last line in circular array */
++    int index;                        /* current recall position */
++    int total;                        /* total number of lines ever saved */
++    TFILE *logfile;
++    CONST char *logname;
++} History;
++
+ extern void   NDECL(init_histories);
+ extern struct History *FDECL(init_history,(struct History *hist, int maxsize));
+ extern void   FDECL(free_history,(struct History *hist));
diff -r 03dc1b3a7fa1 -r 94a73d29d182 net/tinyfugue/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tinyfugue/patches/patch-ad    Tue Jun 20 03:37:04 2006 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2006/06/20 03:37:04 minskim Exp $
+
+--- src/history.c.orig 1999-03-06 14:43:24.000000000 -0800
++++ src/history.c
+@@ -38,18 +38,6 @@
+ #define LOCALSIZE      100    /* local history size */
+ #define INPUTSIZE      100    /* command history buffer size */
+ 
+-typedef struct History {      /* circular list of Alines, and logfile */
+-    struct Aline **alines;
+-    int size;                 /* actual number of lines currently saved */
+-    int maxsize;              /* maximum number of lines that can be saved */
+-    int first;                        /* position of first line in circular array */
+-    int last;                 /* position of last line in circular array */
+-    int index;                        /* current recall position */
+-    int total;                        /* total number of lines ever saved */
+-    TFILE *logfile;
+-    CONST char *logname;
+-} History;
+-
+ #define empty(hist) (!(hist)->alines || !(hist)->size)
+ 
+ static void     FDECL(alloc_history,(History *hist, int maxsize));