5 files changed, 55 insertions, 69 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 5c653ed16667..81a7c40e5343 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	xchat
-PORTVERSION=	0.2
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	irc gnome ipv6
-MASTER_SITES=	http://flapjack.navi.cx/releases/xchat-gnome/ \
-		http://members.chello.nl/~g.mast/distfiles/
+MASTER_SITES=	http://flapjack.navi.cx/releases/xchat-gnome/
 PKGNAMESUFFIX=	-gnome
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
@@ -18,8 +16,9 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	An IRC client for GNOME 2 (development version)
 
 USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui
+USE_GNOME=	gnomehack libgnomeui
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -28,6 +27,8 @@ CONFIGURE_ARGS=	--enable-nls \
 		--enable-ipv6 \
 		--enable-gnomefe
 
+GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
+
 CONFLICTS=	xchat-1* xchat2-2*
 
 .if defined(WITH_SOCKS)
@@ -61,7 +62,7 @@ PLIST_SUB+=	TCL="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
+.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
 .else
@@ -84,7 +85,7 @@ pre-everything::
 .if !defined(WITH_TCL)
 	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
 .endif
-.if ${ARCH} != "amd64" && !defined(WITHOUT_PERL)
+.if !defined(WITHOUT_PERL)
 	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
 .endif
 
diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo
index 051f0e21c3fe..5aeac9dd6146 100644
--- a/irc/xchat-gnome/distinfo
+++ b/irc/xchat-gnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (xchat-gnome-0.2.tar.gz) = 0411cd4146ccb484163d3fd145c0f114
-SIZE (xchat-gnome-0.2.tar.gz) = 2860304
+MD5 (xchat-gnome-0.5.tar.bz2) = 5b2a8a3abae883f68695d9bcf65a568b
+SIZE (xchat-gnome-0.5.tar.bz2) = 2203619
diff --git a/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c b/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c
deleted file mode 100644
index c3a01c638b6b..000000000000
--- a/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/fe-gnome/channel_list.c.orig	Wed Oct 13 10:27:41 2004
-+++ src/fe-gnome/channel_list.c	Wed Oct 13 10:28:10 2004
-@@ -118,6 +118,7 @@
- 	GtkSizeGroup *group;
- 	GtkTreeSelection *select;
- 	int width, height;
-+	gchar *title;
- 
- 	if (sess == NULL)
- 		return;
-@@ -142,7 +143,7 @@
- 	}
- 
- 	widget = glade_xml_get_widget (win->xml, "window 1");
--	gchar *title = g_strdup_printf ("%s Channel List", get_network (sess));
-+	title = g_strdup_printf ("%s Channel List", get_network (sess));
- 	gtk_window_set_title (GTK_WINDOW (widget), title);
- 	g_free (title);
- 	g_signal_connect (G_OBJECT (widget), "delete-event", G_CALLBACK (chanlist_delete), win);
diff --git a/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c b/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c
deleted file mode 100644
index b0d65ad1e682..000000000000
--- a/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/fe-gnome/userlist_gui.c.orig	Wed Oct 13 10:27:32 2004
-+++ src/fe-gnome/userlist_gui.c	Wed Oct 13 10:28:46 2004
-@@ -82,6 +82,7 @@
- {
- 	GtkTreePath *path;
- 	GtkTreeSelection *select;
-+	struct User *u;
- 	if (!event)
- 		return FALSE;
- 
-@@ -105,7 +106,7 @@
- 			gtk_tree_selection_select_path (select, path);
- 			gtk_tree_path_free (path);
- 		}
--		struct User *u = userlist_get_selected ();
-+		u = userlist_get_selected ();
- 		if (u != NULL)
- 			userlist_context (view, u);
- 		return TRUE;
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index 803fbc804673..d721eaac6a8c 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -1,29 +1,37 @@
 bin/xchat
 bin/xchat-gnome
-etc/gconf/schemas/apps_xchat.schemas.in.in
 %%PERL%%lib/xchat/plugins/perl.so
 %%PYTHON%%lib/xchat/plugins/python.so
 %%TCL%%lib/xchat/plugins/tcl.so
-share/gnome/applications/xchat-gnome.desktop
-share/gnome/applications/xchat.desktop
-share/gnome/pixmaps/xchat-gnome.png
-share/gnome/pixmaps/xchat.png
-share/gnome/xchat/channel-list.glade
-share/gnome/xchat/color.png
-share/gnome/xchat/dcc.png
-share/gnome/xchat/global-message.png
-share/gnome/xchat/irc.png
-share/gnome/xchat/newdata.png
-share/gnome/xchat/nicksaid.png
-share/gnome/xchat/plugin-manager.png
-share/gnome/xchat/servers.png
-share/gnome/xchat/setup-dialog.glade
-share/gnome/xchat/soap.png
-share/gnome/xchat/stock_link.png
-share/gnome/xchat/toilet-paper.png
-share/gnome/xchat/transfers.glade
-share/gnome/xchat/xchat-gnome-small.png
-share/gnome/xchat/xchat-gnome.glade
+lib/xchat/plugins/notification.so
+lib/xchat/plugins/urlscraper.so
+share/applications/xchat-gnome.desktop
+share/applications/xchat.desktop
+share/pixmaps/xchat-gnome.png
+share/pixmaps/xchat.png
+share/xchat/channel-list.glade
+share/xchat/color.png
+share/xchat/connect-dialog.glade
+share/xchat/dcc.png
+share/xchat/dcc-window.glade
+share/xchat/global-message.png
+share/xchat/irc.png
+share/xchat/irc-network-editor.glade
+share/xchat/newdata.png
+share/xchat/nicksaid.png
+share/xchat/plugin-manager.png
+share/xchat/preferences-dialog.glade
+share/xchat/servers.png
+share/xchat/setup-dialog.glade
+share/xchat/soap.png
+share/xchat/stock_down.png
+share/xchat/stock_link.png
+share/xchat/stock_up.png
+share/xchat/toilet-paper.png
+share/xchat/topic-change.glade
+share/xchat/xchat-gnome-small.png
+share/xchat/xchat-gnome.glade
+share/xchat/xchat-gnome-ui.xml
 share/locale/am/LC_MESSAGES/xchat-gnome.mo
 share/locale/az/LC_MESSAGES/xchat-gnome.mo
 share/locale/bg/LC_MESSAGES/xchat-gnome.mo
@@ -37,6 +45,7 @@ share/locale/et/LC_MESSAGES/xchat-gnome.mo
 share/locale/eu/LC_MESSAGES/xchat-gnome.mo
 share/locale/fi/LC_MESSAGES/xchat-gnome.mo
 share/locale/fr/LC_MESSAGES/xchat-gnome.mo
+share/locale/hi/LC_MESSAGES/xchat-gnome.mo
 share/locale/it/LC_MESSAGES/xchat-gnome.mo
 share/locale/ja/LC_MESSAGES/xchat-gnome.mo
 share/locale/ko/LC_MESSAGES/xchat-gnome.mo
@@ -44,18 +53,32 @@ share/locale/lt/LC_MESSAGES/xchat-gnome.mo
 share/locale/lv/LC_MESSAGES/xchat-gnome.mo
 share/locale/mk/LC_MESSAGES/xchat-gnome.mo
 share/locale/ms/LC_MESSAGES/xchat-gnome.mo
+share/locale/nb/LC_MESSAGES/xchat-gnome.mo
 share/locale/nl/LC_MESSAGES/xchat-gnome.mo
 share/locale/no/LC_MESSAGES/xchat-gnome.mo
+share/locale/pa/LC_MESSAGES/xchat-gnome.mo
 share/locale/pt/LC_MESSAGES/xchat-gnome.mo
+share/locale/pt_BR/LC_MESSAGES/xchat-gnome.mo
 share/locale/ru/LC_MESSAGES/xchat-gnome.mo
 share/locale/sk/LC_MESSAGES/xchat-gnome.mo
 share/locale/sl/LC_MESSAGES/xchat-gnome.mo
+share/locale/sq/LC_MESSAGES/xchat-gnome.mo
 share/locale/sr/LC_MESSAGES/xchat-gnome.mo
 share/locale/sv/LC_MESSAGES/xchat-gnome.mo
 share/locale/uk/LC_MESSAGES/xchat-gnome.mo
+share/locale/vi/LC_MESSAGES/xchat-gnome.mo
 share/locale/wa/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo
+share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
+share/xchat/about.png
+share/xchat/book.png
+share/xchat/hop.png
+share/xchat/op.png
+share/xchat/purple.png
+share/xchat/red.png
+share/xchat/voice.png
 @exec mkdir -p %D/lib/xchat/plugins
-@dirrm share/gnome/xchat
+@dirrm share/xchat
+@unexec rmdir %D/share/applications 2>/dev/null || true
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat