Index: head/irc/xchat/Makefile
===================================================================
--- head/irc/xchat/Makefile	(revision 344284)
+++ head/irc/xchat/Makefile	(revision 344285)
@@ -1,113 +1,112 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $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=	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
-USES=		gettext pkgconfig gmake
-USE_GNOME=	gnomehack gtk20
+USES=		gettext pkgconfig gmake pathfix
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--enable-ipv6
 
 OPTIONS_DEFINE=	DBUS NOTIFY PERL PYTHON SOCKS TCL
 OPTIONS_DEFAULT=DBUS GTKSPELL PERL
 OPTIONS_RADIO=	SPELL
 OPTIONS_RADIO_SPELL=	GTKSPELL LIBSEXY
 GTKSPELL_DESC=	Spell check support via gtkspell
 LIBSEXY_DESC=	Spell check support via libsexy
 
 .if defined(WITH_PYTHON)
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:${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 ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--enable-spell=gtkspell
 .elif ${PORT_OPTIONS:MLIBSEXY}
-LIB_DEPENDS+=	sexy:${PORTSDIR}/x11-toolkits/libsexy
+LIB_DEPENDS+=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
 CONFIGURE_ARGS+=--enable-spell=libsexy
 .else
 CONFIGURE_ARGS+=--enable-spell=none
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
 RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify \
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
 CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .else
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOCKS}
-LIB_DEPENDS+=	socks:${PORTSDIR}/net/dante
+LIB_DEPENDS+=	libsocks.so:${PORTSDIR}/net/dante
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
-USE_TCL=	84+
+USES+=		tcl
 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
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/common/*.[ch]
 
 # Create plugins directory even when no plugins are installed
 post-install:
 	@${MKDIR} ${PREFIX}/lib/xchat/plugins
 
 .include <bsd.port.mk>
Index: head/irc/xchat/pkg-descr
===================================================================
--- head/irc/xchat/pkg-descr	(revision 344284)
+++ head/irc/xchat/pkg-descr	(revision 344285)
@@ -1,5 +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/
+WWW: http://xchat.org/