Index: irc/xchat/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/xchat/Makefile,v
retrieving revision 1.150
diff -a -u -r1.150 Makefile
--- irc/xchat/Makefile	13 Jul 2010 18:03:36 -0000	1.150
+++ irc/xchat/Makefile	3 Sep 2011 19:57:53 -0000
@@ -8,6 +8,7 @@
 
 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/}/
@@ -39,11 +40,7 @@
 		TCL "Enable TCL support" off \
 		SOCKS "Build with socks5 support" off
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=	yes
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
@@ -91,7 +88,7 @@
 .endif
 
 .if defined(WITH_PYTHON)
-.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_PYTHON=	yes
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
@@ -101,7 +98,6 @@
 
 .if defined(WITH_TCL)
 USE_TCL=	84+
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
 		-I${TCL_INCLUDEDIR}" \
@@ -127,4 +123,4 @@
 post-install:
 	@${MKDIR} ${PREFIX}/lib/xchat/plugins
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: irc/xchat/files/patch-src_fe-gtk_plugin-tray.c
===================================================================
RCS file: irc/xchat/files/patch-src_fe-gtk_plugin-tray.c
diff -N irc/xchat/files/patch-src_fe-gtk_plugin-tray.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ irc/xchat/files/patch-src_fe-gtk_plugin-tray.c	3 Sep 2011 19:57:53 -0000
@@ -0,0 +1,23 @@
+--- src/fe-gtk/plugin-tray.c.orig	2010-05-16 03:37:01.000000000 +0200
++++ src/fe-gtk/plugin-tray.c	2011-09-03 21:50:34.000000000 +0200
+@@ -125,8 +125,9 @@
+ /* prototypes */
+ static gboolean (*nn_init) (char *);
+ static void (*nn_uninit) (void);
+-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
+-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
++ * extra NULL argument will be fine */
++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
+ static gboolean (*nn_show) (void *noti, GError **error);
+ static void (*nn_set_timeout) (void *noti, gint timeout);
+ 
+@@ -160,8 +161,6 @@
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
+ 			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
+-			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))