diff --git a/x11/itk/Makefile b/x11/itk/Makefile
index 88ff466b813..46ae8fbb5f5 100644
--- a/x11/itk/Makefile
+++ b/x11/itk/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 20:04:21 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2009/03/13 12:59:47 sthen Exp $
 
 COMMENT=	build mega-widgets using the Itcl object system
 
 VERSION=	3.3
 DISTNAME=	itk${VERSION}
-PKGNAME=	itk-${VERSION}p0
+PKGNAME=	itk-${VERSION}p1
 SHARED_LIBS=	itk33	0.0
 
-CATEGORIES=	x11 x11/tk devel
+CATEGORIES=	x11 devel
 
 HOMEPAGE=	http://incrtcl.sourceforge.net/itk/
 
@@ -19,35 +19,35 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 tcl84
+MODULES=	x11/tk
+WANTLIB=	X11
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
 
-LIB_DEPENDS=	tk84.>=1:tk-${TK_VERSION}.*:x11/tk/${TK_VERSION} \
+LIB_DEPENDS=	${MODTK_LIB_DEPENDS} \
 		itcl33::devel/itcl
-RUN_DEPENDS=	:tk-${TK_VERSION}.*:x11/tk/${TK_VERSION} \
+RUN_DEPENDS=	${MODTK_RUN_DEPENDS} \
 		::devel/itcl
 
-TCL_VERSION=	8.4
-TK_VERSION=	8.4
+MODTCL_VERSION=	8.4
+MODTK_VERSION=	8.4
 ITCL_VERSION=	3.3
 
 SUBST_VARS=	VERSION
 
-USE_X11=	Yes
 CONFIGURE_STYLE=gnu
 
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-tcl=${LOCALBASE}/lib/tcl${TCL_VERSION} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VERSION} \
+		--with-tcl=${MODTCL_LIBDIR} \
+		--with-tk=${MODTK_LIBDIR} \
 		--with-itcl=${LOCALBASE}/lib/itcl${ITCL_VERSION} \
 		--libdir=${LOCALBASE}/lib/itk${VERSION} \
 		--includedir=${LOCALBASE}/include/itk${VERSION}
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/tcl${TCL_VERSION}/generic \
-		-I${LOCALBASE}/include/tcl${TCL_VERSION}/unix \
-		-I${LOCALBASE}/include/tk${TK_VERSION}/generic \
-		-I${LOCALBASE}/include/tk${TK_VERSION}/unix \
+CONFIGURE_ENV=	CPPFLAGS="-I${MODTCL_INCDIR}/generic \
+		-I${MODTCL_INCDIR}/unix \
+		-I${MODTK_INCDIR}/generic \
+		-I${MODTK_INCDIR}/unix \
 		-I${LOCALBASE}/include/itcl${ITCL_VERSION}" \
 		LIBitk33_VERSION=${LIBitk33_VERSION}
 
@@ -56,7 +56,7 @@ REGRESS_IS_INTERACTIVE=Yes
 
 do-regress:
 	@cd ${WRKSRC} && env ITK_LIBRARY=${WRKSRC}/library \
-		${PREFIX}/bin/wish${TK_VERSION} tests/all.tcl -load \
+		${MODTK_BIN} tests/all.tcl -load \
 		"load ./libitk33.so.${LIBitk33_VERSION}; package require Tk"
 
 .include <bsd.port.mk>