Fix the build with glib 2.32 by add -DGLIB_COMPILATION. I ain't going to

chase the silly header change. ;-)


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

7 files changed, 276 insertions, 0 deletions

diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
new file mode 100644
index 000000000..fc1a0873c
--- /dev/null
+++ b/irc/xchat/Makefile
@@ -0,0 +1,130 @@
+# New ports collection makefile for:	xchat2
+# Date created:			17 Aug 2002
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/irc/xchat/Makefile,v 1.154 2012/06/01 05:21:03 dinoex Exp $
+#   $MCom: ports/irc/xchat/Makefile,v 1.7 2008/08/06 07:59:00 kwm Exp $
+#
+
+PORTNAME=	xchat
+PORTVERSION=	2.8.8
+PORTREVISION=	1
+CATEGORIES=	irc gnome ipv6
+MASTER_SITES=	SF/${PORTNAME}/ \
+		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+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=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DGLIB_COMPILATION
+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 \
+		SOCKS "Build with socks5 support" off \
+		TCL "Enable TCL support" off
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+.endif
+
+.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)
+.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_SOCKS)
+LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
+CONFIGURE_ARGS+=--enable-socks
+.endif
+
+.if defined(WITH_TCL)
+USE_TCL=	84+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${TCL_LIBDIR}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${TCL_INCLUDEDIR}
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
+.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..24b21ff5c
--- /dev/null
+++ b/irc/xchat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xchat-2.8.8.tar.bz2) = 0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0
+SIZE (xchat-2.8.8.tar.bz2) = 1509993
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-socks b/irc/xchat/files/patch-socks
new file mode 100644
index 000000000..01cb73b8c
--- /dev/null
+++ b/irc/xchat/files/patch-socks
@@ -0,0 +1,64 @@
+--- configure.orig
++++ configure
+@@ -18485,13 +18485,13 @@
+ 
+ if test "$socks" = yes; then
+ 	socks=no
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSconnect in -lsocks5" >&5
+-$as_echo_n "checking for SOCKSconnect in -lsocks5... " >&6; }
+-if test "${ac_cv_lib_socks5_SOCKSconnect+set}" = set; then :
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Rconnect in -lsocks" >&5
++$as_echo_n "checking for Rconnect in -lsocks... " >&6; }
++if test "${ac_cv_lib_socks_Rconnect+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocks5  $LIBS"
++LIBS="-lsocks  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -18501,27 +18501,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SOCKSconnect ();
++char Rconnect ();
+ int
+ main ()
+ {
+-return SOCKSconnect ();
++return Rconnect ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_socks5_SOCKSconnect=yes
++  ac_cv_lib_socks_Rconnect=yes
+ else
+-  ac_cv_lib_socks5_SOCKSconnect=no
++  ac_cv_lib_socks_Rconnect=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks5_SOCKSconnect" >&5
+-$as_echo "$ac_cv_lib_socks5_SOCKSconnect" >&6; }
+-if test "x$ac_cv_lib_socks5_SOCKSconnect" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_Rconnect" >&5
++$as_echo "$ac_cv_lib_socks_Rconnect" >&6; }
++if test "x$ac_cv_lib_socks_Rconnect" = x""yes; then :
+   have_socks=yes
+ fi
+ 
+@@ -18542,7 +18542,7 @@
+ 			socks=yes
+ 			$as_echo "#define SOCKS 1" >>confdefs.h
+ 
+-			LIBS="$LIBS -lsocks5"
++			LIBS="$LIBS -lsocks"
+ 		fi
+ 	fi
+ fi
diff --git a/irc/xchat/files/patch-src_common_xchat.h b/irc/xchat/files/patch-src_common_xchat.h
new file mode 100644
index 000000000..52a4348bd
--- /dev/null
+++ b/irc/xchat/files/patch-src_common_xchat.h
@@ -0,0 +1,15 @@
+--- src/common/xchat.h.orig	2012-06-19 21:08:15.000000000 -0500
++++ src/common/xchat.h	2012-06-19 21:08:30.000000000 -0500
+@@ -562,12 +562,7 @@
+ /* CL: get a random int in the range [0..n-1]. DON'T use rand() % n, it gives terrible results. */
+ #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n)))
+ 
+-#if defined(WIN32) && GLIB_CHECK_VERSION(2,4,0)
+-#define xchat_filename_from_utf8 g_locale_from_utf8
+-#define xchat_filename_to_utf8 g_locale_to_utf8
+-#else
+ #define xchat_filename_from_utf8 g_filename_from_utf8
+ #define xchat_filename_to_utf8 g_filename_to_utf8
+-#endif
+ 
+ #endif
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..db3b03cde
--- /dev/null
+++ b/irc/xchat/pkg-plist
@@ -0,0 +1,43 @@
+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/kn/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/pl/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