Index: Makefile
===================================================================
--- Makefile	(revision 315951)
+++ Makefile	(working copy)
@@ -28,7 +28,6 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ARGS=	--disable-tcl
 GCONF_SCHEMAS=	apps_xchat.schemas notification.schemas urlscraper.schemas
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
@@ -63,15 +62,15 @@
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
+USE_TCL=	84
+CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-		-L${LOCALBASE}/lib/tcl8.3"
+		-L${TCL_LIBDIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.3
+		-I${TCL_INCLUDEDIR}
 PLIST_SUB+=	TCL=""
 .else
-CONFIGURE_ARGS+=--enable-tcl=no
+CONFIGURE_ARGS+=--disable-tcl
 PLIST_SUB+=	TCL="@comment "
 .endif
 
@@ -106,7 +105,7 @@
 
 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|tcl-8.4/lib|lib/tcl8.4|g' \
 		-e 's|-DGTK_DISABLE_DEPRECATED||g' \
 		-e 's|-DGDK_DISABLE_DEPRECATED||g' \
 		-e 's|-fgnu89-inline||g' \