After repocopy from irc/xchat2, add xchat-gnome 0.1, a fork of IRC client

for GNOME 2, with bias on GNOME integration and HIG compliance.

Submitted by:	kwm at irc.freenode.org in #freebsd-gnome

10 files changed, 86 insertions, 129 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 6d924214d62d..ce041874bec1 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -1,32 +1,35 @@
-# New ports collection makefile for:	xchat2
-# Date created:			17 Aug 2002
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+# New ports collection makefile for:	xchat-gnome
+# Date created:			04 May 2004
+# Whom:				Koop Mast <kwm@rainbow-runner.nl>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xchat2
-PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTNAME=	xchat
+PORTVERSION=	0.1
 CATEGORIES=	irc gnome ipv6
-MASTER_SITES=	http://xchat.org/files/source/2.0/
-DISTNAME=	xchat-${PORTVERSION}
+MASTER_SITES=	http://navi.cx/releases/
+PKGNAMESUFFIX=	-gnome
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
+MAINTAINER=	kwm@rainbow-runner.nl
+COMMENT=	An IRC client for GNOME 2 (development version)
 
 USE_X_PREFIX=	yes
-USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${XCHAT_VER}
+XCHAT_VER=	2.0.8
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20
+USE_LIBTOOL=	yes
+USE_GNOME=	gnomeprefix gnomehack lthack libgnomeui
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-nls \
-		--enable-ipv6
+		--enable-ipv6 \
+		--enable-gnomefe
 
-CONFLICTS=	xchat-1*
+CONFLICTS=	xchat-1* xchat2-2*
 
 .if defined(WITH_SOCKS)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo
index 20316097c9d8..4921023c5b62 100644
--- a/irc/xchat-gnome/distinfo
+++ b/irc/xchat-gnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (xchat-2.0.8.tar.bz2) = 64cd419e7bb14e36e658b09726d3411f
-SIZE (xchat-2.0.8.tar.bz2) = 997439
+MD5 (xchat-gnome-0.1.tar.gz) = 6a736ee186d06df90a610eeb19459e7d
+SIZE (xchat-gnome-0.1.tar.gz) = 2558977
diff --git a/irc/xchat-gnome/files/patch-Makefile.in b/irc/xchat-gnome/files/patch-Makefile.in
deleted file mode 100644
index 5625f2e60ee5..000000000000
--- a/irc/xchat-gnome/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/xchat-gnome/files/patch-configure b/irc/xchat-gnome/files/patch-configure
deleted file mode 100644
index 576821f6fed2..000000000000
--- a/irc/xchat-gnome/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Tue Sep 23 18:58:15 2003
-+++ configure	Tue Sep 23 19:04:29 2003
-@@ -21462,12 +21462,12 @@
- /* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
-+extern int *libintl_nl_domain_bindings;
- int
- main ()
- {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
-   ;
-   return 0;
- }
diff --git a/irc/xchat-gnome/files/patch-ltmain.sh b/irc/xchat-gnome/files/patch-ltmain.sh
deleted file mode 100644
index 2162ffd95a2c..000000000000
--- a/irc/xchat-gnome/files/patch-ltmain.sh
+++ /dev/null
@@ -1,58 +0,0 @@
---- ltmain.sh.old	Thu Jun 12 05:09:04 2003
-+++ ltmain.sh	Thu Jul 31 19:03:06 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -4305,11 +4313,11 @@
- 	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- 	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
- 
--	  # Clean up the generated files.
--	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
--	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
--
--	  # Transform the symbol file into the correct name.
-+	        # Clean up the generated files.
-+	        $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-+	        $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-+               
-+	        # Transform the symbol file into the correct name.
- 	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- 	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- 	  ;;
-@@ -5428,10 +5436,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/irc/xchat-gnome/files/patch-socks5 b/irc/xchat-gnome/files/patch-socks5
deleted file mode 100644
index 5aa617cc3f82..000000000000
--- a/irc/xchat-gnome/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/xchat-gnome/files/patch-src-fe-gnome-channel_list.c b/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c
new file mode 100644
index 000000000000..0f7200433846
--- /dev/null
+++ b/irc/xchat-gnome/files/patch-src-fe-gnome-channel_list.c
@@ -0,0 +1,19 @@
+--- src/fe-gnome/channel_list.c.orig	Sun Apr 25 01:14:31 2004
++++ src/fe-gnome/channel_list.c	Wed May  5 00:02:05 2004
+@@ -98,6 +98,7 @@
+ 	GtkSizeGroup *group;
+ 	GtkTreeSelection *select;
+ 	int width, height;
++	gchar *title;
+ 
+ 	if(sess == NULL)
+ 		return;
+@@ -122,7 +123,7 @@
+ 	}
+ 
+ 	widget = glade_xml_get_widget(win->xml, "window 1");
+-	gchar *title = g_strdup_printf("%s Channel List", sess->server->networkname);
++	title = g_strdup_printf("%s Channel List", sess->server->networkname);
+ 	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
new file mode 100644
index 000000000000..03a57b46abd0
--- /dev/null
+++ b/irc/xchat-gnome/files/patch-src-fe-gnome-userlist_gui.c
@@ -0,0 +1,18 @@
+--- src/fe-gnome/userlist_gui.c.orig	Sun Apr 25 01:14:29 2004
++++ src/fe-gnome/userlist_gui.c	Wed May  5 00:16:02 2004
+@@ -64,13 +64,14 @@
+ 	}
+ 
+ 	if(event->button == 3) {
++		struct User *u;
+ 		if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(view), event->x, event->y, &path, 0, 0, 0)) {
+ 			select = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+ 			gtk_tree_selection_unselect_all(select);
+ 			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-descr b/irc/xchat-gnome/pkg-descr
index f93552a5ae8d..5aa359429494 100644
--- a/irc/xchat-gnome/pkg-descr
+++ b/irc/xchat-gnome/pkg-descr
@@ -1,5 +1,11 @@
-XChat is a graphical IRC client.  It requires a computer running a
-UNIX-like OS and the X Window System (X11), and the GTK 2 library.  It can
-also use Perl and (optionally) Python scripts.
+Note that xchat-gnome is very young project and is under heavy development.
+You can consider xchat-gnome as alpha software, not that its unstable
+but in lack of (not-yet) implemented features.
 
-WWW:	http://xchat.org/
+Xchat-gnome is a fork of the popular xchat irc client.
+But the difference between the two is that xchat-gnome aims at better
+gnome integration.
+
+For help see the website or visit #xchat-gnome on irc.freenode.net
+
+WWW: http://xchat-gnome.navi.cx/
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index a10eba841612..92fc0976977d 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -1,12 +1,30 @@
 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/apps/Internet/xchat.desktop
+share/gnome/applications/xchat.desktop
 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/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
 share/locale/am/LC_MESSAGES/xchat.mo
 share/locale/az/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/es/LC_MESSAGES/xchat.mo
@@ -26,6 +44,7 @@ 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/zh_CN/LC_MESSAGES/xchat.mo
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins