Update the itcl/itk from 3.2 to 3.3 (released in April 2005). The

installed libraries are now named libitcl.so.3 & libitk.so.3 instead
of having the version be part of the libname (libitcl33.so.1). The
itclConfig.sh and itkConfig.sh are now also installed, which is required
by some software (such as the insight -- a gdb frontend).

Fix-up the (unchanged) iwidgets port to reflect the above and improve it
to not require its own copy of the itcl tree at install time.

Approved by:	maintainer

Fix-up the tkdesk port to reflect the itcl/itk changes, which required
updating it to the 2.0p2 (from 2.0). (This lovely piece of software
badly needs a caring maintainer, BTW.) While here, teach tkdesk to use
installed blt instead of building its own.

The only iwidget/itk/itcl consumer that remains broken is net/smm++ (a
MUD client). This should change as soon as the maintainer get back to
me.

21 files changed, 160 insertions, 597 deletions

diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 14701e24b128..79d6f7882229 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -6,60 +6,48 @@
 #
 
 PORTNAME=	itcl
-PORTVERSION=	${MAJOR}.${MINOR}.1
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	lang tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl${PORTVERSION}
-EXTRACT_SUFX=	_src.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	[incr Tcl] (A.K.A. "itcl")
 
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/itcl
 INSTALLS_SHLIB=	yes
 PKGINSTALL=	${PORTSDIR}/lang/tcl84/pkg-install.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl84/pkg-deinstall.tclsh
 MAKE_ENV+=	${PLIST_SUB} \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - itcl${PORTVERSION}/itcl
-
 .if defined(MAKE_JOBS)
 MAKE_ARGS+=	-j${MAKE_JOBS}
 .endif
 
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	1
-MAJOR=	3
-MINOR=	2
+SHLIB_MAJOR=	${MAJOR}
+SHLIB_MINOR=	${MINOR}
+MAJOR=	${PORTVERSION:R}
+MINOR=	${PORTVERSION:E}
 PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
-ITCL_LIB=	libitcl${MAJOR}${MINOR}.so
+ITCL_LIB=	libitcl.so
 MAKEFILE=	${FILESDIR}/Makefile.lib
 
 MANCOMPRESSED=	no
 MANN=		body.n class.n code.n configbody.n delete.n ensemble.n find.n
-MANN+=		itcl.n itcl_class.n itcl_info.n itclvars.n local.n scope.n
+MANN+=		is.n itcl.n itclvars.n local.n scope.n
+MAN3=		RegisterC.3 Stack.3
 
 ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}
 
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's,package require Itcl,load [glob \
-			${WRKSRC}/${ITCL_LIB}.${SHLIB_MAJOR}*],;' \
-		${WRKSRC}/tests/*.test
-
 post-build test:
 	cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
-		${PREFIX}/bin/tclsh8.4 tests/all.tcl
+		${PREFIX}/bin/tclsh8.4 tests/all.tcl -load "load ./${ITCL_LIB}"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/
-.if exists(${PKGINSTALL})
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/doc/*.3 ${PREFIX}/man/man3/
 
 .include <bsd.port.mk>
diff --git a/lang/itcl/distinfo b/lang/itcl/distinfo
index c1d45cf798af..20829a0a16ec 100644
--- a/lang/itcl/distinfo
+++ b/lang/itcl/distinfo
@@ -1,3 +1,3 @@
-MD5 (itcl3.2.1_src.tgz) = 44dcc2129232329cacd6c8abebf38403
-SHA256 (itcl3.2.1_src.tgz) = 9a225564fc94beef4cc0e627a368d9d2b4425c58b93d5a787c9836d6cceed2ad
-SIZE (itcl3.2.1_src.tgz) = 427026
+MD5 (itcl3.3.tar.gz) = d958b3d1c52fa5336b5aacc1251b5ce3
+SHA256 (itcl3.3.tar.gz) = 7829b5ea39d0ed0eea43a071cd39e7477343d59e1d2ea9c810fa53e257fcb55c
+SIZE (itcl3.3.tar.gz) = 306364
diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib
index 83e2f77022ba..5b5b52ebb8b2 100644
--- a/lang/itcl/files/Makefile.lib
+++ b/lang/itcl/files/Makefile.lib
@@ -1,5 +1,5 @@
 NOPROFILE=	yes
-LIB=		itcl${MAJOR}${MINOR}
+LIB=		itcl
 ITCL_LIBRARY=	${PREFIX}/lib/itcl${MAJOR}.${MINOR}
 CFLAGS+=	-I. -I./../generic \
 		-I${PREFIX}/include/tcl8.4/generic \
@@ -17,13 +17,15 @@ LDADD+=		-L${PREFIX}/lib -ltcl84
 
 SRCS=	itcl_bicmds.c itcl_class.c itcl_cmds.c itcl_ensemble.c \
 	itcl_linkage.c itcl_methods.c itcl_migrate.c itcl_objects.c \
-	itcl_obsolete.c itcl_parse.c itcl_util.c \
-	itclStubInit.c itclStubLib.c
+	itcl_parse.c itcl_util.c itclStubInit.c itclStubLib.c
 
-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
+pkgIndex.tcl: pkgIndex.tcl.in
+	sed -e 's#"@PKG_LIB_FILE@"#.. ${SHLIB_NAME}#' -e "s#@PACKAGE_VERSION@#${MAJOR}.${MINOR}#" \
+		< $> > $@
+
+itclConfig.sh: itclConfig.sh.in
+	sed -e 's#@itcl_LIB_FILE@#${SHLIB_NAME}#g' \
+		-e 's#@itcl_LIB_SPEC@#-L${LIBDIR} -litcl#' < $> > $@
 
 SCRIPTDIR=	lib/itcl${MAJOR}.${MINOR}
 SCRIPTPATH=	${PREFIX}/${SCRIPTDIR}
@@ -33,8 +35,8 @@ INCDIR=		${PREFIX}/include/itcl${MAJOR}.${MINOR}
 ${SCRIPTPATH} ${INCDIR}:
 	mkdir -p ${.TARGET}
 
-beforeinstall: pkgIndex.tcl ${SCRIPTPATH} ${INCDIR}
-	${BSD_INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/library/itcl.tcl \
+beforeinstall: pkgIndex.tcl itclConfig.sh ${SCRIPTPATH} ${INCDIR}
+	${BSD_INSTALL_DATA} pkgIndex.tcl itclConfig.sh ${.CURDIR}/library/itcl.tcl \
 		${SCRIPTPATH}
 	${BSD_INSTALL_DATA} ${.CURDIR}/generic/*.h ${INCDIR}
 
diff --git a/lang/itcl/files/patch+generic+itcl_class.c b/lang/itcl/files/patch+generic+itcl_class.c
deleted file mode 100644
index 4aca04af2cf5..000000000000
--- a/lang/itcl/files/patch+generic+itcl_class.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- generic/itcl_class.c.orig	Mon May 21 20:35:38 2001
-+++ generic/itcl_class.c	Sun Dec 25 15:28:16 2005
-@@ -732,7 +732,7 @@
-         /* flags */ 0);
- 
-     if ( !classNs && contextNs->parentPtr != NULL &&
--         (*path != ':' || *(path+1) != ':') ) {
-+         (strncmp(path, "::", 2) != 0) ) {
- 
-         if (strcmp(contextNs->name, path) == 0) {
-             classNs = contextNs;
diff --git a/lang/itcl/files/patch-generic+itcl.h b/lang/itcl/files/patch-generic+itcl.h
deleted file mode 100644
index 27c74b36f278..000000000000
--- a/lang/itcl/files/patch-generic+itcl.h
+++ /dev/null
@@ -1,107 +0,0 @@
-===================================================================
-RCS file: /cvsroot/incrtcl/incrTcl/itcl/generic/itcl.h,v
-retrieving revision 1.15
-retrieving revision 1.19
-diff -u -r1.15 -r1.19
---- generic/itcl.h	2001/05/25 00:12:29	1.15
-+++ generic/itcl.h	2002/01/16 22:29:41	1.19
-@@ -40,9 +40,9 @@
-  *           http://www.tcltk.com/itcl
-  *
-  *       modified for Stubs 5/20/1999 by 
-- *           David Gravereaux <davygrvy@bigfoot.com>
-+ *           David Gravereaux <davygrvy@pobox.com>
-  *
-- *     RCS:  $Id: itcl.h,v 1.15 2001/05/25 00:12:29 davygrvy Exp $
-+ *     RCS:  $Id: itcl.h,v 1.19 2002/01/16 22:29:41 andreas_kupries Exp $
-  * ========================================================================
-  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
-  * ------------------------------------------------------------------------
-@@ -54,17 +54,6 @@
- 
- #include "tcl.h"
- 
--#undef TCL_STORAGE_CLASS
--#ifdef BUILD_itcl
--# define TCL_STORAGE_CLASS DLLEXPORT
--#else
--# ifdef USE_ITCL_STUBS
--#  define TCL_STORAGE_CLASS
--# else
--#  define TCL_STORAGE_CLASS DLLIMPORT
--# endif
--#endif
--
- #define ITCL_VERSION "3.2"
- #define ITCL_PATCH_LEVEL "3.2.1"
- #define ITCL_MAJOR_VERSION 3
-@@ -80,6 +69,58 @@
- 
- #ifndef RC_INVOKED
- 
-+#undef TCL_STORAGE_CLASS
-+#ifdef BUILD_itcl
-+#   define TCL_STORAGE_CLASS DLLEXPORT
-+#else
-+#   ifdef USE_ITCL_STUBS
-+#	define TCL_STORAGE_CLASS
-+#   else
-+#	define TCL_STORAGE_CLASS DLLIMPORT
-+#   endif
-+#endif
-+
-+/*
-+ * Fix the Borland bug that's in the EXTERN macro from tcl.h.
-+ */
-+#ifndef TCL_EXTERN
-+#   undef DLLIMPORT
-+#   undef DLLEXPORT
-+#   if defined(STATIC_BUILD)
-+#	define DLLIMPORT
-+#	define DLLEXPORT
-+#   elif (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || (defined(__GNUC__) && defined(__declspec)))) \
-+	    || (defined(MAC_TCL) && FUNCTION_DECLSPEC)
-+#	define DLLIMPORT __declspec(dllimport)
-+#	define DLLEXPORT __declspec(dllexport)
-+#   elif defined(__BORLANDC__)
-+#	define OLDBORLAND 1
-+#	define DLLIMPORT __import
-+#	define DLLEXPORT __export
-+#   else
-+#	define DLLIMPORT
-+#	define DLLEXPORT
-+#   endif
-+
-+    /*
-+     * Make sure name mangling won't happen when the c++ language extensions
-+     * are used.
-+     */
-+#   ifdef __cplusplus
-+#	define TCL_CPP "C"
-+#   else
-+#	define TCL_CPP
-+#   endif
-+    /*
-+     * Borland requires the attributes be placed after the return type.
-+     */
-+#   ifdef OLDBORLAND
-+#	define TCL_EXTERN(rtnType) extern TCL_CPP rtnType TCL_STORAGE_CLASS
-+#   else
-+#	define TCL_EXTERN(rtnType) extern TCL_CPP TCL_STORAGE_CLASS rtnType
-+#   endif
-+#endif
-+
- /*
-  * Protection levels:
-  *
-@@ -152,9 +193,7 @@
- 
- #ifdef USE_ITCL_STUBS
- 
--#ifdef __cplusplus
--extern "C"
--#endif
-+extern TCL_CPP
- CONST char *	Itcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
- 			    char *version, int exact));
- #else
diff --git a/lang/itcl/files/patch-generic+itclInt.h b/lang/itcl/files/patch-generic+itclInt.h
deleted file mode 100644
index 2d468fc6990f..000000000000
--- a/lang/itcl/files/patch-generic+itclInt.h
+++ /dev/null
@@ -1,101 +0,0 @@
-===================================================================
-RCS file: /cvsroot/incrtcl/incrTcl/itcl/generic/itclInt.h,v
-retrieving revision 1.7
-retrieving revision 1.11
-diff -u -r1.7 -r1.11
---- generic/itclInt.h	2001/04/07 07:20:53	1.7
-+++ generic/itclInt.h	2003/12/23 06:58:27	1.11
-@@ -39,7 +39,7 @@
-  *           mmclennan@lucent.com
-  *           http://www.tcltk.com/itcl
-  *
-- *     RCS:  $Id: itclInt.h,v 1.7 2001/04/07 07:20:53 davygrvy Exp $
-+ *     RCS:  $Id: itclInt.h,v 1.11 2003/12/23 06:58:27 davygrvy Exp $
-  * ========================================================================
-  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
-  * ------------------------------------------------------------------------
-@@ -49,14 +49,64 @@
- #ifndef ITCLINT_H
- #define ITCLINT_H
- 
--#include "itcl.h"
- #include "tclInt.h"
-+#include "itcl.h"
- 
- #ifdef BUILD_itcl
- # undef TCL_STORAGE_CLASS
- # define TCL_STORAGE_CLASS DLLEXPORT
- #endif
- 
-+/*
-+ * Fix Tcl bug #803489 the right way.  We need to always use the old Stub
-+ * slot positions, not the new broken ones.  I do like that these functions
-+ * have moved to the public space, but the slot change is the killer and is
-+ * the painful side affect.
-+ */
-+
-+#if defined(USE_TCL_STUBS) && \
-+	(TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5)
-+#   undef Tcl_CreateNamespace
-+#   define Tcl_CreateNamespace \
-+	(tclIntStubsPtr->tcl_CreateNamespace)
-+#   undef Tcl_DeleteNamespace
-+#   define Tcl_DeleteNamespace \
-+	(tclIntStubsPtr->tcl_DeleteNamespace)
-+#   undef Tcl_AppendExportList
-+#   define Tcl_AppendExportList \
-+	(tclIntStubsPtr->tcl_AppendExportList)
-+#   undef Tcl_Export
-+#   define Tcl_Export \
-+	(tclIntStubsPtr->tcl_Export)
-+#   undef Tcl_Import
-+#   define Tcl_Import \
-+	(tclIntStubsPtr->tcl_Import)
-+#   undef Tcl_ForgetImport
-+#   define Tcl_ForgetImport \
-+	(tclIntStubsPtr->tcl_ForgetImport)
-+#   undef Tcl_GetCurrentNamespace
-+#   define Tcl_GetCurrentNamespace \
-+	(tclIntStubsPtr->tcl_GetCurrentNamespace)
-+#   undef Tcl_GetGlobalNamespace
-+#   define Tcl_GetGlobalNamespace \
-+	(tclIntStubsPtr->tcl_GetGlobalNamespace)
-+#   undef Tcl_FindNamespace
-+#   define Tcl_FindNamespace \
-+	(tclIntStubsPtr->tcl_FindNamespace)
-+#   undef Tcl_FindCommand
-+#   define Tcl_FindCommand \
-+	(tclIntStubsPtr->tcl_FindCommand)
-+#   undef Tcl_GetCommandFromObj
-+#   define Tcl_GetCommandFromObj \
-+	(tclIntStubsPtr->tcl_GetCommandFromObj)
-+#   undef Tcl_GetCommandFullName
-+#   define Tcl_GetCommandFullName \
-+	(tclIntStubsPtr->tcl_GetCommandFullName)
-+#endif
-+
-+#define TCL_DOES_STUBS \
-+    (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
-+    (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))
- 
- /*
-  *  Common info for managing all known objects.
-@@ -255,15 +305,11 @@
-  */
- 
- #undef  assert
--#ifdef  NDEBUG
-+#ifndef  DEBUG
- #define assert(EX) ((void)0)
- #else
--#if defined(__STDC__)
--#define assert(EX) (void)((EX) || (Itcl_Assert(#EX, __FILE__, __LINE__), 0))
--#else
--#define assert(EX) (void)((EX) || (Itcl_Assert("EX", __FILE__, __LINE__), 0))
--#endif  /* __STDC__ */
--#endif  /* NDEBUG */
-+#define assert(EX) (void)((EX) || (Itcl_Assert(STRINGIFY(EX), __FILE__, __LINE__), 0))
-+#endif  /* DEBUG */
- 
- #undef TCL_STORAGE_CLASS
- #define TCL_STORAGE_CLASS DLLIMPORT
diff --git a/lang/itcl/files/patch-generic+itcl_cmds.c b/lang/itcl/files/patch-generic+itcl_cmds.c
deleted file mode 100644
index d6c48a9b32dd..000000000000
--- a/lang/itcl/files/patch-generic+itcl_cmds.c
+++ /dev/null
@@ -1,222 +0,0 @@
-===================================================================
-RCS file: /cvsroot/incrtcl/incrTcl/itcl/generic/itcl_cmds.c,v
-retrieving revision 1.13
-retrieving revision 1.15
-diff -u -r1.13 -r1.15
---- generic/itcl_cmds.c	2001/05/22 01:50:21	1.13
-+++ generic/itcl_cmds.c	2002/01/10 11:43:37	1.15
-@@ -21,7 +21,7 @@
-  *           mmclennan@lucent.com
-  *           http://www.tcltk.com/itcl
-  *
-- *     RCS:  $Id: itcl_cmds.c,v 1.13 2001/05/22 01:50:21 davygrvy Exp $
-+ *     RCS:  $Id: itcl_cmds.c,v 1.15 2002/01/10 11:43:37 davygrvy Exp $
-  * ========================================================================
-  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
-  * ------------------------------------------------------------------------
-@@ -469,7 +469,7 @@
-     int forceFullNames = 0;
- 
-     char *pattern;
--    CONST char *name;
-+    CONST char *cmdName;
-     int newEntry, handledActiveNs;
-     Tcl_HashTable unique;
-     Tcl_HashEntry *entry;
-@@ -477,7 +477,7 @@
-     Itcl_Stack search;
-     Tcl_Command cmd, originalCmd;
-     Namespace *nsPtr;
--    Tcl_Obj *listPtr, *objPtr;
-+    Tcl_Obj *objPtr;
- 
-     if (objc > 2) {
-         Tcl_WrongNumArgs(interp, 1, objv, "?pattern?");
-@@ -485,7 +485,7 @@
-     }
- 
-     if (objc == 2) {
--        pattern = Tcl_GetStringFromObj(objv[1], (int*)NULL);
-+        pattern = Tcl_GetString(objv[1]);
-         forceFullNames = (strstr(pattern, "::") != NULL);
-     } else {
-         pattern = NULL;
-@@ -497,7 +497,6 @@
-      *  in this interpreter.  If we find any commands that
-      *  represent classes, report them.
-      */
--    listPtr = Tcl_NewListObj(0, (Tcl_Obj* CONST*)NULL);
- 
-     Itcl_InitStack(&search);
-     Itcl_PushStack((ClientData)globalNs, &search);
-@@ -532,10 +531,10 @@
- 
-                     objPtr = Tcl_NewStringObj((char*)NULL, 0);
-                     Tcl_GetCommandFullName(interp, cmd, objPtr);
--                    name = Tcl_GetStringFromObj(objPtr, (int*)NULL);
-+                    cmdName = Tcl_GetString(objPtr);
-                 } else {
--                    name = Tcl_GetCommandName(interp, cmd);
--                    objPtr = Tcl_NewStringObj(name, -1);
-+                    cmdName = Tcl_GetCommandName(interp, cmd);
-+                    objPtr = Tcl_NewStringObj(cmdName, -1);
-                 }
- 
-                 if (originalCmd) {
-@@ -543,9 +542,10 @@
-                 }
-                 Tcl_CreateHashEntry(&unique, (char*)cmd, &newEntry);
- 
--                if (newEntry && (!pattern || Tcl_StringMatch(name, pattern))) {
-+                if (newEntry &&
-+			(!pattern || Tcl_StringMatch(cmdName, pattern))) {
-                     Tcl_ListObjAppendElement((Tcl_Interp*)NULL,
--                        listPtr, objPtr);
-+                        Tcl_GetObjResult(interp), objPtr);
-                 }
-             }
-             entry = Tcl_NextHashEntry(&place);
-@@ -565,7 +565,6 @@
-     Tcl_DeleteHashTable(&unique);
-     Itcl_DeleteStack(&search);
- 
--    Tcl_SetObjResult(interp, listPtr);
-     return TCL_OK;
- }
- 
-@@ -598,8 +597,8 @@
-     ItclClass *classDefn = NULL;
-     ItclClass *isaDefn = NULL;
- 
--    char *name, *token;
--    CONST char *cmdName;
-+    char *name = NULL, *token = NULL;
-+    CONST char *cmdName = NULL;
-     int pos, newEntry, match, handledActiveNs;
-     ItclObject *contextObj;
-     Tcl_HashTable unique;
-@@ -609,7 +608,7 @@
-     Tcl_Command cmd, originalCmd;
-     Namespace *nsPtr;
-     Command *cmdPtr;
--    Tcl_Obj *listPtr, *objPtr;
-+    Tcl_Obj *objPtr;
- 
-     /*
-      *  Parse arguments:
-@@ -617,7 +616,7 @@
-      */
-     pos = 0;
-     while (++pos < objc) {
--        token = Tcl_GetStringFromObj(objv[pos], (int*)NULL);
-+        token = Tcl_GetString(objv[pos]);
-         if (*token != '-') {
-             if (!pattern) {
-                 pattern = token;
-@@ -627,7 +626,7 @@
-             }
-         }
-         else if ((pos+1 < objc) && (strcmp(token,"-class") == 0)) {
--            name = Tcl_GetStringFromObj(objv[pos+1], (int*)NULL);
-+            name = Tcl_GetString(objv[pos+1]);
-             classDefn = Itcl_FindClass(interp, name, /* autoload */ 1);
-             if (classDefn == NULL) {
-                 return TCL_ERROR;
-@@ -635,7 +634,7 @@
-             pos++;
-         }
-         else if ((pos+1 < objc) && (strcmp(token,"-isa") == 0)) {
--            name = Tcl_GetStringFromObj(objv[pos+1], (int*)NULL);
-+            name = Tcl_GetString(objv[pos+1]);
-             isaDefn = Itcl_FindClass(interp, name, /* autoload */ 1);
-             if (isaDefn == NULL) {
-                 return TCL_ERROR;
-@@ -669,7 +668,6 @@
-      *  in this interpreter.  If we find any commands that
-      *  represent objects, report them.
-      */
--    listPtr = Tcl_NewListObj(0, (Tcl_Obj* CONST*)NULL);
- 
-     Itcl_InitStack(&search);
-     Itcl_PushStack((ClientData)globalNs, &search);
-@@ -709,7 +707,7 @@
- 
-                     objPtr = Tcl_NewStringObj((char*)NULL, 0);
-                     Tcl_GetCommandFullName(interp, cmd, objPtr);
--                    name = Tcl_GetStringFromObj(objPtr, (int*)NULL);
-+		    cmdName = Tcl_GetString(objPtr);
-                 } else {
-                     cmdName = Tcl_GetCommandName(interp, cmd);
-                     objPtr = Tcl_NewStringObj(cmdName, -1);
-@@ -718,7 +716,8 @@
-                 Tcl_CreateHashEntry(&unique, (char*)cmd, &newEntry);
- 
-                 match = 0;
--                if (newEntry && (!pattern || Tcl_StringMatch(name, pattern))) {
-+		if (newEntry &&
-+			(!pattern || Tcl_StringMatch(cmdName, pattern))) {
-                     if (!classDefn || (contextObj->classDefn == classDefn)) {
-                         if (!isaDefn) {
-                             match = 1;
-@@ -736,10 +735,9 @@
- 
-                 if (match) {
-                     Tcl_ListObjAppendElement((Tcl_Interp*)NULL,
--                        listPtr, objPtr);
-+                        Tcl_GetObjResult(interp), objPtr);
-                 } else {
--                    Tcl_IncrRefCount(objPtr);  /* throw away the name */
--                    Tcl_DecrRefCount(objPtr);
-+                    Tcl_DecrRefCount(objPtr);  /* throw away the name */
-                 }
-             }
-             entry = Tcl_NextHashEntry(&place);
-@@ -759,7 +757,6 @@
-     Tcl_DeleteHashTable(&unique);
-     Itcl_DeleteStack(&search);
- 
--    Tcl_SetObjResult(interp, listPtr);
-     return TCL_OK;
- }
- 
-@@ -821,9 +818,8 @@
-     }
-     else if (result != TCL_OK) {
-         char mesg[256], *name;
--        name = Tcl_GetStringFromObj(objv[0], (int*)NULL);
--        sprintf(mesg, "\n    (%.100s body line %d)",
--            name, interp->errorLine);
-+        name = Tcl_GetString(objv[0]);
-+        sprintf(mesg, "\n    (%.100s body line %d)", name, interp->errorLine);
-         Tcl_AddErrorInfo(interp, mesg);
-     }
- 
-@@ -865,7 +861,7 @@
-      *  then delete them.
-      */
-     for (i=1; i < objc; i++) {
--        name = Tcl_GetStringFromObj(objv[i], (int*)NULL);
-+        name = Tcl_GetString(objv[i]);
-         cdefn = Itcl_FindClass(interp, name, /* autoload */ 1);
-         if (cdefn == NULL) {
-             return TCL_ERROR;
-@@ -873,7 +869,7 @@
-     }
- 
-     for (i=1; i < objc; i++) {
--        name = Tcl_GetStringFromObj(objv[i], (int*)NULL);
-+        name = Tcl_GetString(objv[i]);
-         cdefn = Itcl_FindClass(interp, name, /* autoload */ 0);
- 
-         if (cdefn) {
---- generic/itcl_cmds.c.orig	Sun Dec 25 15:16:04 2005
-+++ generic/itcl_cmds.c	Sun Dec 25 15:28:16 2005
-@@ -996,7 +996,7 @@
-      *  then return it as is.
-      */
-     token = Tcl_GetStringFromObj(objv[1], (int*)NULL);
--    if (*token == ':' && *(token+1) == ':') {
-+    if (strncmp(token, "::", 2) == 0) {
-         Tcl_SetObjResult(interp, objv[1]);
-         return TCL_OK;
-     }
diff --git a/lang/itcl/files/patch-tests+ensemble.test b/lang/itcl/files/patch-tests+ensemble.test
deleted file mode 100644
index 7470860d29bc..000000000000
--- a/lang/itcl/files/patch-tests+ensemble.test
+++ /dev/null
@@ -1,32 +0,0 @@
-===================================================================
-RCS file: /cvsroot/incrtcl/incrTcl/itcl/tests/ensemble.test,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- tests/ensemble.test	2000/06/01 20:34:35	1.3
-+++ tests/ensemble.test	2001/11/05 19:42:11	1.4
-@@ -6,7 +6,7 @@
- #            mmclennan@lucent.com
- #            http://www.tcltk.com/itcl
- #
--#      RCS:  $Id: ensemble.test,v 1.3 2000/06/01 20:34:35 wart Exp $
-+#      RCS:  $Id: ensemble.test,v 1.4 2001/11/05 19:42:11 hobbs Exp $
- # ----------------------------------------------------------------------
- #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
- # ======================================================================
-@@ -45,8 +45,13 @@
- } {{one: 1} {two: 2 3} {three: 3 4 5}}
- 
- test ensemble-1.5 {invoking parts with improper arguments} {
--    list [catch "test_numbers three x" msg] $msg
--} {1 {no value given for parameter "y" to "test_numbers three"}}
-+    set res [catch "test_numbers three x" msg]
-+    if {[package vsatisfies [package provide Tcl] 8.4]} {
-+	lappend res [string match "wrong # args*" $msg]
-+    } else {
-+	lappend res [string match "no value given*" $msg]
-+    }
-+} {1 1}
- 
- test ensemble-1.6 {errors trigger a usage summary} {
-     list [catch "test_numbers foo x y" msg] $msg
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index a72fd5a272bf..5f4151f9f6a8 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -2,10 +2,11 @@ include/itcl%%MAJOR%%.%%MINOR%%/itcl.h
 include/itcl%%MAJOR%%.%%MINOR%%/itclInt.h
 include/itcl%%MAJOR%%.%%MINOR%%/itclDecls.h
 include/itcl%%MAJOR%%.%%MINOR%%/itclIntDecls.h
-lib/libitcl%%MAJOR%%%%MINOR%%.so.1
-lib/libitcl%%MAJOR%%%%MINOR%%.so
-lib/libitcl%%MAJOR%%%%MINOR%%.a
+lib/libitcl.so.%%MAJOR%%.%%MINOR%%
+lib/libitcl.so
+lib/libitcl.a
 lib/itcl%%MAJOR%%.%%MINOR%%/itcl.tcl
+lib/itcl%%MAJOR%%.%%MINOR%%/itclConfig.sh
 lib/itcl%%MAJOR%%.%%MINOR%%/pkgIndex.tcl
 @dirrm include/itcl%%MAJOR%%.%%MINOR%%
 @dirrm lib/itcl%%MAJOR%%.%%MINOR%%
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index b022a582e5f4..900729cd23cf 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -6,25 +6,33 @@
 #
 
 PORTNAME=	tkdesk
-PORTVERSION=	2.0
-CATEGORIES=	x11-fm tk83
+PORTVERSION=	2.0.2
+CATEGORIES=	x11-fm tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+PATCHFILES=	${DISTNAME}p1.patch ${DISTNAME}p2.patch
+PATCH_SITES=	http://tkdesk.sourceforge.net/patches/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical, highly configurable and powerful file manager
 
-LIB_DEPENDS=	itcl32:${PORTSDIR}/lang/itcl \
-		tk83.1:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt \
+		itcl:${PORTSDIR}/lang/itcl \
+		tk84:${PORTSDIR}/x11-toolkits/tk84
 
+PATCH_DIST_STRIP=-p1
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAG="-I${LOCALBASE}/include/itcl3.2" \
-		LDFLAGS="-L${LOCALBASE}/lib -litcl32"
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.3 \
-		--with-tk=${LOCALBASE}/lib/tk8.3 \
-		--with-itcl=${LOCALBASE}/lib/itcl3.2
+MAKE_ENV+=	LIB_RUNTIME_DIR=${LOCABASE}/lib
+CONFIGURE_ENV=	CPPFLAG="-I${LOCALBASE}/include/itcl3.3" \
+		LDFLAGS="-L${LOCALBASE}/lib -litcl"
+CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+		--with-tk=${LOCALBASE}/lib/tk8.4 \
+		  --with-blt=${LOCALBASE} \
+		--with-itcl=${LOCALBASE}/lib/itcl3.3
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - --exclude blt
 
 MAN1=		tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
 
@@ -33,7 +41,7 @@ post-patch:
 		's|<malloc\.h>|<stdlib.h>|g'
 
 pre-install:
-	@${FIND} ${WRKSRC}/tcldesk/configs -type f -name "*.orig" -delete
+	@${FIND} ${WRKSRC} -type f -name "*.orig" -delete
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/tkdesksh
diff --git a/x11-fm/tkdesk/distinfo b/x11-fm/tkdesk/distinfo
index a52ebcdf3b90..c8a1b751bcb4 100644
--- a/x11-fm/tkdesk/distinfo
+++ b/x11-fm/tkdesk/distinfo
@@ -1,3 +1,9 @@
 MD5 (tkdesk-2.0.tar.gz) = 8714575718465356167c50ae52d68131
 SHA256 (tkdesk-2.0.tar.gz) = a682cb4cd54a5d30844f55194d97899137a00843d6bef1b9a599d39ac3c8c324
 SIZE (tkdesk-2.0.tar.gz) = 907432
+MD5 (tkdesk-2.0p1.patch) = 932bf12a958037ef534660abb217dee1
+SHA256 (tkdesk-2.0p1.patch) = b1898f8c926eb36fb5248818b8db8f17e9410bbc16e8a0fa2a6dabadcddadc30
+SIZE (tkdesk-2.0p1.patch) = 3147
+MD5 (tkdesk-2.0p2.patch) = ad9865dfd51d13a9a61279a9c78ddc10
+SHA256 (tkdesk-2.0p2.patch) = e79428407def0229e47d8b20c941cceeb1cfbe5f8989d680a884836eb01f87ab
+SIZE (tkdesk-2.0p2.patch) = 138282
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index 67f47e3100b1..225e5c641da6 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -1,7 +1,23 @@
---- configure.orig	Wed Apr 14 12:39:47 2004
-+++ configure	Sat Apr 17 21:05:56 2004
-@@ -1592,8 +1592,9 @@
- # Determine include directories
+--- configure	Tue Apr 13 23:39:47 2004
++++ configure	Tue May 16 16:57:39 2006
+@@ -1568,12 +1568,12 @@
+ echo "${ECHO_T}./blt" >&6
+ else
+-   BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT"
+-   BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a
++   BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT24"
++   BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT24.a
+    NEED_BLT_LIB=
+    if test   ! -f $BLT_LIB_PATH/libBLT.a \
+           -a ! -f $BLT_LIB_PATH/libBLT.so
+    then
+-      if test   ! -f $BLT_LIB_PATH/lib/libBLT.a \
+-	     -a ! -f $BLT_LIB_PATH/lib/libBLT.so
++      if test   ! -f $BLT_LIB_PATH/lib/libBLT24.a \
++	     -a ! -f $BLT_LIB_PATH/lib/libBLT24.so
+       then
+ 	 echo
+@@ -1593,6 +1593,7 @@
  #
  
 -TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
@@ -11,4 +27,10 @@
 +
  
  #
- # Perform substitutions
+@@ -4509,5 +4510,5 @@
+ echo "${ECHO_T}$blt_cv_struct_wait_works" >&6
+ 
+-                                                  ac_config_files="$ac_config_files Makefile libdesk/Makefile blt/Makefile netscape-remote/Makefile tkdeskclient/Makefile"
++                                                  ac_config_files="$ac_config_files Makefile libdesk/Makefile netscape-remote/Makefile tkdeskclient/Makefile"
+ 
+ 
diff --git a/x11-fm/tkdesk/files/patch-ab b/x11-fm/tkdesk/files/patch-ab
index 6809cff0d744..6aeac8f499ad 100644
--- a/x11-fm/tkdesk/files/patch-ab
+++ b/x11-fm/tkdesk/files/patch-ab
@@ -14,7 +14,7 @@
  	find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
  	@echo "=== Creating index..."
 -	cd $(SCRIPT_INSTALL_DIR); $(BIN_INSTALL_DIR)/tkdesksh mkindex
-+	cd $(SCRIPT_INSTALL_DIR); tclsh8.3 mkindex
++	cd $(SCRIPT_INSTALL_DIR); tclsh8.4 mkindex
  	@echo "=== Installing the manual pages..."
  	@for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \
  	    echo "installing $$f" ;\
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 1e89e61cc4ed..180131a59c54 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	itk
-PORTVERSION=	${MAJOR}.${MINOR}.1
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
-DISTNAME=	itcl${PORTVERSION}
-EXTRACT_SUFX=	_src.tgz
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	[incr Tk] (A.K.A. "itk")
 
 LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84 \
-		itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
+		itcl.${MAJOR}:${PORTSDIR}/lang/itcl
 
-WRKSRC=		${WRKDIR}/itcl${PORTVERSION}/itk
 INSTALLS_SHLIB=	yes
 MAKE_ENV+=	${PLIST_SUB} \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - itcl${PORTVERSION}/itk
 MAKEFILE=	${FILESDIR}/Makefile.lib
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	1
-MAJOR=		3
-MINOR=		2
+SHLIB_MAJOR=	${MAJOR}
+SHLIB_MINOR=	${MINOR}
+MAJOR=		${PORTVERSION:R}
+MINOR=		${PORTVERSION:E}
 PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
-ITK_LIB=	libitk${MAJOR}${MINOR}.so
+ITK_LIB=	libitk.so.${MAJOR}
 .if defined(MAKE_JOBS)
 MAKE_ARGS+=	-j${MAKE_JOBS}
 .endif
@@ -41,13 +37,14 @@ MANN=		Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
 
 ITK_LIB_FILE=	${ITK_LIB}.${SHLIB_MAJOR}
 
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's,package require Itk,load \
-			[glob ${WRKSRC}/${ITK_LIB_FILE}*],;' \
-		-e 's,return$$,exit,' ${WRKSRC}/tests/*
-	${REINPLACE_CMD} \
-		-e 's,\@itk_LIB_FILE\@,${ITK_LIB_FILE},' \
-		${WRKSRC}/pkgIndex.tcl.in
+post-build:
+	#
+	# Consider running ``make test'' now, if the X11 environment
+	# is available in this session
+	#
+
+test:
+	cd ${WRKSRC} && ${SETENV} ITK_LIBRARY=${WRKSRC}/library \
+		${PREFIX}/bin/wish8.4 tests/all.tcl -load "load ./${ITK_LIB}; package require Tk"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/itk/distinfo b/x11-toolkits/itk/distinfo
index c1d45cf798af..efee52b95592 100644
--- a/x11-toolkits/itk/distinfo
+++ b/x11-toolkits/itk/distinfo
@@ -1,3 +1,3 @@
-MD5 (itcl3.2.1_src.tgz) = 44dcc2129232329cacd6c8abebf38403
-SHA256 (itcl3.2.1_src.tgz) = 9a225564fc94beef4cc0e627a368d9d2b4425c58b93d5a787c9836d6cceed2ad
-SIZE (itcl3.2.1_src.tgz) = 427026
+MD5 (itk3.3.tar.gz) = a97c17f3cfa5e377f43073c653c501b5
+SHA256 (itk3.3.tar.gz) = b6eee1eab759e2dc216278800624a73239ced697400bc0de4f45a4f8cd1e9ad6
+SIZE (itk3.3.tar.gz) = 211722
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 76b29b587f18..bc527310ac85 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -1,5 +1,5 @@
 NOPROFILE=	yes
-LIB=		itk${MAJOR}${MINOR}
+LIB=		itk
 ITK_LIBRARY=	${PREFIX}/lib/itk${MAJOR}.${MINOR}
 CFLAGS+=	-I. -I./../generic \
 		-I${PREFIX}/include/tcl8.4/generic \
@@ -14,27 +14,31 @@ CFLAGS+=	-I. -I./../generic \
 		-DHAVE_SYS_FILIO_H=1 \
 		-DRETSIGTYPE=void \
 		-DITK_LIBRARY=\"${ITK_LIBRARY}\"
-LDADD+=		-L${PREFIX}/lib -litcl${MAJOR}${MINOR} -L${X11BASE}/lib -lX11 -ltk84
+LDADD+=		-L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk84
 
 .PATH:		${.CURDIR}/generic
 
-SRCS=		itk_cmds.c itk_option.c itk_archetype.c itk_util.c
+SRCS=		itk_cmds.c itk_option.c itk_archetype.c itk_util.c itkStubInit.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
+pkgIndex.tcl: pkgIndex.tcl.in
+	sed -e 's#"@PKG_LIB_FILE@"#.. ${SHLIB_NAME}#' -e "s#@PACKAGE_VERSION@#${MAJOR}.${MINOR}#" \
+		< $> > $@
+
+itkConfig.sh: itkConfig.sh.in
+	sed -e 's#@itk_LIB_FILE@#${SHLIB_NAME}#g' -e 's#@itk_LIB_SPEC@#-L${LIBDIR} -litk#' \
+		-e 's,@ITK_BUILD_LIB_SPEC@,-L${LIBDIR} -litk,' \
+		< $> > $@
 
 ${SCRIPTPATH} ${INCDIR}:
 	mkdir -p ${.TARGET}
 
-beforeinstall: pkgIndex.tcl ${SCRIPTPATH} ${INCDIR}
-	${BSD_INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/library/* ${SCRIPTPATH}
+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/
 
diff --git a/x11-toolkits/itk/files/patch-nointerptest b/x11-toolkits/itk/files/patch-nointerptest
new file mode 100644
index 000000000000..c02bd7c4cd8d
--- /dev/null
+++ b/x11-toolkits/itk/files/patch-nointerptest
@@ -0,0 +1,21 @@
+--- tests/interp.test	Wed Sep 22 05:37:08 2004
++++ tests/interp.test	Tue May 16 16:27:54 2006
+@@ -32,11 +32,11 @@
+ } {::itk {}}
+ 
+-test interp-1.2 {can't load [incr Tk] into a safe interp} {
+-    interp create -safe slave
+-    load "" Itcl slave
+-    set result [list [catch {load "" Itk slave} msg] $msg]
+-    interp delete slave
+-    set result
+-} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
++# test interp-1.2 {can't load [incr Tk] into a safe interp} {
++#    interp create -safe slave
++#    load "" Itcl slave
++#    set result [list [catch {load "" Itk slave} msg] $msg]
++#    interp delete slave
++#    set result
++#} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
+ 
+ test interp-1.3 {errors are okay when slave interp is deleted} {
diff --git a/x11-toolkits/itk/files/patch-nostubs b/x11-toolkits/itk/files/patch-nostubs
deleted file mode 100644
index 69d42b75f408..000000000000
--- a/x11-toolkits/itk/files/patch-nostubs
+++ /dev/null
@@ -1,33 +0,0 @@
---- generic/itk_cmds.c.orig	Fri Jun 22 04:38:54 2001
-+++ generic/itk_cmds.c	Sun Mar 13 21:46:16 2005
-@@ -111,12 +111,14 @@
- {
-     Tcl_Namespace *itkNs, *parserNs;
-     ClientData parserInfo;
-+    #ifdef USE_ITK_STUBS
-     extern ItkStubs itkStubs;
-+    #endif
- 
--    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;
-     };
-     if (Itcl_InitStubs(interp, ITCL_VERSION, 1) == NULL) {
-@@ -209,7 +211,12 @@
-      *  end-of-the-line?
-      */
-     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;
-     }
-     return TCL_OK;
diff --git a/x11-toolkits/itk/pkg-plist b/x11-toolkits/itk/pkg-plist
index dda423ed0258..6ff3be4a556b 100644
--- a/x11-toolkits/itk/pkg-plist
+++ b/x11-toolkits/itk/pkg-plist
@@ -1,12 +1,13 @@
 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/libitk.so.%%MAJOR%%.%%MINOR%%
+lib/libitk.so
+lib/libitk.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%%/itkConfig.sh
 lib/itk%%MAJOR%%.%%MINOR%%/tclIndex
 lib/itk%%MAJOR%%.%%MINOR%%/pkgIndex.tcl
 @dirrm include/itk%%MAJOR%%.%%MINOR%%
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 0f656170f5fa..f5f188a74031 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -11,19 +11,18 @@ CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	iwidgets${PORTVERSION}
-DISTFILES=	itcl3.2.1_src.tgz ${PORTNAME}${PORTVERSION}.tar.gz
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Iwidgets - [incr Widgets]
 
-LIB_DEPENDS=	itk32.1:${PORTSDIR}/x11-toolkits/itk
+LIB_DEPENDS=	itk:${PORTSDIR}/x11-toolkits/itk
 
 NO_BUILD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 		--with-tk=${LOCALBASE}/lib/tk8.4 \
-		--with-itcl=${WRKDIR}/itcl3.2.1
+		--with-itcl=${LOCALBASE}/lib/itcl3.3
 SUB_LIST=	IWIDGETS=${DISTNAME}
 SUB_FILES=	pkg-message
 PLIST_SUB=	IWIDGETS=${DISTNAME}
@@ -44,6 +43,14 @@ MANN=	iwidgets_buttonbox.n iwidgets_calendar.n iwidgets_canvasprintbox.n iwidget
 	iwidgets_spintime.n iwidgets_tabnotebook.n iwidgets_tabset.n iwidgets_timeentry.n iwidgets_timefield.n \
 	iwidgets_toolbar.n iwidgets_watch.n
 
+post-patch:
+	${REINPLACE_CMD} -e 's,^MKINSTALLDIRS =.*,MKINSTALLDIRS=${MKDIR},' \
+		-e 's,^INSTALL =.*,INSTALL=${INSTALL} -c,' \
+		-e 's,^INSTALL_PROGRAM =.*,INSTALL_PROGRAM=${INSTALL_PROGRAM},' \
+		-e 's,^INSTALL_DATA =.*,INSTALL_DATA=${INSTALL_DATA},' \
+		-e 's,^INSTALL_SCRIPT =.*,INSTALL_SCRIPT=${INSTALL_SCRIPT},' \
+		-e 's,@ITCL_VERSION@,3.3,g' ${WRKSRC}/Makefile.in
+
 post-install:
 
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/iwidgets/files/patch-noitcl b/x11-toolkits/iwidgets/files/patch-noitcl
new file mode 100644
index 000000000000..ae5db7228024
--- /dev/null
+++ b/x11-toolkits/iwidgets/files/patch-noitcl
@@ -0,0 +1,12 @@
+--- configure	Thu Nov 29 15:51:34 2001
++++ configure	Tue May 16 17:36:14 2006
+@@ -818,9 +818,4 @@
+ fi
+ 
+-if test -z "$ITCL_LIB_DIR"; then
+-    { echo "configure: error: Can't find Itcl source.  Use --with-itcl to specify the the toplevel incr Tcl directory on your system.  (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.)" 1>&2; exit 1; }
+-fi
+-
+-
+ #--------------------------------------------------------------------
+ #   Needed for running the test suite