Update quirc to 0.9.84 and bl3ify. Switch to Tcl/Tk 8.4.

Changes sinec 0.9.82:
  - Fixes to make it compile with gcc 3.3 and Tcl/Tk 8.4.
  - Highlight a window when your nick appears in it.
  - fix for a bug that causes QuIRC to crash on nicknames longer than
    30 characters.

8 files changed, 36 insertions, 53 deletions

diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index f0d310d08b3..1015405ff55 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:13 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/12 06:07:12 minskim Exp $
 #
 
-DISTNAME=	quirc-0.9.82
+DISTNAME=	quirc-0.9.84
 CATEGORIES=	chat
 MASTER_SITES=	http://quirc.org/
 
@@ -9,10 +9,11 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://quirc.org/
 COMMENT=	Stable and powerful graphical IRC client
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/quirc/PLIST b/chat/quirc/PLIST
index a74d79ddf83..97e904c725d 100644
--- a/chat/quirc/PLIST
+++ b/chat/quirc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/19 12:04:30 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/12 06:07:12 minskim Exp $
 bin/quirc
 share/doc/quirc/AUTHORS
 share/doc/quirc/COPYING
@@ -13,13 +13,14 @@ share/doc/quirc/nickcomp.txt
 share/doc/quirc/quedit.txt
 share/doc/quirc/rfc1459.txt
 share/quirc/VERSION
-share/quirc/common/install.tcl
 share/quirc/dal.tcl
+share/quirc/default.tcl
 share/quirc/doc.tcl
 share/quirc/fontsel
 share/quirc/fun.tcl
 share/quirc/global.tcl
 share/quirc/info.tcl
+share/quirc/install.tcl
 share/quirc/listfile.tcl
 share/quirc/mircservers.tcl
 share/quirc/newserver.tcl
@@ -29,10 +30,7 @@ share/quirc/quedit
 share/quirc/qwidgets.tcl
 share/quirc/server.tcl
 share/quirc/servers
-share/quirc/themes/default.tcl
 share/quirc/variables.tcl
 share/quirc/winpopup.tcl
-@dirrm share/doc/quirc
-@dirrm share/quirc/themes
-@dirrm share/quirc/common
 @dirrm share/quirc
+@dirrm share/doc/quirc
diff --git a/chat/quirc/distinfo b/chat/quirc/distinfo
index 89bdfe4cf2a..67226815862 100644
--- a/chat/quirc/distinfo
+++ b/chat/quirc/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/10/25 23:37:26 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/03/12 06:07:12 minskim Exp $
 
-SHA1 (quirc-0.9.82.tar.gz) = edb4e3acc8daf9d3451b91c3f98aed4a931b8c07
-Size (quirc-0.9.82.tar.gz) = 296135 bytes
-SHA1 (patch-aa) = 997938094af7ff493ad31248b13e428e393aa2a1
-SHA1 (patch-ab) = 4e37d9e64f55a5f587d513ac97dd284751c72e69
-SHA1 (patch-ac) = 5b147d7cfcd52264de43d501a159ee5dd150349b
-SHA1 (patch-ad) = a396c5a5ecbebae7b723cda1726866b474c79143
-SHA1 (patch-ae) = 557579457517a43fee5fe0356bd697dc6c9fbc25
+SHA1 (quirc-0.9.84.tar.gz) = 0d9aa3f35616c3d5e6835a318266f1c71232e4d1
+Size (quirc-0.9.84.tar.gz) = 341962 bytes
+SHA1 (patch-aa) = 83b4a50329dd4590cba4f52c523fb82153de5c22
+SHA1 (patch-ab) = 15356ff0598db83eeaf549b29a8d285eb6a27630
+SHA1 (patch-ac) = 4353b22eb607d2e1f158ba4a2668ebf1e2616de7
+SHA1 (patch-ad) = 37a6e3525dc0ff7655fd62c8981eb81eae916126
diff --git a/chat/quirc/patches/patch-aa b/chat/quirc/patches/patch-aa
index b12f9e583f6..273c45de9c9 100644
--- a/chat/quirc/patches/patch-aa
+++ b/chat/quirc/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/19 12:04:30 grant Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/12 06:07:12 minskim Exp $
 
---- Makefile.in.orig	Wed Jul 25 12:17:39 2001
+--- Makefile.in.orig	2004-01-13 01:23:10.000000000 -0600
 +++ Makefile.in
-@@ -93,7 +93,7 @@ generate_tags_SOURCES = generate_tags.cc
+@@ -225,7 +225,7 @@ BUILT_SOURCES = tags.cc
+ generate_tags_SOURCES = generate_tags.cc
  
  # Documentation
- 
 -docdir = $(prefix)/doc/@PACKAGE@
 +docdir = $(prefix)/share/doc/@PACKAGE@
  doc_DATA = FAQ AUTHORS COPYING ChangeLog INSTALL NEWS README ChangeLog.themes
diff --git a/chat/quirc/patches/patch-ab b/chat/quirc/patches/patch-ab
index a803c15cb52..fbb3ead6f65 100644
--- a/chat/quirc/patches/patch-ab
+++ b/chat/quirc/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/19 12:04:30 grant Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/12 06:07:12 minskim Exp $
 
---- doc/Makefile.in.orig	Thu Dec 19 22:57:57 2002
+--- doc/Makefile.in.orig	2004-01-13 01:23:10.000000000 -0600
 +++ doc/Makefile.in
-@@ -68,7 +68,7 @@ TK_HEADER = @TK_HEADER@
- VERSION = @VERSION@
- WISH = @WISH@
- 
+@@ -132,7 +132,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -docdir = $(prefix)/doc/@PACKAGE@
 +docdir = $(prefix)/share/doc/@PACKAGE@
- 
  doc_DATA = rfc1459.txt color.txt nickcomp.txt quedit.txt
- 
+ EXTRA_DIST = $(doc_DATA) dccresum.txt links.txt tdcc.txt
+ MOSTLYCLEANFILES = \\\#*\\\# *~
diff --git a/chat/quirc/patches/patch-ac b/chat/quirc/patches/patch-ac
index e06d46d39cc..26bc9cd526b 100644
--- a/chat/quirc/patches/patch-ac
+++ b/chat/quirc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/03/01 11:08:35 jmc Exp $
+$NetBSD: patch-ac,v 1.2 2004/03/12 06:07:12 minskim Exp $
 
---- support.cc.orig	Sat Mar  1 11:02:55 2003
-+++ support.cc	Sat Mar  1 11:03:12 2003
-@@ -46,7 +46,7 @@
+--- support.cc.orig	2004-01-12 03:06:18.000000000 -0600
++++ support.cc
+@@ -78,7 +78,7 @@ extern char *chop(char *string) {
    return string;
  }
  
diff --git a/chat/quirc/patches/patch-ad b/chat/quirc/patches/patch-ad
index 68d5194022e..85e269330cc 100644
--- a/chat/quirc/patches/patch-ad
+++ b/chat/quirc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2003/03/01 11:08:35 jmc Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/12 06:07:12 minskim Exp $
 
---- support.h.orig	Sat Mar  1 11:01:17 2003
-+++ support.h	Sat Mar  1 11:01:44 2003
-@@ -15,7 +15,7 @@
+--- support.h.orig	2004-01-12 03:07:02.000000000 -0600
++++ support.h
+@@ -28,7 +28,7 @@ extern int ischannel(const char *string)
     0, effectively shortening the string's length by one. */
  extern char *chop(char *);
  
diff --git a/chat/quirc/patches/patch-ae b/chat/quirc/patches/patch-ae
deleted file mode 100644
index 0e046c935d0..00000000000
--- a/chat/quirc/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/10/25 23:37:26 kristerw Exp $
-
---- tcltk.h.in.orig	Sun Oct 26 01:25:54 2003
-+++ tcltk.h.in	Sun Oct 26 01:26:20 2003
-@@ -12,8 +12,8 @@
- #define TT_ARGS TT_Interp,__FILE__,__LINE__
- #define TT_PROC_ARGS ClientData clientData, Tcl_Interp *interp, int argc, char *argv[]
- #define TT_PROC_OBJS ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]
--#define TT_Install_Command(x) Tcl_CreateCommand(TT_Interp,TT_Fix_Name(#x),TT_Proc_##x##,0,0); free(TT_Temp)
--#define TT_Install_ObjCommand(x) Tcl_CreateObjCommand(TT_Interp,TT_Fix_Name(#x),TT_Proc_##x##,0,0); free(TT_Temp)
-+#define TT_Install_Command(x) Tcl_CreateCommand(TT_Interp,TT_Fix_Name(#x),TT_Proc_##x,0,0); free(TT_Temp)
-+#define TT_Install_ObjCommand(x) Tcl_CreateObjCommand(TT_Interp,TT_Fix_Name(#x),TT_Proc_##x,0,0); free(TT_Temp)
- #define ARGV(x) Tcl_GetStringFromObj(objv[x],NULL)
- 
- char *TT_Fix_Name(char *name);