Update to itcl 3.2. Don't build stubs. Run tests after tests.

Install iwidgets2.2.0 in  addition to 3.0.0. The older  version is still
in  use by  some  scripts and  continues to  come  with itcl3.2.  Change
maintainer to ports@

Approved by:	maintainer's silence

9 files changed, 102 insertions, 293 deletions

diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index e727ae188d2c..627de26172ce 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -6,46 +6,52 @@
 #
 
 PORTNAME=	itk
-PORTVERSION=	3.0.1
-CATEGORIES=	x11-toolkits tk82
-MASTER_SITES=	ftp://ftp.tcltk.com/pub/itcl/
+PORTVERSION=	${MAJOR}.${MINOR}
+CATEGORIES=	x11-toolkits tk83
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl${PORTVERSION}
 
-MAINTAINER=	dmlb@ragnet.demon.co.uk
+MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		itcl30.1:${PORTSDIR}/lang/itcl
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
+		itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
 
-WRKSRC=		${WRKDIR}/itcl3.0.1/itk/unix
+WRKSRC=		${WRKDIR}/itcl${MAJOR}.${MINOR}/itk
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2
-CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITK_LIB_FILE=${ITK_LIB_FILE}
+MAKE_ENV+=	${PLIST_SUB} \
+		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - ./itcl${MAJOR}.${MINOR}/itk
+MAKEFILE=	${FILESDIR}/Makefile.lib
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	1
-MAKEFILE=	makefile
-ITK_LIB=	libitk30.so
-
-MANCOMPRESSED=	yes
-MAN1=		itkwish.1
+MAJOR=		3
+MINOR=		2
+PLIST_SUB+=     MAJOR=${MAJOR} MINOR=${MINOR}
+ITK_LIB=	libitk${MAJOR}${MINOR}.so
+.if defined(MAKE_JOBS)
+MAKE_ARGS+=     -j$(MAKE_JOBS)
+.endif
+
+MANCOMPRESSED=	no
 MANN=		Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
 
-.include <bsd.port.pre.mk>
-
 ITK_LIB_FILE=	${ITK_LIB}.${SHLIB_MAJOR}
 
-post-configure:
-	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
-	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
+post-extract:
+	${RM} ${WRKSRC}/pkgIndex.tcl
 
-pre-build:
-	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
-	   SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-	   TCL_PREFIX=${PREFIX} ITCL_PREFIX=${PREFIX} TK_PREFIX=${PREFIX}
+post-patch:
+	${PERL} -pi \
+		-e 's,package require Itk,load \
+			[glob ${WRKSRC}/${ITK_LIB_FILE}*],;' \
+		-e 's,return$$,exit,' ${WRKSRC}/tests/*
 
-post-install:
-	${LN} -sf itkwish3.0 ${PREFIX}/bin/itkwish
-	${LN} -sf ${ITK_LIB_FILE} ${PREFIX}/lib/${ITK_LIB}
+.if defined(DISPLAY)
+post-build test:
+	cd ${WRKSRC} && ${SETENV} ITK_LIBRARY=${WRKSRC}/library \
+		${PREFIX}/bin/wish8.3 tests/all.tcl
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/itk/distinfo b/x11-toolkits/itk/distinfo
index 882cd787f4df..03382bd74335 100644
--- a/x11-toolkits/itk/distinfo
+++ b/x11-toolkits/itk/distinfo
@@ -1 +1 @@
-MD5 (itcl3.0.1.tar.gz) = 0cf1802a7ea69670503dc69c7951a015
+MD5 (itcl3.2.tar.gz) = b41ed909969eaa5f0a06ab698393760f
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 9f362ba9fcd8..a99d8611fb61 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -1,10 +1,10 @@
 NOPROFILE=	yes
-LIB=		itk30
-ITK_LIBRARY=	${PREFIX}/lib/itk3.0
+LIB=		itk${MAJOR}${MINOR}
+ITK_LIBRARY=	${PREFIX}/lib/itk${MAJOR}.${MINOR}
 CFLAGS+=	-I. -I./../generic \
-		-I${TCL_PREFIX}/include/tcl8.2/generic \
-		-I${ITCL_PREFIX}/include/itcl3.0/generic \
-		-I${TK_PREFIX}/include/tk8.2/generic \
+		-I${PREFIX}/include/tcl8.3/generic \
+		-I${PREFIX}/include/itcl${MAJOR}.${MINOR}/ \
+		-I${PREFIX}/include/tk8.3/generic \
 		-I/usr/X11R6/include \
 		-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
 		-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
@@ -13,15 +13,29 @@ CFLAGS+=	-I. -I./../generic \
 		-DTCL_SHLIB_EXT=\".so\" \
 		-DHAVE_SYS_FILIO_H=1 \
 		-DRETSIGTYPE=void \
-		-DITK_LIBRARY=\"${ITK_LIBRARY}\" \
+		-DITK_LIBRARY=\"${ITK_LIBRARY}\"
+LDADD+=		-L${PREFIX}/lib -litcl${MAJOR}${MINOR} -L${X11BASE}/lib -lX11 -ltk83
 
+.PATH:		${.CURDIR}/generic
 
-GENERIC_DIR=	../generic
-UNIX_DIR=	.
+SRCS=		itk_cmds.c itk_option.c itk_archetype.c itk_util.c
 
-SRCS=	\
-		$(GENERIC_DIR)/itk_cmds.c $(GENERIC_DIR)/itk_option.c \
-		$(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c
+SCRIPTDIR=	lib/itk${MAJOR}.${MINOR}
+SCRIPTPATH=	${PREFIX}/${SCRIPTDIR}
+LIBDIR=		${PREFIX}/lib
+INCDIR=		${PREFIX}/include/itk${MAJOR}.${MINOR}
 
+pkgIndex.tcl: ${.CURDIR}/pkgIndex.tcl.in
+	sed -e "s#@RELPATH@#..#" -e "s#@VERSION@#${MAJOR}.${MINOR}#" \
+		-e "s#@itcl_LIB_FILE@#${SHLIB_NAME}#" \
+		< ${.CURDIR}/pkgIndex.tcl.in > pkgIndex.tcl
+
+${SCRIPTPATH} ${INCDIR}:
+	mkdir -p ${.TARGET}
+
+beforeinstall: pkgIndex.tcl ${SCRIPTPATH} ${INCDIR}
+	${BSD_INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/library/* ${SCRIPTPATH}
+	${BSD_INSTALL_DATA} ${.CURDIR}/generic/*.h ${INCDIR}
+	${BSD_INSTALL_MAN} ${.CURDIR}/doc/*.n ${PREFIX}/man/mann/
 
 .include <bsd.lib.mk>
diff --git a/x11-toolkits/itk/files/makefile b/x11-toolkits/itk/files/makefile
deleted file mode 100644
index aaa10a467a61..000000000000
--- a/x11-toolkits/itk/files/makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all:
-	for f in ../generic/*.o; do ln -sf $$f; done
-	make -f Makefile itkwish
-test:
-	make -f Makefile test
-install:
-	make -f Makefile install
-
diff --git a/x11-toolkits/itk/files/patch-aa b/x11-toolkits/itk/files/patch-aa
deleted file mode 100644
index 78bb31d39d94..000000000000
--- a/x11-toolkits/itk/files/patch-aa
+++ /dev/null
@@ -1,151 +0,0 @@
---- Makefile.in.orig	Wed Aug 12 06:01:40 1998
-+++ Makefile.in	Mon Apr  5 18:23:56 1999
-@@ -55,7 +55,8 @@
- BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
- 
- # Directory in which to install the include file itk.h:
--INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/itk$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/itk$(VERSION)/generic
- 
- # Top-level directory for manual entries:
- MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -75,6 +76,9 @@
- # for this version of [incr Tk]:
- TCL_SRC_DIR =		@TCL_SRC_DIR@
- 
-+# Tcl include dir
-+TCL_INC_DIR =		@TCL_INC_DIR@
-+
- # The directory containing the Tcl library archive file appropriate
- # for this version of [incr Tk]:
- TCL_LIB_DIR =		@TCL_LIB_DIR@
-@@ -89,6 +93,9 @@
- # for this version of [incr Tk]:
- TK_SRC_DIR =		@TK_SRC_DIR@
- 
-+# Tk include dir
-+TK_INC_DIR =		@TK_INC_DIR@
-+
- # The directory containing the Tk library archive file appropriate
- # for this version of [incr Tk]:
- TK_LIB_DIR =		@TK_LIB_DIR@
-@@ -100,6 +107,9 @@
- # for this version of [incr Tk]:
- ITCL_SRC_DIR =		@ITCL_SRC_DIR@
- 
-+# ITcl include dir
-+ITCL_INC_DIR =		@ITCL_INC_DIR@
-+
- # The directory containing the [incr Tcl] library archive file appropriate
- # for this version of [incr Tk]:
- ITCL_LIB_DIR =		@ITCL_LIB_DIR@
-@@ -155,7 +165,7 @@
- # "install" around;  better to use the install-sh script that comes
- # with the distribution, which is slower but guaranteed to work.
- 
--INSTALL = $(TOP_DIR)/../config/install-sh -c
-+INSTALL = 		install -c
- INSTALL_PROGRAM =	${INSTALL}
- INSTALL_DATA =		${INSTALL} -m 644
- MKINSTALLDIRS =		$(TOP_DIR)/../config/mkinstalldirs
-@@ -199,8 +209,8 @@
- 
- CC = @CC@
- CC_SWITCHES = $(CFLAGS) $(SHLIB_CFLAGS) -I$(UNIX_DIR) -I$(GENERIC_DIR) \
---I$(TCL_SRC_DIR)/generic -I$(ITCL_SRC_DIR)/generic \
---I$(TK_SRC_DIR)/generic $(X11_INCLUDES) \
-+-I$(TCL_INC_DIR)/generic -I$(ITCL_INC_DIR)/generic \
-+-I$(TK_INC_DIR)/generic $(X11_INCLUDES) \
- $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) \
- -DITK_LIBRARY=\"$(ITK_LIBRARY)\"
- 
-@@ -209,7 +219,7 @@
- SRCS = $(GENERIC_DIR)/itk_cmds.c $(GENERIC_DIR)/itk_option.c \
- 	$(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c
- 
--all: itkwish
-+all: $(ITK_LIB_FILE) libitk30.a itkwish
- 
- # The following target is configured by autoconf to generate either
- # a shared library or non-shared library for [incr Tk].
-@@ -217,8 +227,14 @@
- @ITK_LIB_FILE@: ${OBJS}
- 	rm -f $(ITK_LIB_FILE)
- 	@MAKE_LIB@
-+	ln -sf $(ITK_LIB_FILE) libitk30.so
- 	$(RANLIB) $(ITK_LIB_FILE)
- 
-+libitk30.a: $(OBJS)
-+	rm -f libitk30.a
-+	ar cr libitk30.a $(OBJS)
-+	ranlib libitk30.a
-+
- itkwish: tkAppInit.o $(ITK_LIB_FILE)
- 	$(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \
- 		$(LIBS) $(LD_SEARCH_FLAGS) -o itkwish
-@@ -239,21 +255,27 @@
- 
- install: install-binaries install-libraries install-man
- 
--install-binaries: $(ITK_LIB_FILE) itkwish
-+install-binaries: $(ITK_LIB_FILE) libitk30.a itkwish
- 	@$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
- 	@echo "Installing $(ITK_LIB_FILE)"
- 	@$(INSTALL_DATA) $(ITK_LIB_FILE) $(LIB_INSTALL_DIR)
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(ITK_LIB_FILE)
-+	@echo "Installing libitk30.a"
-+	@$(INSTALL_DATA) libitk30.a $(LIB_INSTALL_DIR)/libitk30.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libitk30.a)
-+	chmod 555 $(LIB_INSTALL_DIR)/libitk30.a
- 	@echo "Installing itkwish"
- 	$(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION)
- 	@echo "Installing itkConfig.sh"
--	@$(INSTALL_DATA) itkConfig.sh $(LIB_INSTALL_DIR)/itkConfig.sh
-+	@mkdir -p $(SCRIPT_INSTALL_DIR)
-+	@$(INSTALL_DATA) itkConfig.sh $(SCRIPT_INSTALL_DIR)/itkConfig.sh
- 
- install-libraries:
--	@$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)
-+	@$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(GENERIC_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)
- 	@echo "Installing itk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/itk.h $(INCLUDE_INSTALL_DIR)
-+	@$(INSTALL_DATA) $(GENERIC_DIR)/itk.h $(GENERIC_INCLUDE_INSTALL_DIR)
-+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/itk.h $(INCLUDE_INSTALL_DIR)/itk.h
- 	@for i in $(TOP_DIR)/library/*.* $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
- 	    do \
- 	    echo "Installing $$i"; \
-@@ -267,19 +289,26 @@
- 	@cd $(TOP_DIR)/doc; for i in *.1; \
- 	    do \
- 	    echo "Installing doc/$$i"; \
--	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
--	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-+		    $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \
-+	    chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \
- 	    done;
- 	@cd $(TOP_DIR)/doc; for i in *.n; \
- 	    do \
- 	    echo "Installing doc/$$i"; \
--	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-+	    rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		    $$i > $(MANN_INSTALL_DIR)/$$i; \
--	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-+		    $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \
-+	    chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \
- 	    done;
-+	@echo "**********"
-+	@echo "IMPORTANT:"
-+	@echo "**********"
-+	@echo "itkConfig.sh in $(SCRIPT_INSTALL_DIR)/itkConfig.sh"
-+	@echo "itk.h        in $(INCLUDE_INSTALL_DIR)/itk.h"
-+	@echo "There are NOT default place, but good place to avoid"
-+	@echo "conflicting with another version of [incr] Tcl/Tks."
- 
- Makefile: $(UNIX_DIR)/Makefile.in
- 	$(SHELL) config.status
diff --git a/x11-toolkits/itk/files/patch-ab b/x11-toolkits/itk/files/patch-ab
deleted file mode 100644
index 0768183d39d8..000000000000
--- a/x11-toolkits/itk/files/patch-ab
+++ /dev/null
@@ -1,75 +0,0 @@
---- configure~	Mon Oct 19 21:14:57 1998
-+++ configure	Fri Jan 15 18:41:16 1999
-@@ -877,15 +877,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
- LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
-+TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_VERSION}
- 
--#--------------------------------------------------------------------
--#   Make sure that we can find the Tcl sources, so we can include
--#   the "tclInt.h" file.
--#--------------------------------------------------------------------
--
--if test ! -d "$TCL_SRC_DIR"; then
--    { echo "configure: error: Can't find Tcl source directory "$TCL_SRC_DIR".  Itcl can't be built without this directory." 1>&2; exit 1; }
--fi
- 
- #--------------------------------------------------------------------
- #   See if there was a command-line option for where Tk is;  if
-@@ -915,6 +908,7 @@
- 
- file=$TK_LIB_DIR/tkConfig.sh
- . $file
-+TK_INC_DIR=${TK_PREFIX}/include/tk${TK_VERSION}
- 
- #--------------------------------------------------------------------
- #   See if there was a command-line option for where [incr Tcl] is.
-@@ -936,6 +930,7 @@
- 
- file=$ITCL_LIB_DIR/itclConfig.sh
- . $file
-+ITCL_INC_DIR=${TCL_PREFIX}/include/itcl${ITCL_VERSION}
- 
- #--------------------------------------------------------------------
- #   If this is gcc, add some extra compile flags.
-@@ -1065,13 +1060,13 @@
-         { echo "configure: error: Tcl was not built with --enable-shared" 1>&2; exit 1; }
-     fi
-     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
--    eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}"
-+    eval "ITK_LIB_FILE=${ITK_LIB_FILE}"
-     ITK_PKG_FILE="[file join [file dirname \$dir] ${ITK_LIB_FILE}]"
-     MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} \$(LD_SEARCH_FLAGS)"
-     RANLIB=":"
- else
-     SHLIB_CFLAGS=""
--    eval "ITK_LIB_FILE=libitk${VERSION}.a"
-+    eval "ITK_LIB_FILE=${ITK_LIB_FILE}"
-     ITK_PKG_FILE=""
-     MAKE_LIB="ar cr ${ITK_LIB_FILE} \${OBJS}"
- fi
-@@ -1279,6 +1274,7 @@
- s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
- s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
-+s%@TCL_INC_DIR@%$TCL_INC_DIR%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
- s%@TCL_DBGX@%$TCL_DBGX%g
-@@ -1295,6 +1291,7 @@
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TK_XLIBSW@%$TK_XLIBSW%g
- s%@TK_SRC_DIR@%$TK_SRC_DIR%g
-+s%@TK_INC_DIR@%$TK_INC_DIR%g
- s%@ITCL_VERSION@%$ITCL_VERSION%g
- s%@ITCL_MAJOR_VERSION@%$ITCL_MAJOR_VERSION%g
- s%@ITCL_MINOR_VERSION@%$ITCL_MINOR_VERSION%g
-@@ -1304,6 +1301,7 @@
- s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g
- s%@ITCL_PKG_FILE@%$ITCL_PKG_FILE%g
- s%@ITCL_SRC_DIR@%$ITCL_SRC_DIR%g
-+s%@ITCL_INC_DIR@%$ITCL_INC_DIR%g
- s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g
- s%@ITK_LIB_FILE@%$ITK_LIB_FILE%g
- s%@ITK_LIB_SPEC@%$ITK_LIB_SPEC%g
diff --git a/x11-toolkits/itk/files/patch-nostubs b/x11-toolkits/itk/files/patch-nostubs
new file mode 100644
index 000000000000..debdedf2c3a4
--- /dev/null
+++ b/x11-toolkits/itk/files/patch-nostubs
@@ -0,0 +1,27 @@
+--- generic/itk_cmds.c	Mon Aug 28 23:58:00 2000
++++ generic/itk_cmds.c	Sat Jul 28 08:04:49 2001
+@@ -82,3 +82,5 @@
+ 
++#ifdef USE_ITK_STUBS
+ extern ItkStubs itkStubs;
++#endif
+ 
+@@ -105,6 +107,6 @@
+ 
+-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
++    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
+ 	return TCL_ERROR;
+     };
+-    if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
++    if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
+ 	return TCL_ERROR;
+@@ -198,3 +200,8 @@
+     if (Tcl_PkgProvideEx(interp, "Itk", ITCL_VERSION,
+-            (ClientData) &itkStubs) != TCL_OK) {
++#ifdef USE_ITK_STUBS
++            (ClientData) &itkStubs
++#else
++	    (ClientData) NULL
++#endif
++		) != TCL_OK) {
+ 	return TCL_ERROR;
diff --git a/x11-toolkits/itk/pkg-descr b/x11-toolkits/itk/pkg-descr
index a3771e546466..74d574f5e3e6 100644
--- a/x11-toolkits/itk/pkg-descr
+++ b/x11-toolkits/itk/pkg-descr
@@ -5,3 +5,5 @@ Tk. The [incr Tk] extension is also known as ``itk''.
 A companion to [incr Tk] called [incr Widgets] provides a widget set,
 with many improved widgets. The [incr Widgets] collection is also known
 as ``iwidgets'' and is available in x11-toolkits.
+
+WWW: http://sourceforge.net/projects/incrtcl/
diff --git a/x11-toolkits/itk/pkg-plist b/x11-toolkits/itk/pkg-plist
index 454888502413..dda423ed0258 100644
--- a/x11-toolkits/itk/pkg-plist
+++ b/x11-toolkits/itk/pkg-plist
@@ -1,19 +1,13 @@
-bin/itkwish3.0
-@exec /bin/ln -s %D/%F %B/itkwish
-@unexec rm %B/itkwish
-include/itk3.0/generic/itk.h
-include/itk3.0/itk.h
-lib/libitk30.so.1
-lib/libitk30.so
-lib/libitk30.a
-lib/itk3.0/itkConfig.sh
-lib/itk3.0/Archetype.itk
-lib/itk3.0/Toplevel.itk
-lib/itk3.0/Widget.itk
-lib/itk3.0/itk.tcl
-lib/itk3.0/tclIndex
-lib/itk3.0/tkAppInit.c
-lib/itk3.0/pkgIndex.tcl
-@dirrm include/itk3.0/generic
-@dirrm include/itk3.0
-@dirrm lib/itk3.0
+include/itk%%MAJOR%%.%%MINOR%%/itk.h
+include/itk%%MAJOR%%.%%MINOR%%/itkDecls.h
+lib/libitk%%MAJOR%%%%MINOR%%.so.1
+lib/libitk%%MAJOR%%%%MINOR%%.so
+lib/libitk%%MAJOR%%%%MINOR%%.a
+lib/itk%%MAJOR%%.%%MINOR%%/Archetype.itk
+lib/itk%%MAJOR%%.%%MINOR%%/Toplevel.itk
+lib/itk%%MAJOR%%.%%MINOR%%/Widget.itk
+lib/itk%%MAJOR%%.%%MINOR%%/itk.tcl
+lib/itk%%MAJOR%%.%%MINOR%%/tclIndex
+lib/itk%%MAJOR%%.%%MINOR%%/pkgIndex.tcl
+@dirrm include/itk%%MAJOR%%.%%MINOR%%
+@dirrm lib/itk%%MAJOR%%.%%MINOR%%