Fix xchat build with gtk 2.13.x.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11248 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 268 insertions, 0 deletions

diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
new file mode 100644
index 000000000..aa62df606
--- /dev/null
+++ b/irc/xchat/Makefile
@@ -0,0 +1,124 @@
+# New ports collection makefile for:	xchat2
+# Date created:			17 Aug 2002
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	xchat
+PORTVERSION=	2.8.6
+PORTREVISION=	2
+CATEGORIES=	irc gnome ipv6
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
+
+CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gnomehack gtk20
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-ipv6
+WANT_PERL=	yes
+
+OPTIONS=	DBUS "Enable DBUS support" on \
+		GTKSPELL "Enable spell check support using gtkspell" on \
+		LIBSEXY "Enable spell check support using libsexy" off \
+		NOTIFY "Depend on libnotify for notifications" off \
+		PERL "Enable Perl support" on \
+		PYTHON "Enable Python support" off \
+		TCL "Enable TCL support" off \
+		SOCKS "Build with socks5 support" off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+USE_GNOME+=	gconf2
+GCONF_SCHEMAS+=	apps_xchat_url_handler.schemas
+PLIST_SUB+=	DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	DBUS="@comment "
+.endif
+
+.if defined(WITH_GTKSPELL)
+.if defined(WITH_LIBSEXY)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
+CONFIGURE_ARGS+=--enable-spell=gtkspell
+.endif
+
+.if defined(WITH_LIBSEXY)
+.if defined(WITH_GTKSPELL)
+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
+.endif
+LIB_DEPENDS+=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
+CONFIGURE_ARGS+=--enable-spell=libsexy
+.endif
+
+.if !defined(WITH_GTKSPELL) && !defined(WITH_LIBSEXY)
+CONFIGURE_ARGS+=--enable-spell=none
+.endif
+
+.if defined(WITH_NOTIFY)
+RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify \
+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+.endif
+
+.if defined(WITHOUT_PERL)
+CONFIGURE_ARGS+=--disable-perl
+PLIST_SUB+=	PERL="@comment "
+.else
+USE_PERL5=	yes
+CONFIGURE_ARGS+=--enable-perl
+PLIST_SUB+=	PERL=""
+.endif
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.4
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.4" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${LOCALBASE}/lib/tcl8.4"
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
+.endif
+
+.if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=--enable-socks
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
+		${WRKSRC}/configure
+
+# Create plugins directory even when no plugins are installed
+post-install:
+	@${MKDIR} ${PREFIX}/lib/xchat/plugins
+
+.include <bsd.port.post.mk>
diff --git a/irc/xchat/distinfo b/irc/xchat/distinfo
new file mode 100644
index 000000000..901a1ee75
--- /dev/null
+++ b/irc/xchat/distinfo
@@ -0,0 +1,3 @@
+MD5 (xchat-2.8.6.tar.bz2) = 1f2670865d43a23a9abc596dde999aca
+SHA256 (xchat-2.8.6.tar.bz2) = 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
+SIZE (xchat-2.8.6.tar.bz2) = 1423645
diff --git a/irc/xchat/files/patch-configure b/irc/xchat/files/patch-configure
new file mode 100644
index 000000000..b40bb4f83
--- /dev/null
+++ b/irc/xchat/files/patch-configure
@@ -0,0 +1,17 @@
+--- configure.orig	Wed Jul  4 19:41:43 2007
++++ configure	Wed Jul  4 19:42:45 2007
+@@ -26802,12 +26802,12 @@
+ #include <libintl.h>
+ $gt_revision_test_code
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+   ;
+   return 0;
+ }
diff --git a/irc/xchat/files/patch-src_fe-gtk_xtext.h b/irc/xchat/files/patch-src_fe-gtk_xtext.h
new file mode 100644
index 000000000..f4a74269a
--- /dev/null
+++ b/irc/xchat/files/patch-src_fe-gtk_xtext.h
@@ -0,0 +1,10 @@
+--- src/fe-gtk/xtext.h.orig	2008-08-06 09:47:05.000000000 +0200
++++ src/fe-gtk/xtext.h	2008-08-06 09:51:01.000000000 +0200
+@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *x
+ xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
+ void gtk_xtext_buffer_free (xtext_buffer *buf);
+ void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
+-GtkType gtk_xtext_get_type (void);
++GType gtk_xtext_get_type (void);
+ 
+ #endif
diff --git a/irc/xchat/files/patch-xc286-smallfixes b/irc/xchat/files/patch-xc286-smallfixes
new file mode 100644
index 000000000..581462477
--- /dev/null
+++ b/irc/xchat/files/patch-xc286-smallfixes
@@ -0,0 +1,68 @@
+#
+# Various small fixes from CVS that are considered safe to apply to 2.8.6.
+#
+--- xchat-2.8.6/src/common/cfgfiles.c	2008-02-05 21:02:47.000000000 +1100
++++ src/common/cfgfiles.c	2008-06-15 13:45:43.000000000 +1000
+@@ -886,7 +886,6 @@
+ set_showval (session *sess, const struct prefs *var, char *tbuf)
+ {
+ 	int len, dots, j;
+-	static const char *offon[] = { "OFF", "ON" };
+ 
+ 	len = strlen (var->name);
+ 	memcpy (tbuf, var->name, len);
+@@ -909,8 +908,10 @@
+ 					*((int *) &prefs + var->offset));
+ 		break;
+ 	case TYPE_BOOL:
+-		sprintf (tbuf + len, "\0033:\017 %s\n", offon[
+-					*((int *) &prefs + var->offset)]);
++		if (*((int *) &prefs + var->offset))
++			sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
++		else
++			sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
+ 		break;
+ 	}
+ 	PrintText (sess, tbuf);
+--- xchat-2.8.6/src/common/chanopt.c	2008-06-10 22:00:55.000000000 +1000
++++ src/common/chanopt.c	2008-06-15 13:48:04.000000000 +1000
+@@ -32,7 +32,7 @@
+ 
+ #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
+ 
+-channel_options chanopt[] =
++static const channel_options chanopt[] =
+ {
+ 	{"alert_beep", "BEEP", S_F(alert_beep)},
+ 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
+--- xchat-2.8.6/src/common/servlist.c	2008-04-01 19:22:34.000000000 +1100
++++ src/common/servlist.c	2008-06-15 13:57:41.000000000 +1000
+@@ -509,6 +509,8 @@
+ 	list = g_slist_nth (net->servlist, net->selected);
+ 	if (!list)
+ 		list = net->servlist;
++	if (!list)
++		return;
+ 	ircserv = list->data;
+ 
+ 	/* incase a protocol switch is added to the servlist gui */
+--- xchat-2.8.6/src/common/text.c	2008-03-28 13:20:04.000000000 +1100
++++ src/common/text.c	2008-06-15 13:59:59.000000000 +1000
+@@ -216,7 +216,7 @@
+ static void
+ scrollback_save (session *sess, char *text)
+ {
+-	char buf[1024];
++	char buf[512 * 4];
+ 	time_t stamp;
+ 	int len;
+ 
+@@ -266,7 +266,7 @@
+ scrollback_load (session *sess)
+ {
+ 	int fh;
+-	char buf[1024];
++	char buf[512 * 4];
+ 	char *text;
+ 	time_t stamp;
+ 	int lines;
diff --git a/irc/xchat/pkg-descr b/irc/xchat/pkg-descr
new file mode 100644
index 000000000..f93552a5a
--- /dev/null
+++ b/irc/xchat/pkg-descr
@@ -0,0 +1,5 @@
+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.
+
+WWW:	http://xchat.org/
diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist
new file mode 100644
index 000000000..0b63ee0bc
--- /dev/null
+++ b/irc/xchat/pkg-plist
@@ -0,0 +1,41 @@
+bin/xchat
+%%PERL%%lib/xchat/plugins/perl.la
+%%PERL%%lib/xchat/plugins/perl.so
+%%PYTHON%%lib/xchat/plugins/python.la
+%%PYTHON%%lib/xchat/plugins/python.so
+%%TCL%%lib/xchat/plugins/tcl.la
+%%TCL%%lib/xchat/plugins/tcl.so
+share/applications/xchat.desktop
+%%DBUS%%share/dbus-1/services/org.xchat.service.service
+share/locale/be/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
+share/locale/fi/LC_MESSAGES/xchat.mo
+share/locale/fr/LC_MESSAGES/xchat.mo
+share/locale/gl/LC_MESSAGES/xchat.mo
+share/locale/hu/LC_MESSAGES/xchat.mo
+share/locale/it/LC_MESSAGES/xchat.mo
+share/locale/ja/LC_MESSAGES/xchat.mo
+share/locale/ko/LC_MESSAGES/xchat.mo
+share/locale/lt/LC_MESSAGES/xchat.mo
+share/locale/mk/LC_MESSAGES/xchat.mo
+share/locale/nl/LC_MESSAGES/xchat.mo
+share/locale/pa/LC_MESSAGES/xchat.mo
+share/locale/pt/LC_MESSAGES/xchat.mo
+share/locale/ru/LC_MESSAGES/xchat.mo
+share/locale/sq/LC_MESSAGES/xchat.mo
+share/locale/sr/LC_MESSAGES/xchat.mo
+share/locale/sv/LC_MESSAGES/xchat.mo
+share/locale/th/LC_MESSAGES/xchat.mo
+share/locale/uk/LC_MESSAGES/xchat.mo
+share/locale/vi/LC_MESSAGES/xchat.mo
+share/locale/zh_CN/LC_MESSAGES/xchat.mo
+share/locale/zh_TW/LC_MESSAGES/xchat.mo
+share/pixmaps/xchat.png
+@dirrmtry share/applications
+@exec mkdir -p %D/lib/xchat/plugins
+@dirrm lib/xchat/plugins
+@dirrm lib/xchat