Update "xchat" and "xchat-python" packages to version 2.6.1.

Changes since version 2.4.5 include:
 - Updated translations (de, el, fi, fr, gl, hu, ko, nl, pa, sq, vi).
 - Added support for log rotation based on time or date.
 - Double-click in tree layout will now expand/collapse (Lian Wan Situ).
 - Keys to move tabs around now work in Tree layout too (Lian Wan Situ/Me).
 - Largely re-written "Search Text" function with much better
   behaviour and match case on/off and search backwards options
   (Richard Hitt and Me).
 - The parent row in the tree layout now changes color if you have
   that group collapsed (Lian Wan Situ).
 - Fixed crash when trying to Detach or Close a utility tab via
   right-click, when it's not the currently focused tab.
 - Made DCC resume handle case-insensitive file systems properly.
 - Fixed the flashing when you click on a colored treeview row.
 - Fixed auto-completion during /exec -o [1375530].
 - Added "Join Channel" menu item to the Server menu.
 - Unshade the Disconnect menu item when a connection is in progress.
 - Fixed a possible crash in changing color settings before changing
   to/from the tree layout (SF bug #1349088).
 - Added "Auto accept file offers" to the File Transfer settings.
 - Added support for brackets "<>" around nicknames in cut and paste,
   without displaying them (hidden text) (Camillo Lugaresi).
 - Fixed opening URL irc://NetWork/#channel not joining the channel
   [1362155].
 - Fixed the nickname label becoming small when you're marked Back
   if you have "Small tabs" turned on.
 - The textevents GUI has been re-written to use GtkTreeView.
 - Randomized DNS lookups on Mac OS X on hostnames that return
   multiple IP numbers (SG / CL).
 - Added a dialog window to help newbies join a channel.
 - Opening irc:// URLs will now JOIN only if you are already connected
   to the network.
 - Plugin API (Lian Wan Situ):
  * Added selected flag to "users" list.
  * Added "id" to xchat_get_prefs.
  * Changed xchat_find_context (ph, channel, NULL) to return results
    from the same server group as the current context when possible.
 - Perl (Lian Wan Situ):
  * using emit_print/command/recv will no longer trigger their own
    callbacks.
  * Fix compiling issues with versions older than 5.8.2.
  * Make all scripts appear in the "Plugins and Scripts" window, even
    those that do not call register().
 - Updated translations (nl, zh_TW).
 - Message boxes are now warning, error or info with appropriate icon.
 - Red marker line feature enabled by default.
 - Added /SEND <nick> [file] which will automatically switch to PSEND
   when detecting a private net address.
 - Simplified default nick-right-click menu.
 - Show "Last Talk" in nick-right-click menu as "minutes ago".
 - Strip mIRC colour from away message in right-click menu.
 - Warn when opening banlist in non-channel.
 - Reorganised and simplified IRC/Server menus and new View menu.
 - The editable Server menu is no more, if you want it type
   /set gui_usermenu 1 and restart.
 - Option to view channels in tabs or tree structure.
 - Shorter titlebar text for better viewing in taskbar.
 - Disabled key-search in server list, as GTK's auto-find does this
   better.
 - Removed "Connect in new tab" button in server list, it now does it
   intelligently. Use stock Connect icon.
 - Removed "Tint (shade) transparency" item from settings and figure
   it out based on tint values.
 - When closing a tab, re-focus the one near by, instead of always the
   last.
 - Firefox style close button.
 - The lag and throttle metres now have tooltips that give you real
   information (hover the pointer over them).
 - Added workaround to show on-join ChanServ notices in the right tab.
 - Tab scroll buttons are now side-by-side when in vertical mode.
 - Automatically change key shortcut of "Marked Away" if the
   translation already uses ALT-A for the Help menu (e.g _Aide in
   French).
 - Your nickname in the bottom-left corner now turns gray when you are
   marked away, just like the userlist.
 - Introduced a delay before joining channels, to allow for FreeNode's
   short comings. If a umode +e is received it'll send auto-join
   channels immediately.
 - Plugin API: Added win_ptr to xchat_get_info.
 - Non-irc (utility) tabs can now be detached aswell.
 - Fixed behaviour problems of the userlist pane, which might be set
   incorrectly if the window was resized while a server-tab is focued.
 - Added a confirm-dialog when trying to close a server-tab with
   children.
 - Server list's edit window now gives you an option of a network
   specific "Second choice" nickname.
 - Auto detect RusNet and use /NICKSERV to identify instead of /MSG.
 - Added /Ghost command.
 - Fixed: The WHOIS away-line ignored irc_whois_front setting.
 - Scroll-wheel now works while hovering over a tab (Lian Wan Situ).
 - The input box right-click menu now has bold, underline and italic.
 - Added xchat-remote for launching irc:// URLs in existing xchat
   and other functions (Claessens Xavier).
 - Better command-line parameter parsing via GOption.
 - Tab completion order can now be in "last talk" order if you
   /set completion_sort 1.
 - "Channel Action" and "Channel Action Hilight" now have a 3rd
   argument of "Mode char", just like normal message events. The last
   talk time is also now updated on actions.
 - Reworked the Character Chart window so you can find your char.
 - Perl:
  - fixed so that printf and commandf are exported
  - print and printf can also be called as prnt and prntf, this is to
    avoid clashing with the builtins.
 - Deprioritized MODE/WHO to reduce join lag.

"pkgsrc" related changes:
- The text frontend "xchat-text" is currently not part of the package
  because the build is broken (despite different claims in the
  original release notes).

4 files changed, 14 insertions, 48 deletions

diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index bf23ed0390c..b9040bc6682 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2006/03/14 17:59:57 tron Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/14 19:06:19 tron Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		3
 MAINTAINER=		tron@NetBSD.org
 
-PATCH_SITES=           	${MASTER_SITES}/patches/
-PATCHFILES=		xc245-fix-te-notify.diff
-PATCH_DIST_STRIP=	-p1
-
 COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=	YES
@@ -18,7 +13,8 @@ CONFLICTS=		xchat-gnome-[0-9]*
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 
-CONFIGURE_ARGS+=	--enable-textfe
+# The text frontend doesn't compile in X-Chat 2.6.1
+#CONFIGURE_ARGS+=	--enable-textfe
 CONFIGURE_ARGS+=	--enable-tcl=no
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-python
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 0d2ada12fee..1d6d3f06956 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.47 2006/03/14 17:59:57 tron Exp $
+# $NetBSD: Makefile.common,v 1.48 2006/03/14 19:06:19 tron Exp $
 
-DISTNAME=	xchat-2.4.5
+DISTNAME=	xchat-2.6.1
 CATEGORIES=	chat gnome
-MASTER_SITES=	http://www.xchat.org/files/source/2.4/
+MASTER_SITES=	http://xchat.org/files/source/2.6/
 EXTRACT_SUFX=	.tar.bz2
 
-HOMEPAGE=	http://www.xchat.org/
+HOMEPAGE=	http://xchat.org/
 
 DISTINFO_FILE=	${.CURDIR}/../../chat/xchat/distinfo
 
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index ff558840dd9..befef7d5b96 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,44 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2005/08/23 22:48:07 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/14 19:06:19 tron Exp $
 bin/xchat
-bin/xchat-text
 share/applications/xchat.desktop
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
 @comment in xdg-dirs: @dirrm share/pixmaps
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index cb1dbe169b0..102ce1126b5 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.26 2005/10/09 21:43:46 tron Exp $
+$NetBSD: distinfo,v 1.27 2006/03/14 19:06:19 tron Exp $
 
-SHA1 (xchat-2.4.5.tar.bz2) = e027a20caa47b4ffea00896ee68269a7ae885e2d
-RMD160 (xchat-2.4.5.tar.bz2) = 19d1033d01af784f8b7af5103a7de8cf3a26f3fb
-Size (xchat-2.4.5.tar.bz2) = 1324626 bytes
-SHA1 (xc245-fix-te-notify.diff) = 15c6c6e62e1e23359b7a4cff06666516dd794452
-RMD160 (xc245-fix-te-notify.diff) = df48a5b90b8c4b2f1a8899f4b981527221c809cb
-Size (xc245-fix-te-notify.diff) = 403 bytes
+SHA1 (xchat-2.6.1.tar.bz2) = 94a233b8f1464cc5dc90be43b596c9e5165d8881
+RMD160 (xchat-2.6.1.tar.bz2) = 88138d4c92ee2712eff045957a76a1502af47e7f
+Size (xchat-2.6.1.tar.bz2) = 996111 bytes