Index: ports/irc/xchat/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/xchat/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- ports/irc/xchat/Makefile	4 Aug 2008 02:46:24 -0000	1.140
+++ ports/irc/xchat/Makefile	5 Jan 2009 14:09:35 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	2.8.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -96,12 +96,13 @@
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
-CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.4
+USE_TCL=	84+
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.4" \
+		-I${TCL_INCLUDEDIR}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-		-L${LOCALBASE}/lib/tcl8.4"
+		-L${TCL_LIBDIR}"
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no