5 files changed, 10 insertions, 38 deletions

diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 6d924214d62d..f529e0f48275 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xchat2
-PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTVERSION=	2.0.9
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://xchat.org/files/source/2.0/
 DISTNAME=	xchat-${PORTVERSION}
diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo
index 20316097c9d8..25a9ecd3c188 100644
--- a/irc/xchat2/distinfo
+++ b/irc/xchat2/distinfo
@@ -1,2 +1,2 @@
-MD5 (xchat-2.0.8.tar.bz2) = 64cd419e7bb14e36e658b09726d3411f
-SIZE (xchat-2.0.8.tar.bz2) = 997439
+MD5 (xchat-2.0.9.tar.bz2) = 8a38f161176cc2c54b32bbe5e51e3fc7
+SIZE (xchat-2.0.9.tar.bz2) = 1093203
diff --git a/irc/xchat2/files/patch-Makefile.in b/irc/xchat2/files/patch-Makefile.in
deleted file mode 100644
index 5625f2e60ee5..000000000000
--- a/irc/xchat2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	Thu Jul 31 05:24:26 2003
-+++ Makefile.in	Thu Jul 31 19:03:06 2003
-@@ -211,7 +211,7 @@
- icondir = $(datadir)/pixmaps
- 
- util_DATA = xchat.desktop
--utildir = $(datadir)/applications
-+utildir = $(datadir)/apps/Internet
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/irc/xchat2/files/patch-socks5 b/irc/xchat2/files/patch-socks5
deleted file mode 100644
index 5aa617cc3f82..000000000000
--- a/irc/xchat2/files/patch-socks5
+++ /dev/null
@@ -1,22 +0,0 @@
-# Fix broken Socks5 traversal in xchat <= 2.0.8
-diff -ru xchat-2.0.8/src/common/server.c xchat-2.0.9/src/common/server.c
---- src/common/server.c	2004-03-16 15:33:47.000000000 +1100
-+++ src/common/server.c	2004-04-05 15:33:15.000000000 +1000
-@@ -1054,7 +1054,7 @@
- 	struct sock5_connect1 sc1;
- 	unsigned char *sc2;
- 	unsigned int packetlen, addrlen;
--	unsigned char buf[10];
-+	unsigned char buf[260];
- 
- 	sc1.version = 5;
- 	sc1.nmethods = 1;
-@@ -1095,7 +1095,7 @@
- 	{
- 		if (recv (sok, buf, 1, 0) != 1)
- 			return 1;
--		packetlen = buf[0] + 2;
-+		packetlen = buf[0] + 2;	/* can't exceed 260 */
- 		if (recv (sok, buf, packetlen, 0) != packetlen)
- 			return 1;
- 	}
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index a10eba841612..6a4a6d6b8970 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -2,15 +2,19 @@ bin/xchat
 %%PERL%%lib/xchat/plugins/perl.so
 %%PYTHON%%lib/xchat/plugins/python.so
 %%TCL%%lib/xchat/plugins/tcl.so
-share/gnome/apps/Internet/xchat.desktop
+share/gnome/applications/xchat.desktop
 share/gnome/pixmaps/xchat.png
 share/locale/am/LC_MESSAGES/xchat.mo
 share/locale/az/LC_MESSAGES/xchat.mo
+share/locale/bg/LC_MESSAGES/xchat.mo
 share/locale/ca/LC_MESSAGES/xchat.mo
+share/locale/cs/LC_MESSAGES/xchat.mo
 share/locale/de/LC_MESSAGES/xchat.mo
 share/locale/el/LC_MESSAGES/xchat.mo
+share/locale/en_GB/LC_MESSAGES/xchat.mo
 share/locale/es/LC_MESSAGES/xchat.mo
 share/locale/et/LC_MESSAGES/xchat.mo
+share/locale/eu/LC_MESSAGES/xchat.mo
 share/locale/fi/LC_MESSAGES/xchat.mo
 share/locale/fr/LC_MESSAGES/xchat.mo
 share/locale/ja/LC_MESSAGES/xchat.mo
@@ -26,6 +30,8 @@ share/locale/sk/LC_MESSAGES/xchat.mo
 share/locale/sl/LC_MESSAGES/xchat.mo
 share/locale/sr/LC_MESSAGES/xchat.mo
 share/locale/sv/LC_MESSAGES/xchat.mo
+share/locale/uk/LC_MESSAGES/xchat.mo
+share/locale/wa/LC_MESSAGES/xchat.mo
 share/locale/zh_CN/LC_MESSAGES/xchat.mo
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins