pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/icb make this work on 64 bit platforms:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/68b0979cd303
branches:  trunk
changeset: 551521:68b0979cd303
user:      christos <christos%pkgsrc.org@localhost>
date:      Wed Dec 17 02:19:59 2008 +0000

description:
make this work on 64 bit platforms:
- fix warnings for missing prototypes
- use termios instead of sgtty (why doesn't this work on amd64?)

diffstat:

 chat/icb/Makefile         |    4 +-
 chat/icb/distinfo         |   85 ++++++++++---------
 chat/icb/patches/patch-aa |   82 ++++++++++--------
 chat/icb/patches/patch-ab |   25 ++---
 chat/icb/patches/patch-ac |   54 +++++++++--
 chat/icb/patches/patch-ad |   36 ++++---
 chat/icb/patches/patch-ae |   39 ++++-----
 chat/icb/patches/patch-af |   31 ++----
 chat/icb/patches/patch-ag |   81 +++---------------
 chat/icb/patches/patch-ah |   55 ++----------
 chat/icb/patches/patch-ai |   74 +++++-----------
 chat/icb/patches/patch-aj |   45 ++++------
 chat/icb/patches/patch-ak |  110 +++++++++++++------------
 chat/icb/patches/patch-al |   55 ++++++++++--
 chat/icb/patches/patch-am |   50 +++++------
 chat/icb/patches/patch-an |    4 +-
 chat/icb/patches/patch-ao |   35 ++++---
 chat/icb/patches/patch-ap |   73 ++++-------------
 chat/icb/patches/patch-aq |   52 ++++-------
 chat/icb/patches/patch-ar |   61 ++++++++++++--
 chat/icb/patches/patch-as |   40 +++++----
 chat/icb/patches/patch-at |   62 +++++--------
 chat/icb/patches/patch-au |   62 +++++++-------
 chat/icb/patches/patch-av |  194 +++++++++++++++++++++++++++++++++++++++++++--
 chat/icb/patches/patch-aw |   21 ++--
 chat/icb/patches/patch-ax |   20 ++--
 chat/icb/patches/patch-ay |   15 +-
 chat/icb/patches/patch-az |   24 +++--
 chat/icb/patches/patch-ba |   44 ++--------
 chat/icb/patches/patch-bb |   35 ++-----
 chat/icb/patches/patch-bc |   70 ++-------------
 chat/icb/patches/patch-bd |   13 +++
 chat/icb/patches/patch-be |   13 +++
 chat/icb/patches/patch-bf |   40 ++++++--
 chat/icb/patches/patch-bg |   66 +++++++++++++--
 chat/icb/patches/patch-bh |   16 ++-
 chat/icb/patches/patch-bi |   84 ++++++++-----------
 chat/icb/patches/patch-bj |   40 +++++----
 chat/icb/patches/patch-bk |   82 +++++++++++++-----
 chat/icb/patches/patch-bl |   48 +++++++----
 chat/icb/patches/patch-bm |   46 ++++++----
 chat/icb/patches/patch-bn |   30 ++----
 chat/icb/patches/patch-bo |   26 +++--
 chat/icb/patches/patch-bp |   43 ++++-----
 chat/icb/patches/patch-bq |   22 -----
 45 files changed, 1177 insertions(+), 1030 deletions(-)

diffs (truncated from 2529 to 300 lines):

diff -r 14eae8027220 -r 68b0979cd303 chat/icb/Makefile
--- a/chat/icb/Makefile Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/Makefile Wed Dec 17 02:19:59 2008 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2008/03/02 07:06:20 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/12/17 02:19:59 christos 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=           4
+PKGREVISION=           5
 CATEGORIES=            chat
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 
diff -r 14eae8027220 -r 68b0979cd303 chat/icb/distinfo
--- a/chat/icb/distinfo Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/distinfo Wed Dec 17 02:19:59 2008 +0000
@@ -1,46 +1,47 @@
-$NetBSD: distinfo,v 1.10 2006/05/15 15:33:00 christos Exp $
+$NetBSD: distinfo,v 1.11 2008/12/17 02:19:59 christos Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
 Size (icb-5.0.9.tar.gz) = 357565 bytes
-SHA1 (patch-aa) = 1790a2c85ec28fc6b741d56299dc287c29f6bf90
-SHA1 (patch-ab) = 6a5970e1443834e9370c29ace56811f0ba35fa4e
-SHA1 (patch-ac) = 87bc593c9678ca32d1d87d89ccd4c361bb1a8b53
-SHA1 (patch-ad) = 8724940ed0a768298948b183c5573f11b0b5be1f
-SHA1 (patch-ae) = 401d674f262576e5c1b40e3d612880cc264581d4
-SHA1 (patch-af) = faf546afead78974a338de4265dcb3d9eee5a3a9
-SHA1 (patch-ag) = 59827ffff6cfc0c84747d4e90d372d9d27b1209e
-SHA1 (patch-ah) = 22736ecb95cde54ca690f3de476da7b6e1d87db9
-SHA1 (patch-ai) = 8a5ccf25d57ae8184aee9c35128f26a6a87535d5
-SHA1 (patch-aj) = cfbe4e58167d97d54410cf7e87e81d4c7d5cc487
-SHA1 (patch-ak) = 0bd3aa7b872ae1248586f8f2726b0c6a4bb0b462
-SHA1 (patch-al) = d61dcc6fda72137645a23ebeb2aef2e3bfa9a184
-SHA1 (patch-am) = dfe51f6c4116fafa087e068a1c1f7aee67b14fc7
-SHA1 (patch-an) = 79952322d0cbc6b8ab829e11503a62045ceb1c66
-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) = 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
-SHA1 (patch-bi) = 319c4a7fdcb05a15eb310069fb7f940ea05147b4
-SHA1 (patch-bj) = b5c491ced075194d6bc828046875da1d98e7452a
-SHA1 (patch-bk) = c64208544c8de6be73cf1f60e3fcad1c27b21cd0
-SHA1 (patch-bl) = 0e91272ae71463aee4b462d33610a5ca4e2bdb6d
-SHA1 (patch-bm) = 450ec7695653d1b43eda76d848e7565e873e5d6a
-SHA1 (patch-bn) = 201e67181f4eb009f0717920396f6c7e71fe74a0
-SHA1 (patch-bo) = b15f98e783432098e9baa94cbbe80845ce3d767b
-SHA1 (patch-bp) = 756f78fd3cf9aafc37d676fef7b7f8baca4be4d3
-SHA1 (patch-bq) = fd2cdf919f7f62a53969d226e3465133d55e28cb
+SHA1 (patch-aa) = b82fb642c79a200aaa47b0db397c82f19fb7f9ff
+SHA1 (patch-ab) = a68cfdec69b17ca8200b8ab7245acb693265dc2b
+SHA1 (patch-ac) = f090233dccd3f42f9176a6c0d21469bea03bfcc9
+SHA1 (patch-ad) = b64e9ca73b5e56122cb82363ee9c765457bde5ca
+SHA1 (patch-ae) = c98d058cfe6177fb4807104695f96c774b11d177
+SHA1 (patch-af) = b16cdbbd6d4a5489b19bb3339b6cd8d95b5395d9
+SHA1 (patch-ag) = d9d1a36a381829b4a5593d666185f79722a33697
+SHA1 (patch-ah) = 464f3a3de74f049187d8e6702c6e060b4fe03146
+SHA1 (patch-ai) = 11322bc2753dd6921272b2e64554349bb7aa6c5c
+SHA1 (patch-aj) = 1ba8c916513b449bede0330026b9f844d03d9a2f
+SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72
+SHA1 (patch-al) = c2bbd85884e8a9f4acd53a2441281e92baecac25
+SHA1 (patch-am) = 58ce219463d2cdb0306a664b383015096938e6d6
+SHA1 (patch-an) = d66e16511fbfe4f51ba2f7f77a4a67087470342a
+SHA1 (patch-ao) = a798b898e3527f7a4458c6e278e86ef69bb38a53
+SHA1 (patch-ap) = 794d608ac548bc1b5c83b7bf967ed43e5cee65be
+SHA1 (patch-aq) = 78b772a2f6ec27a782b1681a61a2329992dcc741
+SHA1 (patch-ar) = 7fa954914f8c0fdad4f610f37dd81129ec57bc14
+SHA1 (patch-as) = 5c42bfdc2e836fb86e814c396760040560864256
+SHA1 (patch-at) = 703abcc2415b92776241011fe893286de06da034
+SHA1 (patch-au) = 35db5c53aed27f3a73977098b89cf4273e801a22
+SHA1 (patch-av) = ee5d630cf578dcf8150486526b9b96214a06997e
+SHA1 (patch-aw) = 6dbc66a63f52244ac9b8b29346cb376b98442695
+SHA1 (patch-ax) = 9dbc788c08357e2207f08290a014267f306ead76
+SHA1 (patch-ay) = f8a787d5a6611890d65fa8b0411977fd5c0bc7e9
+SHA1 (patch-az) = 6d8a12c0309678e854253d1256b86851f9ed2b4e
+SHA1 (patch-ba) = b85f00aea832da4d9f730b5295f943264550a7ab
+SHA1 (patch-bb) = 64cebf4a262c31850bc1658e3a3c8841baadc37c
+SHA1 (patch-bc) = 88dd502d44f708c81a2f54953c17b5cca18d59c7
+SHA1 (patch-bd) = f4ed0e007c5971d8c01e1c1cfebfd32adb24a746
+SHA1 (patch-be) = 862df6c2de3a26c8a8b761b122ddea73fdf8d910
+SHA1 (patch-bf) = 4e65811b06f100659c83a3c6a95fa0ba5732f991
+SHA1 (patch-bg) = 51cc10151b658ec094e4cceb67e11993533cb7ca
+SHA1 (patch-bh) = 5e24c606b9ee9656b15d66a4611d732b563cc831
+SHA1 (patch-bi) = cc92516799335123f6ac0d37380a428e9a88063d
+SHA1 (patch-bj) = 082e74059e3c2f91f5a56b5d100e4cdedd00340f
+SHA1 (patch-bk) = caab3a28f9e05f7e3321d5b56ad3dd47ee3e3b40
+SHA1 (patch-bl) = cef6d92a02bb6080a9121f2ecbd36c4b15777a68
+SHA1 (patch-bm) = 1171ce0885693b198d8d7ad8960c55dec4604aa0
+SHA1 (patch-bn) = 57972d7c9712755833dc97559edded528e38aa97
+SHA1 (patch-bo) = c04e9b0103b03559896de098a4beea7c3f5c311d
+SHA1 (patch-bp) = f79cfc4a9bd18397611e3dd46b4b85675054da6c
diff -r 14eae8027220 -r 68b0979cd303 chat/icb/patches/patch-aa
--- a/chat/icb/patches/patch-aa Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/patches/patch-aa Wed Dec 17 02:19:59 2008 +0000
@@ -1,43 +1,51 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:37 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/c_log.c.orig   Fri Feb 24 22:20:18 1995
-+++ icb/c_log.c        Fri Jul 21 02:08:35 2000
-@@ -6,6 +6,7 @@
- #include "icb.h"
- #include "externs.h"
- #include <time.h>
-+#include <errno.h>
+--- glob/tilde.c.orig  1995-02-24 16:20:46.000000000 -0500
++++ glob/tilde.c       2008-12-16 20:35:03.000000000 -0500
+@@ -28,12 +28,16 @@
+ #endif
  
- FILE *logfp = NULL;
+ #include <pwd.h>
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
  
-@@ -45,8 +46,6 @@
-       time_t time();
-       struct tm *t, *localtime();
-       time_t clock;
--      extern int errno, sys_nerr;
--      extern char *sys_errlist[];
+ #ifndef savestring
+ #define savestring(x) (char *)strcpy ((char *)xmalloc (1 + strlen (x)), (x))
+ #endif
  
-       /* determine pathname to use */
-       if (path == NULL || *path == '\0')
-@@ -97,8 +96,8 @@
-               aptr++;
-       
-       /* timestamp it */
--      sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-2d %s.",
--        path, t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
-+      sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-4d %s.",
-+        path, t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
-       putl(mbuf, PL_SCR | PL_LOG);
+ typedef int Function ();
++typedef char *CPFunction ();
+ #if !defined (NULL)
+ #  define NULL 0x0
+ #endif
+@@ -41,7 +45,7 @@
+ #if defined (TEST)
+ static char *xmalloc (), *xrealloc ();
+ #else
+-extern char *malloc (), *xrealloc ();
++extern char *xmalloc (), *xrealloc ();
+ #endif /* TEST */
  
-       return(0);
-@@ -126,8 +125,8 @@
-               aptr++;
-       
-       /* timestamp it */
--      sprintf(mbuf, "Session log closed at %d/%02d/%-2d %s.",
--        t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
-+      sprintf(mbuf, "Session log closed at %d/%02d/%-4d %s.",
-+        t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
-       putl(mbuf, PL_SCR | PL_LOG);
+ /* The default value of tilde_additional_prefixes.  This is set to
+@@ -60,7 +64,7 @@
+    standard meaning for expanding a tilde fails.  The function is called
+    with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
+    which is the expansion, or a NULL pointer if there is no expansion. */
+-Function *tilde_expansion_failure_hook = (Function *)NULL;
++CPFunction *tilde_expansion_failure_hook = (CPFunction *)NULL;
  
-       /* close it */
+ /* When non-null, this is a NULL terminated array of strings which
+    are duplicates for a tilde prefix.  Bash uses this to expand
+@@ -207,9 +211,9 @@
+       if (!dirname[1] || dirname[1] == '/')
+       {
+         /* Prepend $HOME to the rest of the string. */
+-        char *temp_home = (char *)getenv ("HOME");
++        char *temp_home = getenv ("HOME");
+ 
+-        temp_name = (char *)alloca (1 + strlen (&dirname[1])
++        temp_name = alloca (1 + strlen (&dirname[1])
+                                     + (temp_home? strlen (temp_home) : 0));
+         temp_name[0] = '\0';
+         if (temp_home)
diff -r 14eae8027220 -r 68b0979cd303 chat/icb/patches/patch-ab
--- a/chat/icb/patches/patch-ab Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/patches/patch-ab Wed Dec 17 02:19:59 2008 +0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/15 00:36:37 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/c_shell.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/c_shell.c
---- ./icb/c_shell.c    Fri Feb 24 22:20:19 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/c_shell.c    Fri Nov 26 22:56:29 1999
-@@ -14,7 +14,7 @@
-       static char *usage = "usage: c_shell [command]";
-       int w, pid;
-       int shellout = 0;
--      union wait status;
-+      int status;
-       char *shell, *getenv();
-       
-       /* disallow use if restricted mode set */
+--- tcl/tclGlob.c.orig 2008-12-16 20:18:00.000000000 -0500
++++ tcl/tclGlob.c      2008-12-16 20:18:01.000000000 -0500
+@@ -40,8 +40,6 @@
+  * 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 -r 14eae8027220 -r 68b0979cd303 chat/icb/patches/patch-ac
--- a/chat/icb/patches/patch-ac Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/patches/patch-ac Wed Dec 17 02:19:59 2008 +0000
@@ -1,13 +1,43 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/globals.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/globals.c
---- ./icb/globals.c    Fri Feb 24 22:20:22 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/globals.c    Fri Nov 26 22:56:30 1999
-@@ -59,6 +59,7 @@
-       1,              /* beeps */
-       "vi",           /* editmode */
-       0,              /* tabreply */
-+      0,              /* printtime */
-       1,              /* cute */
-       0,              /* autodel */
-       "",             /* personalto */
+--- icb/c_log.c.orig   1995-02-24 16:20:18.000000000 -0500
++++ icb/c_log.c        2008-12-16 20:17:59.000000000 -0500
+@@ -6,6 +6,7 @@
+ #include "icb.h"
+ #include "externs.h"
+ #include <time.h>
++#include <errno.h>
+ 
+ FILE *logfp = NULL;
+ 
+@@ -45,8 +46,6 @@
+       time_t time();
+       struct tm *t, *localtime();
+       time_t clock;
+-      extern int errno, sys_nerr;
+-      extern char *sys_errlist[];
+ 
+       /* determine pathname to use */
+       if (path == NULL || *path == '\0')
+@@ -97,8 +96,8 @@
+               aptr++;
+       
+       /* timestamp it */
+-      sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-2d %s.",
+-        path, t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
++      sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-4d %s.",
++        path, t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
+       putl(mbuf, PL_SCR | PL_LOG);
+ 
+       return(0);
+@@ -126,8 +125,8 @@
+               aptr++;
+       
+       /* timestamp it */
+-      sprintf(mbuf, "Session log closed at %d/%02d/%-2d %s.",
+-        t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
++      sprintf(mbuf, "Session log closed at %d/%02d/%-4d %s.",
++        t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
+       putl(mbuf, PL_SCR | PL_LOG);
+ 
+       /* close it */
diff -r 14eae8027220 -r 68b0979cd303 chat/icb/patches/patch-ad
--- a/chat/icb/patches/patch-ad Wed Dec 17 01:48:12 2008 +0000
+++ b/chat/icb/patches/patch-ad Wed Dec 17 02:19:59 2008 +0000
@@ -1,17 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/helpdata.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/helpdata.c
---- ./icb/helpdata.c   Fri Feb 24 22:20:23 1995



Home | Main Index | Thread Index | Old Index