- Convert to new LIB_DEPENDS format

- Convert to USES=tk
- STAGE-clean

3 files changed, 13 insertions, 10 deletions

diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index a8ce358b518b..0b9e69832f1b 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -11,13 +11,13 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Object-oriented extension to Tk [incr Tk]
 
-LIB_DEPENDS=	itcl.${MAJOR}:${PORTSDIR}/lang/itcl
+LIB_DEPENDS=	libitcl.so.${MAJOR}:${PORTSDIR}/lang/itcl
 
-USE_TK=		84+
+USES=		tk
 USE_LDCONFIG=	yes
 MAKE_ENV+=	${PLIST_SUB} \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-		USE_TK=${USE_TK} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
+		USE_TK=${TK_SHLIB_VER} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
 		TK_INCLUDEDIR=${TK_INCLUDEDIR}
 
 MAKEFILE=	${FILESDIR}/Makefile.lib
@@ -28,11 +28,8 @@ MINOR=		${PORTVERSION:E}
 PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
 ITK_LIB=	libitk.so.${MAJOR}
 
-MANN=		Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
-
 ITK_LIB_FILE=	${ITK_LIB}.${SHLIB_MAJOR}
 
-NO_STAGE=	yes
 .if defined(DISPLAY)
 post-build:	test
 .else
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 6440eb3bf8b7..6b0c53620180 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -3,7 +3,7 @@ LIB=		itk
 ITK_LIBRARY=	${PREFIX}/lib/itk${MAJOR}.${MINOR}
 CFLAGS+=	-I. -I./../generic \
 		-I${TCL_INCLUDEDIR}/generic \
-		-I ${PREFIX}/include/itcl${MAJOR}.*/ \
+		-I ${LOCALBASE}/include/itcl${MAJOR}.*/ \
 		-I${TK_INCLUDEDIR}/generic \
 		-I${LOCALBASE}/include \
 		-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
@@ -21,9 +21,9 @@ LDADD+=		-L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${USE_TK}
 SRCS=		itk_cmds.c itk_option.c itk_archetype.c itk_util.c itkStubInit.c
 
 SCRIPTDIR=	lib/itk${MAJOR}.${MINOR}
-SCRIPTPATH=	${PREFIX}/${SCRIPTDIR}
+SCRIPTPATH=	${DESTDIR}${PREFIX}/${SCRIPTDIR}
 LIBDIR=		${PREFIX}/lib
-INCDIR=		${PREFIX}/include/itk${MAJOR}.${MINOR}
+INCDIR=		${DESTDIR}${PREFIX}/include/itk${MAJOR}.${MINOR}
 
 pkgIndex.tcl: pkgIndex.tcl.in
 	sed -e 's#"@PKG_LIB_FILE@"#.. ${SHLIB_NAME}#' -e "s#@PACKAGE_VERSION@#${MAJOR}.${MINOR}#" \
@@ -40,6 +40,6 @@ ${SCRIPTPATH} ${INCDIR}:
 beforeinstall: pkgIndex.tcl itkConfig.sh ${SCRIPTPATH} ${INCDIR}
 	${BSD_INSTALL_DATA} pkgIndex.tcl itkConfig.sh ${.CURDIR}/library/* ${SCRIPTPATH}
 	${BSD_INSTALL_DATA} ${.CURDIR}/generic/*.h ${INCDIR}
-	${BSD_INSTALL_MAN} ${.CURDIR}/doc/*.n ${PREFIX}/man/mann/
+	${BSD_INSTALL_MAN} ${.CURDIR}/doc/*.n ${DESTDIR}${PREFIX}/man/mann/
 
 .include <bsd.lib.mk>
diff --git a/x11-toolkits/itk/pkg-plist b/x11-toolkits/itk/pkg-plist
index 6a7c0c938d99..070b9b36da4a 100644
--- a/x11-toolkits/itk/pkg-plist
+++ b/x11-toolkits/itk/pkg-plist
@@ -10,5 +10,11 @@ lib/itk%%MAJOR%%.%%MINOR%%/itk.tcl
 lib/itk%%MAJOR%%.%%MINOR%%/itkConfig.sh
 lib/itk%%MAJOR%%.%%MINOR%%/tclIndex
 lib/itk%%MAJOR%%.%%MINOR%%/pkgIndex.tcl
+man/mann/Archetype.n.gz
+man/mann/Toplevel.n.gz
+man/mann/Widget.n.gz
+man/mann/itk.n.gz
+man/mann/itkvars.n.gz
+man/mann/usual.n.gz
 @dirrm include/itk%%MAJOR%%.%%MINOR%%
 @dirrm lib/itk%%MAJOR%%.%%MINOR%%