From 669354405fa7b3a9e277e436fd7dabbbdbcbc2a0 Mon Sep 17 00:00:00 2001 From: spz Date: Thu, 4 Mar 2010 21:40:29 +0000 Subject: Add patches to compile on systems with getline() and to link to the tcl currently in pkgsrc. --- chat/i2cb/Makefile | 6 ++---- chat/i2cb/distinfo | 10 ++++++---- chat/i2cb/patches/patch-aa | 8 ++++---- chat/i2cb/patches/patch-ac | 11 ++++++++++- chat/i2cb/patches/patch-at | 26 ++++++++++++++++++++++---- chat/i2cb/patches/patch-ay | 13 +++++++++++++ chat/i2cb/patches/patch-az | 13 +++++++++++++ 7 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 chat/i2cb/patches/patch-ay create mode 100644 chat/i2cb/patches/patch-az (limited to 'chat/i2cb') diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile index 389c12f905b..785d48b0d68 100644 --- a/chat/i2cb/Makefile +++ b/chat/i2cb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/02/11 12:33:35 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2010/03/04 21:40:29 spz Exp $ # DISTNAME= i2cb-6.0_ALPHA @@ -12,8 +12,6 @@ COMMENT= Next generation Internet Citicen's Band chat client PKG_DESTDIR_SUPPORT= user-destdir -BROKEN= Depends on TCL 8.3 - WRKSRC= ${WRKDIR}/icb USE_GNU_READLINE= yes @@ -35,6 +33,6 @@ do-install: ${WRKSRC}/contrib/echofile \ ${DESTDIR}${PREFIX}/libdata/i2cb -.include "../../lang/tcl83/buildlink3.mk" +.include "../../lang/tcl/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/i2cb/distinfo b/chat/i2cb/distinfo index 1d0453b6e9b..e465f880df0 100644 --- a/chat/i2cb/distinfo +++ b/chat/i2cb/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.10 2009/06/05 09:36:15 hasso Exp $ +$NetBSD: distinfo,v 1.11 2010/03/04 21:40:29 spz Exp $ SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257 RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8 Size (i2cb-6.0_ALPHA.tar.gz) = 73607 bytes -SHA1 (patch-aa) = ede7c2087324f0a79cfb4146926661fecc6af550 +SHA1 (patch-aa) = 4822a49729fe6e0a6a3d9554a0386c94fd099b39 SHA1 (patch-ab) = 358b366c16290d6d2326e72c281f977e49a8a98b -SHA1 (patch-ac) = aa39fd72a66b1c5b3e0e19c4d6b279bc5a076816 +SHA1 (patch-ac) = 159060137d850866c04fab0c0b58ce16ca042bb5 SHA1 (patch-ad) = 9dcb98fe3543d8e4a7b2af338606db8ffe271f56 SHA1 (patch-ae) = 0f8765883c2b7e77394556405ee7fee7a054ad56 SHA1 (patch-af) = fa29d029c736e929963749df7744bfbcc71d05d9 @@ -22,8 +22,10 @@ SHA1 (patch-ap) = f04fea14ab6a07095f6b2f95c693988563aa4f3a SHA1 (patch-aq) = f07edc14636f1321f8c0b5c98e4962f3bfb1eee5 SHA1 (patch-ar) = 9fea79c9d7f701962e40f1b311c38b538029e633 SHA1 (patch-as) = 36130a528b6b1c2fa98bc6402d2d65bb8d55e459 -SHA1 (patch-at) = a3b7923523347da20ac763c96b6dfbfeb13e296d +SHA1 (patch-at) = 2eeaa4dc6e8fd4e31f91b5b8a7004681465925f5 SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7 SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a SHA1 (patch-aw) = 88d0cdbb02b1f43b16c001925573c547c016b743 SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d +SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b +SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf diff --git a/chat/i2cb/patches/patch-aa b/chat/i2cb/patches/patch-aa index 582f6a0e78b..1ba667277cb 100644 --- a/chat/i2cb/patches/patch-aa +++ b/chat/i2cb/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/11/14 00:55:44 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2010/03/04 21:40:29 spz Exp $ ---- config.orig Sun Mar 12 02:51:52 2000 +--- config.orig 2000-03-12 01:51:52.000000000 +0000 +++ config @@ -7,31 +7,31 @@ # @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/14 00:55:44 hubertf Exp $ # Compile options. -CFLAGS = -Wall -Werror -g -I/usr/pkg/include -I/usr/pkg/include/tcl8.0 -+CFLAGS += -Wall -Werror -g -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl/generic -DLOCALBASE=\"${LOCALBASE}\" ++CFLAGS += -Wall -g -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl/generic -DLOCALBASE=\"${LOCALBASE}\" # Lint flags -LFLAGS = -uvberxHz -I/usr/pkg/include -I/usr/pkg/include/tcl8.0 @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/14 00:55:44 hubertf Exp $ # Other libraries to include. -OTHERLIBS =-L/usr/pkg/lib -ltcl80 -lreadline -lcurses -ltermcap -lm -+OTHERLIBS +=-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl83 -lreadline -lcurses -ltermcap -lm ++OTHERLIBS +=-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl -lreadline -lcurses -ltermcap -lm # Makefile dependency generator. MAKEDEPEND = mkdep diff --git a/chat/i2cb/patches/patch-ac b/chat/i2cb/patches/patch-ac index 5d2de78c4ec..59d43ab2673 100644 --- a/chat/i2cb/patches/patch-ac +++ b/chat/i2cb/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2005/12/13 21:30:11 joerg Exp $ +$NetBSD: patch-ac,v 1.4 2010/03/04 21:40:29 spz Exp $ --- src/externs.h.orig 2000-03-15 22:28:13.000000000 +0000 +++ src/externs.h @@ -28,3 +28,12 @@ $NetBSD: patch-ac,v 1.3 2005/12/13 21:30:11 joerg Exp $ void copenmsg (char *pkt); void cpersonalmsg (char *pkt); void csendopen (char *txt); +@@ -79,7 +82,7 @@ void echo (void); + void errormsg (char *pkt); + void exitmsg (void); + char *findspace (char *s); +-char *getline (char *prompt, int expand); ++char *i2cb_getline (char *prompt, int expand); + char *getloginid (void); + char *getswitch (int argc, char **argv, char **switchv); + void getterm (void); diff --git a/chat/i2cb/patches/patch-at b/chat/i2cb/patches/patch-at index 0caa85ddbcd..e773297057a 100644 --- a/chat/i2cb/patches/patch-at +++ b/chat/i2cb/patches/patch-at @@ -1,8 +1,26 @@ -$NetBSD: patch-at,v 1.1 2004/12/30 11:05:04 agc Exp $ +$NetBSD: patch-at,v 1.2 2010/03/04 21:40:29 spz Exp $ ---- src/getline.c 2004/12/30 10:56:25 1.1 -+++ src/getline.c 2004/12/30 10:56:44 -@@ -96,7 +96,7 @@ +--- src/getline.c.orig 2000-03-15 22:13:28.000000000 +0000 ++++ src/getline.c +@@ -5,7 +5,7 @@ + #include "icb.h" + #include "externs.h" + +-char *getline (char *prompt, int expand); ++char *i2cb_getline (char *prompt, int expand); + void handletab (int count, char c); + + /* get a line from the user, with input processing */ +@@ -15,7 +15,7 @@ void handletab (int count, char c); + static char *line_read = (char *)NULL; + + char * +-getline (char *prompt, int expand) ++i2cb_getline (char *prompt, int expand) + { + linenumber = 0; + /* If the buffer has already been allocated, return the memory +@@ -96,7 +96,7 @@ handletab (int count, char c) words++; for (i=0; i> ",0); ++ text = i2cb_getline(">> ",0); + + if (!text || (!*text)) + { -- cgit v1.2.3