From 770ea18daf71cd9e497579f655e61d96cbee8f83 Mon Sep 17 00:00:00 2001 From: plunky Date: Thu, 6 Aug 2009 08:24:29 +0000 Subject: repair getline(3) conflicts, "getline" -> "get_line" --- chat/icb/distinfo | 7 +++++-- chat/icb/patches/patch-al | 25 +++++++++++++++++-------- chat/icb/patches/patch-br | 13 +++++++++++++ chat/icb/patches/patch-bs | 13 +++++++++++++ chat/icb/patches/patch-bt | 13 +++++++++++++ 5 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 chat/icb/patches/patch-br create mode 100644 chat/icb/patches/patch-bs create mode 100644 chat/icb/patches/patch-bt (limited to 'chat/icb') diff --git a/chat/icb/distinfo b/chat/icb/distinfo index e9644fefcef..b289775439a 100644 --- a/chat/icb/distinfo +++ b/chat/icb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2009/07/24 01:24:39 christos Exp $ +$NetBSD: distinfo,v 1.13 2009/08/06 08:24:29 plunky Exp $ SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf @@ -14,7 +14,7 @@ SHA1 (patch-ah) = 464f3a3de74f049187d8e6702c6e060b4fe03146 SHA1 (patch-ai) = 11322bc2753dd6921272b2e64554349bb7aa6c5c SHA1 (patch-aj) = 1ba8c916513b449bede0330026b9f844d03d9a2f SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72 -SHA1 (patch-al) = c2bbd85884e8a9f4acd53a2441281e92baecac25 +SHA1 (patch-al) = e97d0ed0ebe4b3b514455ab0dc348792070efc74 SHA1 (patch-am) = 58ce219463d2cdb0306a664b383015096938e6d6 SHA1 (patch-an) = d66e16511fbfe4f51ba2f7f77a4a67087470342a SHA1 (patch-ao) = a798b898e3527f7a4458c6e278e86ef69bb38a53 @@ -46,3 +46,6 @@ SHA1 (patch-bn) = 57972d7c9712755833dc97559edded528e38aa97 SHA1 (patch-bo) = c04e9b0103b03559896de098a4beea7c3f5c311d SHA1 (patch-bp) = f79cfc4a9bd18397611e3dd46b4b85675054da6c SHA1 (patch-bq) = dba28647f096cde0ff682ed60f7fea473f74c008 +SHA1 (patch-br) = f0cc8e6fb3e83076a0160b455e64cfe82f297f44 +SHA1 (patch-bs) = c0b5a045b02e9630d2dda713b5d54b780ed2d5de +SHA1 (patch-bt) = a5eb739d19170e2af57cafc81e8adaf5e27b85a8 diff --git a/chat/icb/patches/patch-al b/chat/icb/patches/patch-al index 70a43ccae0c..d081aa8b29b 100644 --- a/chat/icb/patches/patch-al +++ b/chat/icb/patches/patch-al @@ -1,8 +1,17 @@ -$NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $ +$NetBSD: patch-al,v 1.3 2009/08/06 08:24:29 plunky Exp $ ---- icb/protos.h.orig 1995-02-24 16:20:25.000000000 -0500 -+++ icb/protos.h 2008-12-16 20:18:00.000000000 -0500 -@@ -64,7 +64,7 @@ +--- icb/protos.h.orig 1995-02-24 21:20:25.000000000 +0000 ++++ icb/protos.h +@@ -49,7 +49,7 @@ int filtertext(char *s); + int fnexit(void); + int fnterm(void); + int oset(char *clientData, Tcl_Interp *interp, int argc, char *argv[]); +-char *getline(char *prompt, int expand); ++char *get_line(char *prompt, int expand); + int getterm(void); + int getwinsize(void); + int gunlink(USAGE *u, USAGE **first, USAGE **last); +@@ -64,7 +64,7 @@ int importantmsg(char *pkt); int inserttab(void); int ishushed(char *nick); int lcaseit(char *s); @@ -11,7 +20,7 @@ $NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $ int linebuffer(FILE *fp); #else int linebuffer(struct _iobuf *fp); -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ int mbreakprint(int per, char *from, cha int mprint(int per, char *from, char *s); int numeric(char *txt); int parse(char *s); @@ -20,7 +29,7 @@ $NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $ int printcutetime(void); int printmilitarytime(void); int printnormaltime(void); -@@ -107,7 +107,7 @@ +@@ -107,7 +107,7 @@ int specialchar(register int c, char *s, int split(char *s); int startsessionlog(Tcl_Interp *interp, char *path); int statusmsg(char *pkt); @@ -29,7 +38,7 @@ $NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $ int strcicmp(char *s1, char *s2); int strcincmp(char *s1, char *s2, int n); int strlinkafter(STRLIST *s, STRLIST *i, STRLIST **head, STRLIST **tail); -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ int strlinkalpha(STRLIST *s, STRLIST **h int strlinkbefore(STRLIST *s, STRLIST *i, STRLIST **head, STRLIST **tail); int strlinkhead(STRLIST *s, STRLIST **head, STRLIST **tail); int strlinktail(STRLIST *s, STRLIST **head, STRLIST **tail); @@ -38,7 +47,7 @@ $NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $ int strunlink(STRLIST *s, STRLIST **head, STRLIST **tail); sighandler suspend(); int tclinit(void); -@@ -140,3 +140,4 @@ +@@ -140,3 +140,4 @@ struct server *getserver(void); struct server *getservbyname(char *name); void listservers(void); sighandler icbexit(); diff --git a/chat/icb/patches/patch-br b/chat/icb/patches/patch-br new file mode 100644 index 00000000000..88a1d6fd1b8 --- /dev/null +++ b/chat/icb/patches/patch-br @@ -0,0 +1,13 @@ +$NetBSD: patch-br,v 1.1 2009/08/06 08:24:29 plunky Exp $ + +--- icb/getline.c.orig 2009-08-06 09:17:50.000000000 +0100 ++++ icb/getline.c +@@ -11,7 +11,7 @@ static char *line_read = (char *)NULL; + + extern void echo(); + +-char *getline(prompt, expand) ++char *get_line(prompt, expand) + char *prompt; + int expand; + { diff --git a/chat/icb/patches/patch-bs b/chat/icb/patches/patch-bs new file mode 100644 index 00000000000..52312b4a281 --- /dev/null +++ b/chat/icb/patches/patch-bs @@ -0,0 +1,13 @@ +$NetBSD: patch-bs,v 1.1 2009/08/06 08:24:29 plunky Exp $ + +--- icb/ipcf.c.orig 2009-08-06 09:17:56.000000000 +0100 ++++ icb/ipcf.c +@@ -60,7 +60,7 @@ c_userchar() + static char *s; /* user input string */ + + /* user typed one or more characters - gather a line of input */ +- s=getline(NULL, 1); ++ s=get_line(NULL, 1); + + if (!s) /* EOF */ + { diff --git a/chat/icb/patches/patch-bt b/chat/icb/patches/patch-bt new file mode 100644 index 00000000000..b34d74c5980 --- /dev/null +++ b/chat/icb/patches/patch-bt @@ -0,0 +1,13 @@ +$NetBSD: patch-bt,v 1.1 2009/08/06 08:24:29 plunky Exp $ + +--- icb/s_person.c.orig 2009-08-06 09:20:29.000000000 +0100 ++++ icb/s_person.c +@@ -106,7 +106,7 @@ int echoflag; + { + do + { +- text = getline(">> ",0); ++ text = get_line(">> ",0); + + if (!text || (!*text && !last_command_was_kill)) + { -- cgit v1.2.3