Fix build with new notify API.

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

6 files changed, 350 insertions, 0 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
new file mode 100644
index 000000000..a791a4aea
--- /dev/null
+++ b/irc/xchat-gnome/Makefile
@@ -0,0 +1,119 @@
+# New ports collection makefile for:	xchat-gnome
+# Date created:			04 May 2004
+# Whom:				Koop Mast <kwm@rainbow-runner.nl>
+#
+# $FreeBSD: ports/irc/xchat-gnome/Makefile,v 1.171 2010/05/31 01:59:27 ade Exp $
+#
+
+PORTNAME=	xchat
+PORTVERSION=	0.26.1
+PORTREVISION=	6
+CATEGORIES=	irc gnome ipv6
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/xchat-gnome/${PORTVERSION:R}
+PKGNAMESUFFIX=	-gnome
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER=	kwm@FreeBSD.org
+COMMENT=	An IRC client for GNOME 2 (development version)
+
+LIB_DEPENDS=	sexy:${PORTSDIR}/x11-toolkits/libsexy \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+		notify:${PORTSDIR}/devel/libnotify
+
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomeprefix libgnomeui gnomedocutils desktopfileutils
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--disable-tcl
+GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
+INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
+WANT_PERL=	yes
+
+MAN1=		xchat-gnome.1
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-dbus
+USE_GNOME+=	gconf2
+GCONF_SCHEMAS+=	url_handler.schemas
+PLIST_SUB+=	DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	DBUS="@comment "
+.endif
+
+.if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=	--enable-socks
+.endif
+
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+# openssl in now default in configure
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=		yes
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		PYTHON=""
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		PYTHON="@comment "
+.endif
+
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.3" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${LOCALBASE}/lib/tcl8.3"
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_PERL)
+CONFIGURE_ARGS+=--disable-perl
+PLIST_SUB+=	PERL="@comment "
+.else
+USE_PERL5=	yes
+CONFIGURE_ARGS+=--enable-perl
+PLIST_SUB+=	PERL=""
+.endif
+
+pre-everything::
+.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITH_PYTHON)
+	@${ECHO_MSG} "WITH_PYTHON=yes for Python support"
+.endif
+.if !defined(WITH_SOCKS)
+	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
+.endif
+.if !defined(WITH_TCL)
+	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
+.endif
+.if !defined(WITHOUT_PERL)
+	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
+.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"|' \
+		-e 's|tcl-8.4/lib|lib/tcl8.3|g' \
+		-e 's|-DGTK_DISABLE_DEPRECATED||g' \
+		-e 's|-fgnu89-inline||g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/irc/xchat-gnome/distinfo b/irc/xchat-gnome/distinfo
new file mode 100644
index 000000000..d361c7d26
--- /dev/null
+++ b/irc/xchat-gnome/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xchat-gnome-0.26.1.tar.bz2) = 6234f14ddc7323faaa4f10f890786a0f69da00774855412a4382b11a6158cf4b
+SIZE (xchat-gnome-0.26.1.tar.bz2) = 1938676
diff --git a/irc/xchat-gnome/files/patch-gmake-3.82 b/irc/xchat-gnome/files/patch-gmake-3.82
new file mode 100644
index 000000000..5afead7e6
--- /dev/null
+++ b/irc/xchat-gnome/files/patch-gmake-3.82
@@ -0,0 +1,19 @@
+--- src/common/dbus/Makefile.in.orig	2011-03-12 11:40:26.000000000 -0600
++++ src/common/dbus/Makefile.in	2011-03-12 11:41:43.000000000 -0600
+@@ -709,11 +709,11 @@
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ install-data-local: $(schema_DATA)
+-@GCONF_SCHEMAS_INSTALL_TRUE@        if test -z "$(DESTDIR)" ; then \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	        for p in $^ ; do \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
+-@GCONF_SCHEMAS_INSTALL_TRUE@	        done \
+-@GCONF_SCHEMAS_INSTALL_TRUE@        fi
++@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
++@GCONF_SCHEMAS_INSTALL_TRUE@		for p in $^ ; do \
++@GCONF_SCHEMAS_INSTALL_TRUE@			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
++@GCONF_SCHEMAS_INSTALL_TRUE@		done \
++@GCONF_SCHEMAS_INSTALL_TRUE@	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c b/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c
new file mode 100644
index 000000000..330ea57e8
--- /dev/null
+++ b/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c
@@ -0,0 +1,11 @@
+--- plugins/notify-osd/notify-osd.c.orig	2011-06-26 13:22:24.000000000 +0200
++++ plugins/notify-osd/notify-osd.c	2011-06-26 13:22:41.000000000 +0200
+@@ -67,7 +67,7 @@
+ 	gchar *escaped;
+ 
+ 	escaped = g_markup_escape_text (message, strlen(message));
+-	notify = notify_notification_new (summary, escaped, NULL, NULL);
++	notify = notify_notification_new (summary, escaped, NULL);
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_icon_from_pixbuf (notify, notify_icon);
+ 	if (!notify_notification_show (notify, &error)) {
diff --git a/irc/xchat-gnome/pkg-descr b/irc/xchat-gnome/pkg-descr
new file mode 100644
index 000000000..5aa359429
--- /dev/null
+++ b/irc/xchat-gnome/pkg-descr
@@ -0,0 +1,11 @@
+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.
+
+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
new file mode 100644
index 000000000..51b3fe228
--- /dev/null
+++ b/irc/xchat-gnome/pkg-plist
@@ -0,0 +1,188 @@
+bin/xchat-gnome
+lib/xchat-gnome/plugins/autoaway.a
+lib/xchat-gnome/plugins/autoaway.la
+lib/xchat-gnome/plugins/autoaway.so
+%%DBUS%%lib/xchat-gnome/plugins/netmonitor.a
+%%DBUS%%lib/xchat-gnome/plugins/netmonitor.la
+%%DBUS%%lib/xchat-gnome/plugins/netmonitor.so
+lib/xchat-gnome/plugins/notification.a
+lib/xchat-gnome/plugins/notification.la
+lib/xchat-gnome/plugins/notification.so
+lib/xchat-gnome/plugins/notifyosd.a
+lib/xchat-gnome/plugins/notifyosd.la
+lib/xchat-gnome/plugins/notifyosd.so
+%%PERL%%lib/xchat-gnome/plugins/perl.a
+%%PERL%%lib/xchat-gnome/plugins/perl.la
+%%PERL%%lib/xchat-gnome/plugins/perl.so
+%%PYTHON%%lib/xchat-gnome/plugins/python.a
+%%PYTHON%%lib/xchat-gnome/plugins/python.la
+%%PYTHON%%lib/xchat-gnome/plugins/python.so
+lib/xchat-gnome/plugins/soundnotification.a
+lib/xchat-gnome/plugins/soundnotification.la
+lib/xchat-gnome/plugins/soundnotification.so
+%%TCL%%lib/xchat-gnome/plugins/tcl.a
+%%TCL%%lib/xchat-gnome/plugins/tcl.la
+%%TCL%%lib/xchat-gnome/plugins/tcl.so
+lib/xchat-gnome/plugins/urlscraper.a
+lib/xchat-gnome/plugins/urlscraper.la
+lib/xchat-gnome/plugins/urlscraper.so
+%%DBUS%%share/dbus-1/services/org.gnome.Xchat.service
+share/applications/xchat-gnome.desktop
+share/gnome/help/xchat-gnome/C/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/C/legal.xml
+share/gnome/help/xchat-gnome/C/xchat-gnome.xml
+share/gnome/help/xchat-gnome/ca/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/ca/xchat-gnome.xml
+share/gnome/help/xchat-gnome/es/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/es/xchat-gnome.xml
+share/gnome/help/xchat-gnome/fr/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/fr/xchat-gnome.xml
+share/gnome/help/xchat-gnome/it/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/it/xchat-gnome.xml
+share/gnome/help/xchat-gnome/oc/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/oc/xchat-gnome.xml
+share/gnome/help/xchat-gnome/pt_BR/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/pt_BR/xchat-gnome.xml
+share/gnome/help/xchat-gnome/sv/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/sv/xchat-gnome.xml
+share/gnome/help/xchat-gnome/th/figures/xchat-gnome_main_window.png
+share/gnome/help/xchat-gnome/th/xchat-gnome.xml
+share/xchat-gnome/channel-list.glade
+share/xchat-gnome/connect-dialog.glade
+share/xchat-gnome/dcc-window.glade
+share/xchat-gnome/irc-network-editor.glade
+share/xchat-gnome/preferences-dialog.glade
+share/xchat-gnome/preferences-notification.glade
+share/xchat-gnome/setup-dialog.glade
+share/xchat-gnome/topic-change.glade
+share/xchat-gnome/xchat-gnome-ui.xml
+share/xchat-gnome/xchat-gnome.glade
+share/icons/hicolor/128x128/apps/xchat-gnome.png
+share/icons/hicolor/48x48/apps/xchat-gnome.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-message-new.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-status-halfop.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-message-nickname-said.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-users.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-plugin.png
+share/xchat-gnome/icons/hicolor/22x22/apps/xchat-gnome-status-operator.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-message-new.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-dcc.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-status-voice.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-search-wrapped.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-message-data.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-plugin.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-status-operator.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-users.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-message-nickname-said.png
+share/xchat-gnome/icons/hicolor/16x16/apps/xchat-gnome-status-halfop.png
+share/xchat-gnome/icons/hicolor/scalable/apps/xchat-gnome-plugin.svg
+share/locale/am/LC_MESSAGES/xchat-gnome.mo
+share/locale/ar/LC_MESSAGES/xchat-gnome.mo
+share/locale/az/LC_MESSAGES/xchat-gnome.mo
+share/locale/bg/LC_MESSAGES/xchat-gnome.mo
+share/locale/bn/LC_MESSAGES/xchat-gnome.mo
+share/locale/ca/LC_MESSAGES/xchat-gnome.mo
+share/locale/cs/LC_MESSAGES/xchat-gnome.mo
+share/locale/da/LC_MESSAGES/xchat-gnome.mo
+share/locale/de/LC_MESSAGES/xchat-gnome.mo
+share/locale/dz/LC_MESSAGES/xchat-gnome.mo
+share/locale/el/LC_MESSAGES/xchat-gnome.mo
+share/locale/en_AU/LC_MESSAGES/xchat-gnome.mo
+share/locale/en_GB/LC_MESSAGES/xchat-gnome.mo
+share/locale/es/LC_MESSAGES/xchat-gnome.mo
+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/gl/LC_MESSAGES/xchat-gnome.mo
+share/locale/he/LC_MESSAGES/xchat-gnome.mo
+share/locale/hi/LC_MESSAGES/xchat-gnome.mo
+share/locale/hr/LC_MESSAGES/xchat-gnome.mo
+share/locale/hu/LC_MESSAGES/xchat-gnome.mo
+share/locale/is/LC_MESSAGES/xchat-gnome.mo
+share/locale/it/LC_MESSAGES/xchat-gnome.mo
+share/locale/ja/LC_MESSAGES/xchat-gnome.mo
+share/locale/jbo/LC_MESSAGES/xchat-gnome.mo
+share/locale/ka/LC_MESSAGES/xchat-gnome.mo
+share/locale/kn/LC_MESSAGES/xchat-gnome.mo
+share/locale/ko/LC_MESSAGES/xchat-gnome.mo
+share/locale/ku/LC_MESSAGES/xchat-gnome.mo
+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/mr/LC_MESSAGES/xchat-gnome.mo
+share/locale/ms/LC_MESSAGES/xchat-gnome.mo
+share/locale/nb/LC_MESSAGES/xchat-gnome.mo
+share/locale/oc/LC_MESSAGES/xchat-gnome.mo
+share/locale/pa/LC_MESSAGES/xchat-gnome.mo
+share/locale/pl/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/ta/LC_MESSAGES/xchat-gnome.mo
+share/locale/te/LC_MESSAGES/xchat-gnome.mo
+share/locale/th/LC_MESSAGES/xchat-gnome.mo
+share/locale/tl/LC_MESSAGES/xchat-gnome.mo
+share/locale/tr/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_HK/LC_MESSAGES/xchat-gnome.mo
+share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
+share/omf/xchat-gnome/xchat-gnome-C.omf
+share/omf/xchat-gnome/xchat-gnome-ca.omf
+share/omf/xchat-gnome/xchat-gnome-es.omf
+share/omf/xchat-gnome/xchat-gnome-fr.omf
+share/omf/xchat-gnome/xchat-gnome-it.omf
+share/omf/xchat-gnome/xchat-gnome-oc.omf
+share/omf/xchat-gnome/xchat-gnome-pt_BR.omf
+share/omf/xchat-gnome/xchat-gnome-sv.omf
+share/omf/xchat-gnome/xchat-gnome-th.omf
+@dirrm share/xchat-gnome/icons/hicolor/scalable/apps
+@dirrm share/xchat-gnome/icons/hicolor/scalable
+@dirrm share/xchat-gnome/icons/hicolor/22x22/apps
+@dirrm share/xchat-gnome/icons/hicolor/22x22
+@dirrm share/xchat-gnome/icons/hicolor/16x16/apps
+@dirrm share/xchat-gnome/icons/hicolor/16x16
+@dirrm share/xchat-gnome/icons/hicolor
+@dirrm share/xchat-gnome/icons
+@dirrm share/xchat-gnome
+@dirrm share/omf/xchat-gnome
+@dirrm share/gnome/help/xchat-gnome/th/figures
+@dirrm share/gnome/help/xchat-gnome/th
+@dirrm share/gnome/help/xchat-gnome/sv/figures
+@dirrm share/gnome/help/xchat-gnome/sv
+@dirrm share/gnome/help/xchat-gnome/pt_BR/figures
+@dirrm share/gnome/help/xchat-gnome/pt_BR
+@dirrm share/gnome/help/xchat-gnome/oc/figures
+@dirrm share/gnome/help/xchat-gnome/oc
+@dirrm share/gnome/help/xchat-gnome/it/figures
+@dirrm share/gnome/help/xchat-gnome/it
+@dirrm share/gnome/help/xchat-gnome/fr/figures
+@dirrm share/gnome/help/xchat-gnome/fr
+@dirrm share/gnome/help/xchat-gnome/es/figures
+@dirrm share/gnome/help/xchat-gnome/es
+@dirrm share/gnome/help/xchat-gnome/ca/figures
+@dirrm share/gnome/help/xchat-gnome/ca
+@dirrm share/gnome/help/xchat-gnome/C/figures
+@dirrm share/gnome/help/xchat-gnome/C
+@dirrm share/gnome/help/xchat-gnome
+@dirrm lib/xchat-gnome/plugins
+@dirrm lib/xchat-gnome
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/jbo/LC_MESSAGES
+@dirrmtry share/locale/jbo
+@dirrmtry share/applications