From 21320c56858c351e2e73c27218b145f537ce5eca Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 14 Dec 2005 13:53:24 +0000 Subject: Teach the backbone of NetBSD communication some ISO C tricks. - no errno, use errno.h - no redefinition of function parameters as local variables [how did this ever work?!] - malloc comes from stdlib.h - NAME_MAX is prefered when available, it is POSIX - strchr, strpbrk, strspn, strstr, strtol and strtoul can and should be used from libc. - remove tcl version of string.h, system header is good enough (and if it doesn't have index, it would have been broken anyway) --- chat/icb/Makefile | 6 ++++- chat/icb/distinfo | 27 ++++++++++++++------- chat/icb/patches/patch-ae | 24 +++++++++++-------- chat/icb/patches/patch-af | 18 ++++++++++---- chat/icb/patches/patch-am | 16 ++++++++----- chat/icb/patches/patch-an | 27 +++++++++++++-------- chat/icb/patches/patch-ao | 13 +++++----- chat/icb/patches/patch-ap | 17 +++++++------ chat/icb/patches/patch-au | 11 ++++----- chat/icb/patches/patch-av | 12 ++++++++++ chat/icb/patches/patch-aw | 12 ++++++++++ chat/icb/patches/patch-ax | 13 ++++++++++ chat/icb/patches/patch-ay | 13 ++++++++++ chat/icb/patches/patch-az | 13 ++++++++++ chat/icb/patches/patch-ba | 36 ++++++++++++++++++++++++++++ chat/icb/patches/patch-bb | 24 +++++++++++++++++++ chat/icb/patches/patch-bc | 61 +++++++++++++++++++++++++++++++++++++++++++++++ chat/icb/patches/patch-bf | 13 ++++++++++ chat/icb/patches/patch-bg | 13 ++++++++++ chat/icb/patches/patch-bh | 28 ++++++++++++++++++++++ 20 files changed, 335 insertions(+), 62 deletions(-) create mode 100644 chat/icb/patches/patch-av create mode 100644 chat/icb/patches/patch-aw create mode 100644 chat/icb/patches/patch-ax create mode 100644 chat/icb/patches/patch-ay create mode 100644 chat/icb/patches/patch-az create mode 100644 chat/icb/patches/patch-ba create mode 100644 chat/icb/patches/patch-bb create mode 100644 chat/icb/patches/patch-bc create mode 100644 chat/icb/patches/patch-bf create mode 100644 chat/icb/patches/patch-bg create mode 100644 chat/icb/patches/patch-bh (limited to 'chat/icb') diff --git a/chat/icb/Makefile b/chat/icb/Makefile index c62dd6bf1fc..6ce33807cfa 100644 --- a/chat/icb/Makefile +++ b/chat/icb/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:04 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/14 13:53:24 joerg Exp $ # # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way # older than this here. It's got no readline support, tcl, ... - HF DISTNAME= icb-5.0.9 PKGNAME= icb-5.0.9pl1 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -24,6 +25,9 @@ BUILDLINK_TRANSFORM+= rm:-ltermcap INSTALLATION_DIRS= bin libdata libdata/icb +post-extract: + ${RM} ${WRKSRC}/tcl/string.h + do-configure: ${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/config >${WRKSRC}/config diff --git a/chat/icb/distinfo b/chat/icb/distinfo index 4612acea443..9a0a5303388 100644 --- a/chat/icb/distinfo +++ b/chat/icb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2005/05/23 09:04:00 rillig Exp $ +$NetBSD: distinfo,v 1.9 2005/12/14 13:53:24 joerg Exp $ SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf @@ -7,20 +7,31 @@ SHA1 (patch-aa) = 1790a2c85ec28fc6b741d56299dc287c29f6bf90 SHA1 (patch-ab) = 6a5970e1443834e9370c29ace56811f0ba35fa4e SHA1 (patch-ac) = 87bc593c9678ca32d1d87d89ccd4c361bb1a8b53 SHA1 (patch-ad) = 8724940ed0a768298948b183c5573f11b0b5be1f -SHA1 (patch-ae) = 817514ee1ba9dd82a9790a403ed7028aa505e7d3 -SHA1 (patch-af) = e168e171a08246264ebc616f160117f42caf0294 +SHA1 (patch-ae) = 401d674f262576e5c1b40e3d612880cc264581d4 +SHA1 (patch-af) = faf546afead78974a338de4265dcb3d9eee5a3a9 SHA1 (patch-ag) = 9e438a0a3911d08437feb6e4a08a7a8dd93bc461 SHA1 (patch-ah) = c116aecd6f7337c7df89807a62857252847c4917 SHA1 (patch-ai) = 8a5ccf25d57ae8184aee9c35128f26a6a87535d5 SHA1 (patch-aj) = cfbe4e58167d97d54410cf7e87e81d4c7d5cc487 SHA1 (patch-ak) = 0bd3aa7b872ae1248586f8f2726b0c6a4bb0b462 SHA1 (patch-al) = d61dcc6fda72137645a23ebeb2aef2e3bfa9a184 -SHA1 (patch-am) = 1804aec297fa86f2a47cc7cf095783fedafbd9e5 -SHA1 (patch-an) = bdf9ca0b1d791bd25f4bdb532a395146315c0d4d -SHA1 (patch-ao) = 6a0c0c9cfba5739edd707324e5ac3944444f3796 -SHA1 (patch-ap) = 525a8f22f92444ef19612e657396d2b485b7e180 +SHA1 (patch-am) = dfe51f6c4116fafa087e068a1c1f7aee67b14fc7 +SHA1 (patch-an) = 4209e12166b3d6914a854faa4ce8fb9a51601bca +SHA1 (patch-ao) = 20e9511c9529cb1567feb639453d99293d8c0f6d +SHA1 (patch-ap) = 26ad0ce069c32d80a1f81cbf1b9377c797bd9b75 SHA1 (patch-aq) = f4f2029218f8c99f48b2df81ceb2d984498f9880 SHA1 (patch-ar) = 013c19ac1746e0af1a11cbc9161a38640fc2c990 SHA1 (patch-as) = 237e3df93eb0cd81eca818643fc58d568663258b SHA1 (patch-at) = d7b82512d54459d413ddc9144e7cf30db334a270 -SHA1 (patch-au) = d442ec2ae59863eceb6d6cd1eb1c0b3a63eeec5a +SHA1 (patch-au) = 79c096d9ab536850179359bd31d32b6df36fff2b +SHA1 (patch-av) = 00ebe9b96ab57e181adca3e3aa69a7b24037b03e +SHA1 (patch-aw) = 34dd91b715209345f109133455f7192cd6259d16 +SHA1 (patch-ax) = b86f65e2faa2dab36e022120f97d33ae18144726 +SHA1 (patch-ay) = df4e003467106afcdafad53e4c8affa493af10ca +SHA1 (patch-az) = 6a31269f11b08aa08c0650bce8e62a6364663b3a +SHA1 (patch-ba) = 85744afd9a01d3d97395fe46a26d6f7a46fe46ec +SHA1 (patch-bb) = 6067445ad48d3a6089f133ae9641fb59241f395f +SHA1 (patch-bc) = f83b1cbbc32cfb1996aeed1cff355b6ffe86b629 +SHA1 (patch-bf) = e2d9d09928a0bfb54798355ea5b552ef095c133a +SHA1 (patch-bg) = 47f6789704fe9efce584825f56cc18c1511f1dc0 +SHA1 (patch-bh) = 97764b5d7e48b56164bc92966cd557e9fe94189a diff --git a/chat/icb/patches/patch-ae b/chat/icb/patches/patch-ae index 99912b09880..59df9a33c8c 100644 --- a/chat/icb/patches/patch-ae +++ b/chat/icb/patches/patch-ae @@ -1,19 +1,23 @@ -$NetBSD: patch-ae,v 1.2 2002/06/02 01:41:19 schmonz Exp $ +$NetBSD: patch-ae,v 1.3 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./icb/icb.h /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h ---- ./icb/icb.h Fri Feb 24 22:20:23 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h Fri Nov 26 22:56:30 1999 -@@ -9,7 +9,9 @@ +--- icb/icb.h.orig 1995-02-24 21:20:23.000000000 +0000 ++++ icb/icb.h +@@ -4,13 +4,12 @@ + #include "../protocol.h" + #include "../tcl/tcl.h" + #include ++#include + #include + #ifdef NEED_CTYPE #include #endif -+#ifndef __APPLE__ - char *malloc(); -+#endif - +-char *malloc(); +- /* command usage information */ -@@ -38,6 +38,7 @@ + typedef struct Usage { +@@ -38,6 +37,7 @@ typedef struct { int beeps; /* whether beeps are audible */ char *editmode; /* input editing mode */ int tabreply; /* should replies go into the tab history? */ diff --git a/chat/icb/patches/patch-af b/chat/icb/patches/patch-af index 32ca4ab39fc..c8436c1c860 100644 --- a/chat/icb/patches/patch-af +++ b/chat/icb/patches/patch-af @@ -1,9 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $ +$NetBSD: patch-af,v 1.2 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./icb/oset.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/oset.c ---- ./icb/oset.c Fri Feb 24 22:20:24 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/oset.c Fri Nov 26 22:56:31 1999 -@@ -39,6 +39,7 @@ +--- icb/oset.c.orig 1995-02-24 21:20:24.000000000 +0000 ++++ icb/oset.c +@@ -39,6 +39,7 @@ VARIABLE vars[] = { { "pagesize", V_INT, (char *)&gv.pagesize }, { "pauseonshell", V_BOOLEAN, (char *)&gv.pauseonshell }, { "personalto", V_STRING, (char *)&gv.personalto }, @@ -11,3 +10,12 @@ diff -x *.orig -urN ./icb/oset.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0 { "restricted", V_BOOLEAN, (char *)&gv.restricted }, { "tabreply", V_BOOLEAN, (char *)&gv.tabreply }, { "timedisplay", V_STRING, (char *)&gv.timedisplay }, +@@ -140,7 +141,7 @@ char *s; + { + int zero = 0, one = 1; + int tmp; +- char *p, *malloc(); ++ char *p; + + switch(type) { + case V_CHAR: diff --git a/chat/icb/patches/patch-am b/chat/icb/patches/patch-am index 33d7e009979..db3ffd7f021 100644 --- a/chat/icb/patches/patch-am +++ b/chat/icb/patches/patch-am @@ -1,9 +1,13 @@ -$NetBSD: patch-am,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $ +$NetBSD: patch-am,v 1.2 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./murgil/serverserve.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/murgil/serverserve.c ---- ./murgil/serverserve.c Fri Feb 24 22:19:44 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/murgil/serverserve.c Fri Nov 26 22:56:30 1999 -@@ -20,6 +20,9 @@ +--- murgil/serverserve.c.orig 1995-02-24 21:19:44.000000000 +0000 ++++ murgil/serverserve.c +@@ -15,11 +15,13 @@ + #include "ipcf.h" + #include "externs.h" + +-extern int errno; + fd_set fdr; int timeisup; sighandler gotalarm(); @@ -13,7 +17,7 @@ diff -x *.orig -urN ./murgil/serverserve.c /usr/pkgsrc/net/icb/work.i386.unpatch serverserve() { -@@ -81,9 +84,9 @@ +@@ -81,9 +83,9 @@ sdoinput() /* examine set of file descriptors */ for (b = 0, y = 0; b <= (howmany(highestfd, 32) - 1); b++, y += 32) { diff --git a/chat/icb/patches/patch-an b/chat/icb/patches/patch-an index 1b114ccf14c..ef7b936e269 100644 --- a/chat/icb/patches/patch-an +++ b/chat/icb/patches/patch-an @@ -1,9 +1,8 @@ -$NetBSD: patch-an,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $ +$NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/readline/readline.c ---- ./readline/readline.c Fri Feb 24 22:20:03 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/readline/readline.c Fri Nov 26 22:56:30 1999 -@@ -48,7 +48,11 @@ +--- readline/readline.c.orig 1995-02-24 21:20:03.000000000 +0000 ++++ readline/readline.c +@@ -48,7 +48,11 @@ static char *xmalloc (), *xrealloc (); # include #endif @@ -15,7 +14,7 @@ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatche #define HAVE_BSD_SIGNALS /* #define USE_XON_XOFF */ -@@ -80,6 +84,10 @@ +@@ -80,6 +84,10 @@ static char *xmalloc (), *xrealloc (); # if !defined (O_NDELAY) # define O_NDELAY O_NONBLOCK /* Posix-style non-blocking i/o */ # endif /* O_NDELAY */ @@ -26,7 +25,15 @@ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatche #endif /* _POSIX_VERSION */ /* Other (BSD) machines use sgtty. */ -@@ -133,7 +141,7 @@ +@@ -104,7 +112,6 @@ static char *xmalloc (), *xrealloc (); + #endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */ + + #include +-extern int errno; + + #include + #if defined (SHELL) +@@ -133,7 +140,7 @@ struct passwd *getpwuid (), *getpwent () # endif /* USGr3 */ #endif /* USG && hpux */ @@ -35,7 +42,7 @@ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatche # include # define direct dirent # if defined (_POSIX_VERSION) -@@ -280,7 +288,7 @@ +@@ -280,7 +287,7 @@ static jmp_buf readline_top_level; static FILE *in_stream, *out_stream; /* The names of the streams that we do input and output to. */ @@ -44,7 +51,7 @@ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatche /* Non-zero means echo characters as they are read. */ int readline_echoing_p = 1; -@@ -1152,6 +1160,8 @@ +@@ -1152,6 +1159,8 @@ readline_initialize_everything () { /* Find out if we are running in Emacs. */ running_in_emacs = getenv ("EMACS"); @@ -53,7 +60,7 @@ diff -x *.orig -urN ./readline/readline.c /usr/pkgsrc/net/icb/work.i386.unpatche /* Allocate data structures. */ if (!rl_line_buffer) -@@ -2505,7 +2515,11 @@ +@@ -2505,7 +2514,11 @@ rl_prep_terminal () tio.c_lflag &= ~(ICANON | ECHO); diff --git a/chat/icb/patches/patch-ao b/chat/icb/patches/patch-ao index de166c1e3a8..7a7da2211ab 100644 --- a/chat/icb/patches/patch-ao +++ b/chat/icb/patches/patch-ao @@ -1,17 +1,16 @@ -$NetBSD: patch-ao,v 1.2 2002/06/02 01:41:19 schmonz Exp $ +$NetBSD: patch-ao,v 1.3 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./tcl/strerror.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/strerror.c ---- ./tcl/strerror.c Fri Feb 24 22:19:50 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/strerror.c Fri Nov 26 22:56:30 1999 -@@ -20,6 +20,7 @@ +--- tcl/strerror.c.orig 1995-02-24 21:19:50.000000000 +0000 ++++ tcl/strerror.c +@@ -20,6 +20,7 @@ static char rcsid[] = "$Header: /home/ag #include #include -+#if !defined(BSD4_4) && !defined(__linux__) && !defined(__APPLE__) ++#if !defined(BSD4_4) && !defined(__linux__) && !defined(__APPLE__) && !defined(__DragonFly__) /* * List of known errors: */ -@@ -138,3 +139,4 @@ +@@ -138,3 +139,4 @@ strerror(error) (void) sprintf(defaultMsg, "unknown error (%d)", error); return defaultMsg; } diff --git a/chat/icb/patches/patch-ap b/chat/icb/patches/patch-ap index ebb97deaf70..b702540d0ad 100644 --- a/chat/icb/patches/patch-ap +++ b/chat/icb/patches/patch-ap @@ -1,12 +1,12 @@ -$NetBSD: patch-ap,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $ +$NetBSD: patch-ap,v 1.2 2005/12/14 13:53:24 joerg Exp $ -diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclCmdAH.c ---- ./tcl/tclCmdAH.c Fri Feb 24 22:19:53 1995 -+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclCmdAH.c Fri Nov 26 22:56:28 1999 -@@ -38,9 +38,22 @@ +--- tcl/tclCmdAH.c.orig 1995-02-24 21:19:53.000000000 +0000 ++++ tcl/tclCmdAH.c +@@ -38,9 +38,21 @@ static char rcsid[] = "$Header: /home/ag #include #include "tclInt.h" +-extern int errno; +#ifdef __NetBSD__ +#define unix +#endif @@ -16,7 +16,6 @@ diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb +#include +#endif + - extern int errno; +#if !(defined(BSD) && BSD >= 199306) extern long lseek(); +#endif @@ -26,7 +25,7 @@ diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb /* *---------------------------------------------------------------------- -@@ -430,7 +443,7 @@ +@@ -430,7 +442,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv) int pid = -1; /* -1 means child process doesn't * exist (yet). Non-zero gives its * id (0 only in child). */ @@ -35,7 +34,7 @@ diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb char *cmdName, *execName; /* -@@ -501,8 +514,13 @@ +@@ -501,8 +513,13 @@ Tcl_ExecCmd(dummy, interp, argc, argv) } else { char tmp[sizeof(TMP_FILE_NAME) + 1]; strcpy(tmp, TMP_FILE_NAME); @@ -49,7 +48,7 @@ diff -x *.orig -urN ./tcl/tclCmdAH.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb if (stdIn[0] < 0) { sprintf(interp->result, "couldn't create input file for \"%.50s\" command: %.50s", -@@ -642,7 +660,7 @@ +@@ -642,7 +659,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv) sprintf(interp->result, "command terminated abnormally"); result = TCL_ERROR; } diff --git a/chat/icb/patches/patch-au b/chat/icb/patches/patch-au index 84394e2f8a5..71ea5f8df9e 100644 --- a/chat/icb/patches/patch-au +++ b/chat/icb/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.2 2003/09/28 20:13:55 tron Exp $ +$NetBSD: patch-au,v 1.3 2005/12/14 13:53:24 joerg Exp $ ---- tcl/panic.c.orig Fri Feb 24 22:19:49 1995 -+++ tcl/panic.c Sun Sep 28 22:12:20 2003 -@@ -19,7 +19,7 @@ +--- tcl/panic.c.orig 1995-02-24 21:19:49.000000000 +0000 ++++ tcl/panic.c +@@ -19,7 +19,7 @@ static char rcsid[] = "$Header: /home/ag #include #include @@ -11,7 +11,7 @@ $NetBSD: patch-au,v 1.2 2003/09/28 20:13:55 tron Exp $ /* *---------------------------------------------------------------------- -@@ -39,18 +39,18 @@ +@@ -39,18 +39,17 @@ static char rcsid[] = "$Header: /home/ag #ifndef lint void @@ -25,7 +25,6 @@ $NetBSD: patch-au,v 1.2 2003/09/28 20:13:55 tron Exp $ { - char *format; va_list args; -+ char *format; - va_start(args); - format = va_arg(args, char *); diff --git a/chat/icb/patches/patch-av b/chat/icb/patches/patch-av new file mode 100644 index 00000000000..5f6ab9f520f --- /dev/null +++ b/chat/icb/patches/patch-av @@ -0,0 +1,12 @@ +$NetBSD: patch-av,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- icb/history.c.orig 2005-12-13 16:25:41.000000000 +0000 ++++ icb/history.c +@@ -19,7 +19,6 @@ static STRLIST *hp = (STRLIST *) 0; /* u + histput(nick) + char *nick; + { +- char *malloc(); + STRLIST *sp; + + /* hunt for user within list */ diff --git a/chat/icb/patches/patch-aw b/chat/icb/patches/patch-aw new file mode 100644 index 00000000000..64cc520c4a9 --- /dev/null +++ b/chat/icb/patches/patch-aw @@ -0,0 +1,12 @@ +$NetBSD: patch-aw,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- murgil/clientserve.c.orig 2005-12-13 16:27:16.000000000 +0000 ++++ murgil/clientserve.c +@@ -11,7 +11,6 @@ + #include "ipcf.h" + #include "externs.h" + +-extern int errno; + int sock; + fd_set fdr; + struct Cbuf buf; diff --git a/chat/icb/patches/patch-ax b/chat/icb/patches/patch-ax new file mode 100644 index 00000000000..acbbce43da8 --- /dev/null +++ b/chat/icb/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- murgil/newconnect.c.orig 2005-12-13 16:27:44.000000000 +0000 ++++ murgil/newconnect.c +@@ -20,8 +20,6 @@ + #include "ipcf.h" + #include "externs.h" + +-extern int errno; +- + _newconnect(s) + int s; + { diff --git a/chat/icb/patches/patch-ay b/chat/icb/patches/patch-ay new file mode 100644 index 00000000000..c57a4577149 --- /dev/null +++ b/chat/icb/patches/patch-ay @@ -0,0 +1,13 @@ +$NetBSD: patch-ay,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- murgil/readpacket.c.orig 2005-12-13 16:28:13.000000000 +0000 ++++ murgil/readpacket.c +@@ -14,8 +14,6 @@ + #include "ipcf.h" + #include "externs.h" + +-extern int errno; +- + _readpacket(user, p) + int user; + struct Cbuf *p; diff --git a/chat/icb/patches/patch-az b/chat/icb/patches/patch-az new file mode 100644 index 00000000000..79988256d21 --- /dev/null +++ b/chat/icb/patches/patch-az @@ -0,0 +1,13 @@ +$NetBSD: patch-az,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- murgil/sendpacket.c.orig 2005-12-13 16:28:40.000000000 +0000 ++++ murgil/sendpacket.c +@@ -5,8 +5,6 @@ + #include + #include + +-extern int errno; +- + _sendpacket(s, pkt) + int s; + char *pkt; diff --git a/chat/icb/patches/patch-ba b/chat/icb/patches/patch-ba new file mode 100644 index 00000000000..7db643579b1 --- /dev/null +++ b/chat/icb/patches/patch-ba @@ -0,0 +1,36 @@ +$NetBSD: patch-ba,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- icb/tcl.c.orig 1995-02-24 21:20:30.000000000 +0000 ++++ icb/tcl.c +@@ -3,6 +3,7 @@ + + /* TCL interface */ + ++#include + #ifdef linux + #include + #endif +@@ -95,7 +96,11 @@ tclinit() + tclreadicbrc() + { + char *p, *path; ++#ifdef NAME_MAX ++ char cmd[NAME_MAX + 10]; ++#else + char cmd[MAXNAMLEN+10]; ++#endif + + if (!(path = getrcname())) return; + +@@ -117,7 +122,11 @@ getrcname() + { + static char *names[] = { ".icbrc", ".fnrc", ".tclrc" , (char *)NULL }; + char *rcfile, *homedir, *getenv(), **p; ++#ifdef NAME_MAX ++ static char rcpath[NAME_MAX + 1]; ++#else + static char rcpath[MAXNAMLEN+1]; /* path of startup file */ ++#endif + + /* get name of file to use */ + if (((rcfile = getenv("ICBRC")) != NULL) diff --git a/chat/icb/patches/patch-bb b/chat/icb/patches/patch-bb new file mode 100644 index 00000000000..0472133837b --- /dev/null +++ b/chat/icb/patches/patch-bb @@ -0,0 +1,24 @@ +$NetBSD: patch-bb,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- icb/unix.c.orig 2005-12-13 16:41:59.000000000 +0000 ++++ icb/unix.c +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include "icb.h" + #include "externs.h" +@@ -219,7 +220,11 @@ char *s; + struct passwd *pw; + char login[17]; + char *p = login; ++#ifdef NAME_MAX ++ static char path[NAME_MAX + 1]; ++#else + static char path[MAXNAMLEN+1]; ++#endif + + /* has to start with a tilde */ + if (*s++ != '~') diff --git a/chat/icb/patches/patch-bc b/chat/icb/patches/patch-bc new file mode 100644 index 00000000000..83398391b41 --- /dev/null +++ b/chat/icb/patches/patch-bc @@ -0,0 +1,61 @@ +$NetBSD: patch-bc,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- tcl/Make.orig 1995-02-24 21:19:48.000000000 +0000 ++++ tcl/Make +@@ -11,13 +11,7 @@ CFLAGS = $(TCLCFLAGS) -I. -DTCL_VERSION= + + SRC = \ + panic.c \ +- strchr.c \ + strerror.c \ +- strpbrk.c \ +- strspn.c \ +- strstr.c \ +- strtol.c \ +- strtoul.c \ + tclAssem.c \ + tclBasic.c \ + tclCmdAH.c \ +@@ -30,13 +24,7 @@ SRC = \ + + OBJ = \ + panic.o \ +- strchr.o \ + strerror.o \ +- strpbrk.o \ +- strspn.o \ +- strstr.o \ +- strtol.o \ +- strtoul.o \ + tclAssem.o \ + tclBasic.o \ + tclCmdAH.o \ +@@ -80,28 +68,3 @@ depend: + $(MAKEDEPEND) $(DEPENDFLAGS) *.c + + # DO NOT DELETE THIS LINE -- make depend depends on it. +- +-panic.o: stdlib.h +-strchr.o: string.h +-strerror.o: string.h +-strpbrk.o: string.h +-strspn.o: string.h +-strtol.o: stdlib.h +-strtoul.o: sprite.h stdlib.h +-tclAssem.o: tclInt.h tcl.h stdlib.h +-tclAssem.o: string.h +-tclBasic.o: stdlib.h string.h +-tclBasic.o: tclInt.h tcl.h +-tclCmdAH.o: stdlib.h string.h +-tclCmdAH.o: tclInt.h tcl.h +-tclCmdIZ.o: stdlib.h string.h +-tclCmdIZ.o: tclInt.h tcl.h +-tclExpr.o: tcl.h tclInt.h +-tclGlob.o: stdlib.h string.h +-tclGlob.o: tcl.h +-tclHistory.o: tclInt.h tcl.h +-tclHistory.o: stdlib.h string.h +-tclProc.o: stdlib.h string.h +-tclProc.o: tclInt.h tcl.h +-tclUtil.o: stdlib.h string.h tcl.h +-tclUtil.o: tclInt.h diff --git a/chat/icb/patches/patch-bf b/chat/icb/patches/patch-bf new file mode 100644 index 00000000000..5b37f7af72d --- /dev/null +++ b/chat/icb/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- tcl/tclCmdIZ.c.orig 2005-12-13 16:50:37.000000000 +0000 ++++ tcl/tclCmdIZ.c +@@ -30,8 +30,6 @@ static char rcsid[] = "$Header: /home/ag + #include + #include "tclInt.h" + +-extern int errno; +- + + /* + *---------------------------------------------------------------------- diff --git a/chat/icb/patches/patch-bg b/chat/icb/patches/patch-bg new file mode 100644 index 00000000000..e2cf1e4bf9c --- /dev/null +++ b/chat/icb/patches/patch-bg @@ -0,0 +1,13 @@ +$NetBSD: patch-bg,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- tcl/tclGlob.c.orig 2005-12-13 16:51:11.000000000 +0000 ++++ tcl/tclGlob.c +@@ -40,8 +40,6 @@ static char rcsid[] = "$Header: /home/ag + * grows dynamically to be as big as needed. + */ + +-extern int errno; +- + typedef struct { + char *result; /* Pointer to result area. */ + int totalSpace; /* Total number of characters allocated diff --git a/chat/icb/patches/patch-bh b/chat/icb/patches/patch-bh new file mode 100644 index 00000000000..86a5a720c15 --- /dev/null +++ b/chat/icb/patches/patch-bh @@ -0,0 +1,28 @@ +$NetBSD: patch-bh,v 1.1 2005/12/14 13:53:24 joerg Exp $ + +--- readline/history.c.orig 1995-02-24 21:20:00.000000000 +0000 ++++ readline/history.c +@@ -45,6 +45,7 @@ extern char *alloca (); + #include + #include + #include ++#include + #include + #include "history.h" + +@@ -466,7 +467,6 @@ read_history_range (filename, from, to) + char *input, *buffer = (char *)NULL; + int file, current_line; + struct stat finfo; +- extern int errno; + + input = history_filename (filename); + file = open (input, O_RDONLY, 0666); +@@ -601,7 +601,6 @@ history_do_write (filename, nelements, o + char *filename; + int nelements, overwrite; + { +- extern int errno; + register int i; + char *output = history_filename (filename); + int file, mode; -- cgit v1.2.3