diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/Makefile /var/tmp/dsh/download/tkXwin/Makefile
--- /usr/ports/x11/tkXwin/Makefile	2007-05-20 00:27:23.000000000 +0400
+++ /var/tmp/dsh/download/tkXwin/Makefile	2007-10-14 20:48:11.793563000 +0400
@@ -16,20 +16,15 @@
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Tcl/Tk library to detect idle periods of an X session
 
-LIB_DEPENDS=	tcl${SHORT_TK_VER}:${PORTSDIR}/lang/tcl${SHORT_TK_VER} \
-		tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
-
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
+USE_TK=		84+
 
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
-		--with-tkinclude=${LOCALBASE}/include/tk${TK_VER}
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--with-tkinclude=${TK_INCLUDEDIR}
 CONFIGURE_ENV=	INSTALL="${INSTALL_DATA}"
 
-TK_VER=		8.4
-SHORT_TK_VER=	${TK_VER:S/.//}
-
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/files/patch-configure /var/tmp/dsh/download/tkXwin/files/patch-configure
--- /usr/ports/x11/tkXwin/files/patch-configure	2005-08-31 16:00:30.000000000 +0400
+++ /var/tmp/dsh/download/tkXwin/files/patch-configure	2007-10-14 20:48:11.793563000 +0400
@@ -1,5 +1,5 @@
---- configure.orig	Tue Aug 30 14:52:03 2005
-+++ configure	Tue Aug 30 14:52:18 2005
+--- configure.orig	2002-08-25 10:29:53.000000000 +0400
++++ configure	2007-10-14 20:44:46.000000000 +0400
 @@ -1798,7 +1798,7 @@
  AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
  objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -9,3 +9,12 @@
  $libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
+@@ -3534,7 +3534,7 @@
+     
+ 
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
++PKG_TCL=${TCL_PREFIX}/lib/tkXwin
+ 
+ 
+ 
diff -ruN --exclude=CVS /usr/ports/x11/tkXwin/pkg-plist /var/tmp/dsh/download/tkXwin/pkg-plist
--- /usr/ports/x11/tkXwin/pkg-plist	2006-02-23 13:39:59.000000000 +0300
+++ /var/tmp/dsh/download/tkXwin/pkg-plist	2007-10-14 20:55:26.732098000 +0400
@@ -1,7 +1,6 @@
 lib/libtkXwin.la
 lib/libtkXwin.so
 lib/libtkXwin.so.1
-@cd %%LOCALBASE%%
 lib/tkXwin/pkgIndex.tcl
 lib/tkXwin/test.tcl
 @dirrm lib/tkXwin