From 92abb07bf8634f8e0afc113d9769d123b9c93c82 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Tue, 20 Jun 2006 03:37:04 +0000
Subject: Make this package build with gcc-4.  Patches provided by John D.
 Baker in PR pkg/33764.

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

(limited to 'net/tinyfugue')

diff --git a/net/tinyfugue/distinfo b/net/tinyfugue/distinfo
index 3cb5fba1620..8fcae37620a 100644
--- a/net/tinyfugue/distinfo
+++ b/net/tinyfugue/distinfo
@@ -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 @@ Size (tf-40s1.tar.gz) = 349239 bytes
 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 --git a/net/tinyfugue/patches/patch-aa b/net/tinyfugue/patches/patch-aa
new file mode 100644
index 00000000000..fc8e4ce2e0b
--- /dev/null
+++ b/net/tinyfugue/patches/patch-aa
@@ -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 --git a/net/tinyfugue/patches/patch-ad b/net/tinyfugue/patches/patch-ad
new file mode 100644
index 00000000000..fe233c56906
--- /dev/null
+++ b/net/tinyfugue/patches/patch-ad
@@ -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));
-- 
cgit v1.2.3