Upgrade to itcl 3.0.1

Submitted by:	Duncan Barclay <dmlb@ragnet.demon.co.uk>
PR:		ports/10960

8 files changed, 273 insertions, 619 deletions

diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 39866fb20d4b..7c788db1850a 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -1,61 +1,54 @@
 # New ports collection makefile for:	itcl
-# Version required:	2.1
+# Version required:	3.0.1
 # Date created:		Aug 17 1996
 # Whom:			chuckr
 #
 # $Id: Makefile,v 1.20 1997/07/17 15:12:47 max Exp $
 #
 
-DISTNAME=	itcl2.1
-PKGNAME=	itcl-2.1
+DISTNAME=	itcl3.0.1
+PKGNAME=	itcl-3.0.1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/devel/
+MASTER_SITES=	ftp://ftp.tcltk.com/pub/itcl/
 
-MAINTAINER=	chuckr@freebsd.org
+MAINTAINER=	dmlb@ragnet.demon.co.uk
 
-BROKEN=		"installation does not DTRT"
+LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+
+WRKSRC=		${WRKDIR}/itcl3.0.1/itcl/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --exec_prefix=${PREFIX}
-USE_XLIB=	yes
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.0
+CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}
 
-post-extract:
-	@$(RM) -f $(WRKSRC)/tcl7.5/library/*.c
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	1
+MAKEFILE=	makefile
+ITCL_LIB=	libitcl30.so
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	@$(ECHO) "Compressing man pages, be patient, there are many."
-	@for m in $(WRKSRC)/tcl7.5/doc/*.1 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tcl7.5/man/man1/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/tcl7.5/doc/*.3 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tcl7.5/man/man3/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/tcl7.5/doc/*.n ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tcl7.5/man/mann/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/tk4.1/doc/*.1 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tk4.1/man/man1/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/tk4.1/doc/*.3 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tk4.1/man/man3/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/tk4.1/doc/*.n ;\
-	do gzip -9nf $(PREFIX)/share/itcl/tk4.1/man/mann/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/itcl/doc/*.1 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/itcl/man/man1/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/itcl/doc/*.n ;\
-	do gzip -9nf $(PREFIX)/share/itcl/itcl/man/mann/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/itk/doc/*.1 ;\
-	do gzip -9nf $(PREFIX)/share/itcl/itk/man/man1/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/itk/doc/*.n ;\
-	do gzip -9nf $(PREFIX)/share/itcl/itk/man/mann/`$(BASENAME) $$m`;done
-	@for m in $(WRKSRC)/iwidgets2.1.0/doc/*.n ; \
-	do gzip -9nf $(PREFIX)/share/itcl/iwidgets/man/mann/`$(BASENAME) $$m`;done
+MANCOMPRESSED=	yes
+MAN1=		itclsh.1
+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
+
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}
+.else
+ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
 .endif
-	@echo "*****************************************************"
-	@echo "There are new man directories to install now:"
-	@echo "Add $(PREFIX)share/itcl/tcl7.5"
-	@echo "                         tk4.1"
-	@echo "                         itcl"
-	@echo "                         itk"
-	@echo "                         iwidgets"
-	@echo "To the manpath in /etc/manpath.config"
-	@echo "*****************************************************"
-	${LDCONFIG} -m $(PREFIX)/lib
-
-.include <bsd.port.mk>
+
+post-configure:
+	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
+	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
+
+pre-build:
+	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
+	   SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
+	   TCL_PREFIX=${PREFIX}
+
+post-install:
+	${LN} -sf ${ITCL_LIB_FILE} ${PREFIX}/lib/${ITCL_LIB}
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
+.include <bsd.port.post.mk>
diff --git a/lang/itcl/distinfo b/lang/itcl/distinfo
index ca2c7b146a8a..882cd787f4df 100644
--- a/lang/itcl/distinfo
+++ b/lang/itcl/distinfo
@@ -1 +1 @@
-MD5 (itcl2.1.tar.gz) = f1b80f49e75137ab8a84139d45592774
+MD5 (itcl3.0.1.tar.gz) = 0cf1802a7ea69670503dc69c7951a015
diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib
new file mode 100644
index 000000000000..31ec14d6f3b6
--- /dev/null
+++ b/lang/itcl/files/Makefile.lib
@@ -0,0 +1,32 @@
+NOPROFILE=	yes
+LIB=		itcl30
+ITCL_LIBRARY=	${PREFIX}/lib/itcl3.0
+CFLAGS+=	-I. -I./../generic \
+		-I${TCL_PREFIX}/include/tcl8.0/generic \
+		-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\
+		-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
+		-DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1\
+		-DTCL_SHLIB_EXT=\".so\" \
+		-DHAVE_SYS_FILIO_H=1 \
+		-DRETSIGTYPE=void \
+		-DITCL_LIBRARY=\"${ITCL_LIBRARY}\" \
+
+
+GENERIC_DIR=	../generic
+UNIX_DIR=	.
+
+SRCS=	\
+		$(GENERIC_DIR)/itcl_bicmds.c \
+		$(GENERIC_DIR)/itcl_class.c \
+		$(GENERIC_DIR)/itcl_cmds.c \
+		$(GENERIC_DIR)/itcl_ensemble.c \
+		$(GENERIC_DIR)/itcl_linkage.c \
+		$(GENERIC_DIR)/itcl_methods.c \
+		$(GENERIC_DIR)/itcl_migrate.c \
+		$(GENERIC_DIR)/itcl_objects.c \
+		$(GENERIC_DIR)/itcl_obsolete.c \
+		$(GENERIC_DIR)/itcl_parse.c \
+		$(GENERIC_DIR)/itcl_util.c
+
+.include <bsd.lib.mk>
diff --git a/lang/itcl/files/makefile b/lang/itcl/files/makefile
new file mode 100644
index 000000000000..d18bc06250fb
--- /dev/null
+++ b/lang/itcl/files/makefile
@@ -0,0 +1,8 @@
+all:
+	for f in ../generic/*.o; do ln -sf $$f; done
+	make -f Makefile itclsh
+test:
+	make -f Makefile test
+install:
+	make -f Makefile install
+
diff --git a/lang/itcl/files/patch-aa b/lang/itcl/files/patch-aa
index c3dd8184533f..3520e7d3ed01 100644
--- a/lang/itcl/files/patch-aa
+++ b/lang/itcl/files/patch-aa
@@ -1,11 +1,128 @@
---- tcl7.5/unix/configure.orig	Sat Aug 17 18:36:48 1996
-+++ tcl7.5/unix/configure	Sat Aug 17 18:37:07 1996
-@@ -4400,7 +4400,7 @@
-     fi
- else
-     if test "$AIX" = "yes"; then
--	TEST_SUFFIX="${.a}"
-+	TEST_SUFFIX=".a"
-     else
- 	TEST_SUFFIX="${SHLIB_SUFFIX}"
-     fi
+--- Makefile.in.orig	Wed Aug 12 06:02:00 1998
++++ Makefile.in	Mon Apr  5 18:10:47 1999
+@@ -55,7 +55,8 @@
+ BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+ 
+ # Directory in which to install the include file itcl.h:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/itcl$(VERSION)
++GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/itcl$(VERSION)/generic
+ 
+ # Top-level directory in which to install manual entries:
+ MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+@@ -75,6 +76,9 @@
+ # get the correct path:
+ 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 Tk:
+ TCL_LIB_DIR =	@TCL_LIB_DIR@
+@@ -115,7 +119,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
+@@ -158,7 +162,7 @@
+ 
+ CC = @CC@
+ CC_SWITCHES = $(CFLAGS) $(SHLIB_CFLAGS) -I$(UNIX_DIR) -I$(GENERIC_DIR) \
+--I$(TCL_SRC_DIR)/generic $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) \
++-I$(TCL_INC_DIR)/generic $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) \
+ -DITCL_LIBRARY=\"$(ITCL_LIBRARY)\"
+ 
+ SRCS = 	$(GENERIC_DIR)/itcl_bicmds.c \
+@@ -178,13 +182,19 @@
+ 	itcl_linkage.o itcl_methods.o itcl_migrate.o itcl_objects.o \
+ 	itcl_obsolete.o itcl_parse.o itcl_util.o
+ 
+-all: $(ITCL_LIB_FILE) itclsh
++all: $(ITCL_LIB_FILE) libitcl30.a itclsh
+ 
+ @ITCL_LIB_FILE@:  $(OBJS)
+ 	rm -f $(ITCL_LIB_FILE)
+ 	@MAKE_LIB@
++	ln -sf $(ITCL_LIB_FILE) libitcl30.so
+ 	$(RANLIB) $(ITCL_LIB_FILE)
+ 
++libitcl30.a: $(OBJS)
++	rm -f libitcl30.a
++	ar cr libitcl30.a $(OBJS)
++	ranlib libitcl30.a
++
+ itclsh: tclAppInit.o $(ITCL_LIB_FILE)
+ 	$(CC) @LD_FLAGS@ tclAppInit.o @ITCL_BUILD_LIB_SPEC@ \
+ 		$(LIBS) $(LD_SEARCH_FLAGS) -o itclsh
+@@ -199,21 +209,28 @@
+ 
+ install: install-binaries install-libraries install-man
+ 
+-install-binaries: $(ITCL_LIB_FILE) itclsh
++install-binaries: $(ITCL_LIB_FILE) libitcl30.a itclsh
+ 	@$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
+ 	@echo "Installing $(ITCL_LIB_FILE)"
+ 	@$(INSTALL_DATA) $(ITCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
+ 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITCL_LIB_FILE))
+ 	chmod 555 $(LIB_INSTALL_DIR)/$(ITCL_LIB_FILE)
++	@echo "Installing libitcl30.a"
++	@$(INSTALL_DATA) libitcl30.a $(LIB_INSTALL_DIR)/libitcl30.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libitcl30.a)
++	chmod 555 $(LIB_INSTALL_DIR)/libitcl30.a
+ 	@echo "Installing itclsh"
+ 	$(INSTALL_PROGRAM) itclsh $(BIN_INSTALL_DIR)/itclsh$(VERSION)
+ 	@echo "Installing itclConfig.sh"
+-	@$(INSTALL_DATA) itclConfig.sh $(LIB_INSTALL_DIR)/itclConfig.sh
++	@mkdir -p $(SCRIPT_INSTALL_DIR)
++	@$(INSTALL_DATA) itclConfig.sh $(SCRIPT_INSTALL_DIR)/itclConfig.sh
+ 
+ install-libraries:
+-	@$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)
+-	@echo "Installing itcl.h"
+-	@$(INSTALL_DATA) $(GENERIC_DIR)/itcl.h $(INCLUDE_INSTALL_DIR)
++	@$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(GENERIC_INCLUDE_INSTALL_DIR)  $(SCRIPT_INSTALL_DIR)
++	@echo "Installing itcl.h and itclInt.h"
++	@$(INSTALL_DATA) $(GENERIC_DIR)/itcl.h $(GENERIC_INCLUDE_INSTALL_DIR)
++	@$(INSTALL_DATA) $(GENERIC_DIR)/itclInt.h $(GENERIC_INCLUDE_INSTALL_DIR)
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/itcl.h $(INCLUDE_INSTALL_DIR)/itcl.h
+ 	@for i in $(TOP_DIR)/library/*.* $(UNIX_DIR)/tclAppInit.c; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+@@ -227,19 +244,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 "itclConfig.sh in $(SCRIPT_INSTALL_DIR)/itclConfig.sh"
++	@echo "itcl.h        in $(INCLUDE_INSTALL_DIR)/itcl.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/lang/itcl/files/patch-ab b/lang/itcl/files/patch-ab
index dbaea5676490..91a0ba8d5dea 100644
--- a/lang/itcl/files/patch-ab
+++ b/lang/itcl/files/patch-ab
@@ -1,42 +1,43 @@
---- tcl7.5/unix/Makefile.in.orig	Fri Jun 28 18:24:04 1996
-+++ tcl7.5/unix/Makefile.in	Thu Oct 17 20:29:25 1996
-@@ -44,7 +44,7 @@
- SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TCL_LIBRARY)
+--- configure~	Mon Oct 19 21:14:58 1998
++++ configure	Thu Jan 14 19:57:33 1999
+@@ -873,15 +873,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}
  
- # Directory in which to install libtcl.so or libtcl.a:
--LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib/itcl
-+LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+-#--------------------------------------------------------------------
+-#   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
  
- # Directory in which to install the program tclsh:
- BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -53,7 +53,7 @@
- INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/itcl
- 
- # Top-level directory in which to install manual entries:
--MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man/itcl
-+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/share/itcl/tcl7.5/man
- 
- # Directory in which to install manual entry for tclsh:
- MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
-@@ -539,12 +539,6 @@
- 	@echo "Installing ${TCL_UNSHARED_LIB_FILE} (with standalone capability)"
- 	@$(INSTALL_DATA) ${TCL_UNSHARED_LIB_FILE} $(LIB_INSTALL_DIR)/${TCL_UNSHARED_LIB_FILE}
- 	@$(RANLIB) $(LIB_INSTALL_DIR)/${TCL_UNSHARED_LIB_FILE}
--	@if test -f $(LIB_INSTALL_DIR)/libtcl.a -a ! -h $(LIB_INSTALL_DIR)/libtcl.a; then \
--	    echo "Renaming your old libtcl.a to libtcl.a.old" ; \
--	    mv $(LIB_INSTALL_DIR)/libtcl.a $(LIB_INSTALL_DIR)/libtcl.a.old ; \
--	fi
--	@rm -f $(LIB_INSTALL_DIR)/libtcl.a
--	@$(LN_S) $(TCL_UNSHARED_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl.a
- 	@if test "$(TCL_LIB_FILE)" != "${TCL_UNSHARED_LIB_FILE}"; then \
- 	    echo "Installing $(TCL_LIB_FILE)" ; \
- 	    $(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR) ; \
-@@ -562,8 +556,6 @@
- 	@$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
- 	@echo "Installing tclConfig.sh"
- 	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
--	@rm -f $(LIB_INSTALL_DIR)/tcl
--	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/tcl
- 	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c; \
- 	    do \
- 	    echo "Installing $$i"; \
+ #--------------------------------------------------------------------
+ #   If this is gcc, add some extra compile flags.
+@@ -1011,13 +1004,13 @@
+         { echo "configure: error: Tcl was not built with --enable-shared" 1>&2; exit 1; }
+     fi
+     SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+-    eval "ITCL_LIB_FILE=libitcl${VERSION}${SHLIB_SUFFIX}"
++    eval "ITCL_LIB_FILE=${ITCL_LIB_FILE}"
+     ITCL_PKG_FILE="[file join [file dirname \$dir] ${ITCL_LIB_FILE}]"
+     MAKE_LIB="\$(SHLIB_LD) -o ${ITCL_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS} \$(LD_SEARCH_FLAGS)"
+     RANLIB=":"
+ else
+     SHLIB_CFLAGS=""
+-    eval "ITCL_LIB_FILE=libitcl${VERSION}.a"
++    eval "ITCL_LIB_FILE=${ITCL_LIB_FILE}"
+     ITCL_PKG_FILE=""
+     MAKE_LIB="ar cr ${ITCL_LIB_FILE} \${OBJS}"
+ fi
+@@ -1212,6 +1205,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_DIR@%$TCL_LIB_DIR%g
+ s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
diff --git a/lang/itcl/pkg-descr b/lang/itcl/pkg-descr
index 4d71fc27c2c0..a2b1a9258e5a 100644
--- a/lang/itcl/pkg-descr
+++ b/lang/itcl/pkg-descr
@@ -1,3 +1,7 @@
-This package contains the binary release of [incr Tcl]
-[incr Tcl] is an object oriented extension to Tcl and Tk, including
-many improved widgets.  This package is also known as ``itcl'',
+This package contains [incr Tcl] version 3.0.1.  [incr Tcl] is an
+object oriented extension to Tcl. The [incr Tcl] language is also known as
+``itcl''.
+
+A companion to [incr Tcl] called [incr Tk] builds a ``mega-widget''
+framework into Tk. The [incr Tk] extension is also known as
+``itk'' and is available in x11-toolkits.
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index 226acd72c140..41b7956fb369 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -1,517 +1,16 @@
-bin/tcl2c
-lib/libtcl75i.a
-lib/libtcl75i.so.1.0
-bin/ish
-bin/ish7.5
-include/itcl/tcl.h
-lib/tclConfig.sh
-lib/itcl/tcl7.5/init.tcl
-lib/itcl/tcl7.5/ldAout.tcl
-lib/itcl/tcl7.5/namesp.tcl
-lib/itcl/tcl7.5/parray.tcl
-lib/itcl/tcl7.5/tclIndex
-lib/itcl/tcl7.5/tclAppInit.c
-share/itcl/tcl7.5/man/man3/AddErrInfo.3.gz
-share/itcl/tcl7.5/man/man3/AllowExc.3.gz
-share/itcl/tcl7.5/man/man3/AppInit.3.gz
-share/itcl/tcl7.5/man/man3/AssocData.3.gz
-share/itcl/tcl7.5/man/man3/Async.3.gz
-share/itcl/tcl7.5/man/man3/BackgdErr.3.gz
-share/itcl/tcl7.5/man/man3/Backslash.3.gz
-share/itcl/tcl7.5/man/man3/CallDel.3.gz
-share/itcl/tcl7.5/man/man3/CmdCmplt.3.gz
-share/itcl/tcl7.5/man/man3/Concat.3.gz
-share/itcl/tcl7.5/man/man3/CrtChannel.3.gz
-share/itcl/tcl7.5/man/man3/CrtChnlHdlr.3.gz
-share/itcl/tcl7.5/man/man3/CrtCloseHdlr.3.gz
-share/itcl/tcl7.5/man/man3/CrtCommand.3.gz
-share/itcl/tcl7.5/man/man3/CrtFileHdlr.3.gz
-share/itcl/tcl7.5/man/man3/CrtInterp.3.gz
-share/itcl/tcl7.5/man/man3/CrtMathFnc.3.gz
-share/itcl/tcl7.5/man/man3/CrtModalTmt.3.gz
-share/itcl/tcl7.5/man/man3/CrtSlave.3.gz
-share/itcl/tcl7.5/man/man3/CrtTimerHdlr.3.gz
-share/itcl/tcl7.5/man/man3/CrtTrace.3.gz
-share/itcl/tcl7.5/man/man3/DString.3.gz
-share/itcl/tcl7.5/man/man3/DetachPids.3.gz
-share/itcl/tcl7.5/man/man3/DoOneEvent.3.gz
-share/itcl/tcl7.5/man/man3/DoWhenIdle.3.gz
-share/itcl/tcl7.5/man/man3/Eval.3.gz
-share/itcl/tcl7.5/man/man3/Exit.3.gz
-share/itcl/tcl7.5/man/man3/ExprLong.3.gz
-share/itcl/tcl7.5/man/man3/FindExec.3.gz
-share/itcl/tcl7.5/man/man3/GetFile.3.gz
-share/itcl/tcl7.5/man/man3/GetInt.3.gz
-share/itcl/tcl7.5/man/man3/GetOpnFl.3.gz
-share/itcl/tcl7.5/man/man3/GetStdChan.3.gz
-share/itcl/tcl7.5/man/man3/Hash.3.gz
-share/itcl/tcl7.5/man/man3/Interp.3.gz
-share/itcl/tcl7.5/man/man3/LinkVar.3.gz
-share/itcl/tcl7.5/man/man3/Notifier.3.gz
-share/itcl/tcl7.5/man/man3/OpenFileChnl.3.gz
-share/itcl/tcl7.5/man/man3/OpenTcp.3.gz
-share/itcl/tcl7.5/man/man3/PkgRequire.3.gz
-share/itcl/tcl7.5/man/man3/Preserve.3.gz
-share/itcl/tcl7.5/man/man3/PrintDbl.3.gz
-share/itcl/tcl7.5/man/man3/RecordEval.3.gz
-share/itcl/tcl7.5/man/man3/RegExp.3.gz
-share/itcl/tcl7.5/man/man3/SetErrno.3.gz
-share/itcl/tcl7.5/man/man3/SetRecLmt.3.gz
-share/itcl/tcl7.5/man/man3/SetResult.3.gz
-share/itcl/tcl7.5/man/man3/SetVar.3.gz
-share/itcl/tcl7.5/man/man3/Sleep.3.gz
-share/itcl/tcl7.5/man/man3/SplitList.3.gz
-share/itcl/tcl7.5/man/man3/StaticPkg.3.gz
-share/itcl/tcl7.5/man/man3/StrMatch.3.gz
-share/itcl/tcl7.5/man/man3/Tcl_Main.3.gz
-share/itcl/tcl7.5/man/man3/TraceVar.3.gz
-share/itcl/tcl7.5/man/man3/Translate.3.gz
-share/itcl/tcl7.5/man/man3/UpVar.3.gz
-share/itcl/tcl7.5/man/mann/@scope.n.gz
-share/itcl/tcl7.5/man/mann/Tcl.n.gz
-share/itcl/tcl7.5/man/mann/after.n.gz
-share/itcl/tcl7.5/man/mann/append.n.gz
-share/itcl/tcl7.5/man/mann/array.n.gz
-share/itcl/tcl7.5/man/mann/bgerror.n.gz
-share/itcl/tcl7.5/man/mann/break.n.gz
-share/itcl/tcl7.5/man/mann/case.n.gz
-share/itcl/tcl7.5/man/mann/catch.n.gz
-share/itcl/tcl7.5/man/mann/cd.n.gz
-share/itcl/tcl7.5/man/mann/clock.n.gz
-share/itcl/tcl7.5/man/mann/close.n.gz
-share/itcl/tcl7.5/man/mann/code.n.gz
-share/itcl/tcl7.5/man/mann/concat.n.gz
-share/itcl/tcl7.5/man/mann/continue.n.gz
-share/itcl/tcl7.5/man/mann/ensemble.n.gz
-share/itcl/tcl7.5/man/mann/eof.n.gz
-share/itcl/tcl7.5/man/mann/error.n.gz
-share/itcl/tcl7.5/man/mann/eval.n.gz
-share/itcl/tcl7.5/man/mann/exec.n.gz
-share/itcl/tcl7.5/man/mann/exit.n.gz
-share/itcl/tcl7.5/man/mann/expr.n.gz
-share/itcl/tcl7.5/man/mann/fblocked.n.gz
-share/itcl/tcl7.5/man/mann/fconfigure.n.gz
-share/itcl/tcl7.5/man/mann/file.n.gz
-share/itcl/tcl7.5/man/mann/fileevent.n.gz
-share/itcl/tcl7.5/man/mann/filename.n.gz
-share/itcl/tcl7.5/man/mann/flush.n.gz
-share/itcl/tcl7.5/man/mann/for.n.gz
-share/itcl/tcl7.5/man/mann/foreach.n.gz
-share/itcl/tcl7.5/man/mann/format.n.gz
-share/itcl/tcl7.5/man/mann/gets.n.gz
-share/itcl/tcl7.5/man/mann/glob.n.gz
-share/itcl/tcl7.5/man/mann/global.n.gz
-share/itcl/tcl7.5/man/mann/history.n.gz
-share/itcl/tcl7.5/man/mann/if.n.gz
-share/itcl/tcl7.5/man/mann/import.n.gz
-share/itcl/tcl7.5/man/mann/incr.n.gz
-share/itcl/tcl7.5/man/mann/info.n.gz
-share/itcl/tcl7.5/man/mann/interp.n.gz
-share/itcl/tcl7.5/man/mann/join.n.gz
-share/itcl/tcl7.5/man/mann/lappend.n.gz
-share/itcl/tcl7.5/man/mann/library.n.gz
-share/itcl/tcl7.5/man/mann/lindex.n.gz
-share/itcl/tcl7.5/man/mann/linsert.n.gz
-share/itcl/tcl7.5/man/mann/list.n.gz
-share/itcl/tcl7.5/man/mann/llength.n.gz
-share/itcl/tcl7.5/man/mann/load.n.gz
-share/itcl/tcl7.5/man/mann/lrange.n.gz
-share/itcl/tcl7.5/man/mann/lreplace.n.gz
-share/itcl/tcl7.5/man/mann/lsearch.n.gz
-share/itcl/tcl7.5/man/mann/lsort.n.gz
-share/itcl/tcl7.5/man/mann/namespace+.n.gz
-share/itcl/tcl7.5/man/mann/namespace.n.gz
-share/itcl/tcl7.5/man/mann/open.n.gz
-share/itcl/tcl7.5/man/mann/package.n.gz
-share/itcl/tcl7.5/man/mann/pid.n.gz
-share/itcl/tcl7.5/man/mann/pkgMkIndex.n.gz
-share/itcl/tcl7.5/man/mann/private.n.gz
-share/itcl/tcl7.5/man/mann/proc.n.gz
-share/itcl/tcl7.5/man/mann/protected.n.gz
-share/itcl/tcl7.5/man/mann/public.n.gz
-share/itcl/tcl7.5/man/mann/puts.n.gz
-share/itcl/tcl7.5/man/mann/pwd.n.gz
-share/itcl/tcl7.5/man/mann/read.n.gz
-share/itcl/tcl7.5/man/mann/regexp.n.gz
-share/itcl/tcl7.5/man/mann/regsub.n.gz
-share/itcl/tcl7.5/man/mann/rename.n.gz
-share/itcl/tcl7.5/man/mann/return.n.gz
-share/itcl/tcl7.5/man/mann/scan.n.gz
-share/itcl/tcl7.5/man/mann/scope.n.gz
-share/itcl/tcl7.5/man/mann/seek.n.gz
-share/itcl/tcl7.5/man/mann/set.n.gz
-share/itcl/tcl7.5/man/mann/socket.n.gz
-share/itcl/tcl7.5/man/mann/source.n.gz
-share/itcl/tcl7.5/man/mann/split.n.gz
-share/itcl/tcl7.5/man/mann/static.n.gz
-share/itcl/tcl7.5/man/mann/string.n.gz
-share/itcl/tcl7.5/man/mann/subst.n.gz
-share/itcl/tcl7.5/man/mann/switch.n.gz
-share/itcl/tcl7.5/man/mann/tclvars.n.gz
-share/itcl/tcl7.5/man/mann/tell.n.gz
-share/itcl/tcl7.5/man/mann/time.n.gz
-share/itcl/tcl7.5/man/mann/trace.n.gz
-share/itcl/tcl7.5/man/mann/unknown.n.gz
-share/itcl/tcl7.5/man/mann/unset.n.gz
-share/itcl/tcl7.5/man/mann/update.n.gz
-share/itcl/tcl7.5/man/mann/uplevel.n.gz
-share/itcl/tcl7.5/man/mann/upvar.n.gz
-share/itcl/tcl7.5/man/mann/variable.n.gz
-share/itcl/tcl7.5/man/mann/vwait.n.gz
-share/itcl/tcl7.5/man/mann/while.n.gz
-lib/libtk41i.a
-lib/libtk41i.so.1.0
-lib/pkgIndex.tcl
-bin/iwish4.1
-bin/iwish
-include/itcl/tk.h
-lib/tkConfig.sh
-lib/itcl/tk4.1/bgerror.tcl
-lib/itcl/tk4.1/button.tcl
-lib/itcl/tk4.1/console.tcl
-lib/itcl/tk4.1/dialog.tcl
-lib/itcl/tk4.1/entry.tcl
-lib/itcl/tk4.1/focus.tcl
-lib/itcl/tk4.1/listbox.tcl
-lib/itcl/tk4.1/menu.tcl
-lib/itcl/tk4.1/obsolete.tcl
-lib/itcl/tk4.1/optMenu.tcl
-lib/itcl/tk4.1/palette.tcl
-lib/itcl/tk4.1/scale.tcl
-lib/itcl/tk4.1/scrlbar.tcl
-lib/itcl/tk4.1/tearoff.tcl
-lib/itcl/tk4.1/text.tcl
-lib/itcl/tk4.1/tk.tcl
-lib/itcl/tk4.1/tclIndex
-lib/itcl/tk4.1/prolog.ps
-lib/itcl/tk4.1/tkAppInit.c
-lib/itcl/tk4.1/demos/README
-lib/itcl/tk4.1/demos/arrow.tcl
-lib/itcl/tk4.1/demos/bind.tcl
-lib/itcl/tk4.1/demos/bitmap.tcl
-lib/itcl/tk4.1/demos/browse
-lib/itcl/tk4.1/demos/button.tcl
-lib/itcl/tk4.1/demos/check.tcl
-lib/itcl/tk4.1/demos/colors.tcl
-lib/itcl/tk4.1/demos/cscroll.tcl
-lib/itcl/tk4.1/demos/ctext.tcl
-lib/itcl/tk4.1/demos/dialog1.tcl
-lib/itcl/tk4.1/demos/dialog2.tcl
-lib/itcl/tk4.1/demos/entry1.tcl
-lib/itcl/tk4.1/demos/entry2.tcl
-lib/itcl/tk4.1/demos/floor.tcl
-lib/itcl/tk4.1/demos/form.tcl
-lib/itcl/tk4.1/demos/hello
-lib/itcl/tk4.1/demos/hscale.tcl
-lib/itcl/tk4.1/demos/icon.tcl
-lib/itcl/tk4.1/demos/image1.tcl
-lib/itcl/tk4.1/demos/image2.tcl
-lib/itcl/tk4.1/demos/items.tcl
-lib/itcl/tk4.1/demos/ixset
-lib/itcl/tk4.1/demos/label.tcl
-lib/itcl/tk4.1/demos/license.terms
-lib/itcl/tk4.1/demos/menu.tcl
-lib/itcl/tk4.1/demos/plot.tcl
-lib/itcl/tk4.1/demos/puzzle.tcl
-lib/itcl/tk4.1/demos/radio.tcl
-lib/itcl/tk4.1/demos/rmt
-lib/itcl/tk4.1/demos/rolodex
-lib/itcl/tk4.1/demos/ruler.tcl
-lib/itcl/tk4.1/demos/sayings.tcl
-lib/itcl/tk4.1/demos/search.tcl
-lib/itcl/tk4.1/demos/square
-lib/itcl/tk4.1/demos/states.tcl
-lib/itcl/tk4.1/demos/style.tcl
-lib/itcl/tk4.1/demos/tclIndex
-lib/itcl/tk4.1/demos/tcolor
-lib/itcl/tk4.1/demos/text.tcl
-lib/itcl/tk4.1/demos/timer
-lib/itcl/tk4.1/demos/twind.tcl
-lib/itcl/tk4.1/demos/vscale.tcl
-lib/itcl/tk4.1/demos/images/earth.gif
-lib/itcl/tk4.1/demos/images/earthris.gif
-lib/itcl/tk4.1/demos/images/face.bmp
-lib/itcl/tk4.1/demos/images/flagdown.bmp
-lib/itcl/tk4.1/demos/images/flagup.bmp
-lib/itcl/tk4.1/demos/images/gray25.bmp
-lib/itcl/tk4.1/demos/images/letters.bmp
-lib/itcl/tk4.1/demos/images/mickey.gif
-lib/itcl/tk4.1/demos/images/noletter.bmp
-lib/itcl/tk4.1/demos/images/pattern.bmp
-lib/itcl/tk4.1/demos/images/teapot.ppm
-share/itcl/tk4.1/man/man1/wish.1.gz
-share/itcl/tk4.1/man/man3/3DBorder.3.gz
-share/itcl/tk4.1/man/man3/BindTable.3.gz
-share/itcl/tk4.1/man/man3/CanvPsY.3.gz
-share/itcl/tk4.1/man/man3/CanvTkwin.3.gz
-share/itcl/tk4.1/man/man3/CanvTxtInfo.3.gz
-share/itcl/tk4.1/man/man3/Clipboard.3.gz
-share/itcl/tk4.1/man/man3/ClrSelect.3.gz
-share/itcl/tk4.1/man/man3/ConfigWidg.3.gz
-share/itcl/tk4.1/man/man3/ConfigWind.3.gz
-share/itcl/tk4.1/man/man3/CoordToWin.3.gz
-share/itcl/tk4.1/man/man3/CrtErrHdlr.3.gz
-share/itcl/tk4.1/man/man3/CrtGenHdlr.3.gz
-share/itcl/tk4.1/man/man3/CrtImgType.3.gz
-share/itcl/tk4.1/man/man3/CrtItemType.3.gz
-share/itcl/tk4.1/man/man3/CrtPhImgFmt.3.gz
-share/itcl/tk4.1/man/man3/CrtSelHdlr.3.gz
-share/itcl/tk4.1/man/man3/DeleteImg.3.gz
-share/itcl/tk4.1/man/man3/DrawFocHlt.3.gz
-share/itcl/tk4.1/man/man3/EventHndlr.3.gz
-share/itcl/tk4.1/man/man3/FindPhoto.3.gz
-share/itcl/tk4.1/man/man3/FreeXId.3.gz
-share/itcl/tk4.1/man/man3/GeomReq.3.gz
-share/itcl/tk4.1/man/man3/GetAnchor.3.gz
-share/itcl/tk4.1/man/man3/GetBitmap.3.gz
-share/itcl/tk4.1/man/man3/GetCapStyl.3.gz
-share/itcl/tk4.1/man/man3/GetClrmap.3.gz
-share/itcl/tk4.1/man/man3/GetColor.3.gz
-share/itcl/tk4.1/man/man3/GetCursor.3.gz
-share/itcl/tk4.1/man/man3/GetFontStr.3.gz
-share/itcl/tk4.1/man/man3/GetGC.3.gz
-share/itcl/tk4.1/man/man3/GetImage.3.gz
-share/itcl/tk4.1/man/man3/GetJoinStl.3.gz
-share/itcl/tk4.1/man/man3/GetJustify.3.gz
-share/itcl/tk4.1/man/man3/GetOption.3.gz
-share/itcl/tk4.1/man/man3/GetPixels.3.gz
-share/itcl/tk4.1/man/man3/GetPixmap.3.gz
-share/itcl/tk4.1/man/man3/GetRelief.3.gz
-share/itcl/tk4.1/man/man3/GetRootCrd.3.gz
-share/itcl/tk4.1/man/man3/GetScroll.3.gz
-share/itcl/tk4.1/man/man3/GetSelect.3.gz
-share/itcl/tk4.1/man/man3/GetUid.3.gz
-share/itcl/tk4.1/man/man3/GetVRoot.3.gz
-share/itcl/tk4.1/man/man3/GetVisual.3.gz
-share/itcl/tk4.1/man/man3/HandleEvent.3.gz
-share/itcl/tk4.1/man/man3/IdToWindow.3.gz
-share/itcl/tk4.1/man/man3/ImgChanged.3.gz
-share/itcl/tk4.1/man/man3/InternAtom.3.gz
-share/itcl/tk4.1/man/man3/MainLoop.3.gz
-share/itcl/tk4.1/man/man3/MainWin.3.gz
-share/itcl/tk4.1/man/man3/MaintGeom.3.gz
-share/itcl/tk4.1/man/man3/ManageGeom.3.gz
-share/itcl/tk4.1/man/man3/MapWindow.3.gz
-share/itcl/tk4.1/man/man3/MoveToplev.3.gz
-share/itcl/tk4.1/man/man3/Name.3.gz
-share/itcl/tk4.1/man/man3/NameOfImg.3.gz
-share/itcl/tk4.1/man/man3/OwnSelect.3.gz
-share/itcl/tk4.1/man/man3/ParseArgv.3.gz
-share/itcl/tk4.1/man/man3/QWinEvent.3.gz
-share/itcl/tk4.1/man/man3/Restack.3.gz
-share/itcl/tk4.1/man/man3/RestrictEv.3.gz
-share/itcl/tk4.1/man/man3/SetAppName.3.gz
-share/itcl/tk4.1/man/man3/SetClass.3.gz
-share/itcl/tk4.1/man/man3/SetGrid.3.gz
-share/itcl/tk4.1/man/man3/SetVisual.3.gz
-share/itcl/tk4.1/man/man3/StrictMotif.3.gz
-share/itcl/tk4.1/man/man3/Tk_Init.3.gz
-share/itcl/tk4.1/man/man3/Tk_Main.3.gz
-share/itcl/tk4.1/man/man3/WindowId.3.gz
-share/itcl/tk4.1/man/mann/bell.n.gz
-share/itcl/tk4.1/man/mann/bind.n.gz
-share/itcl/tk4.1/man/mann/bindtags.n.gz
-share/itcl/tk4.1/man/mann/bitmap.n.gz
-share/itcl/tk4.1/man/mann/button.n.gz
-share/itcl/tk4.1/man/mann/canvas.n.gz
-share/itcl/tk4.1/man/mann/checkbutton.n.gz
-share/itcl/tk4.1/man/mann/clipboard.n.gz
-share/itcl/tk4.1/man/mann/destroy.n.gz
-share/itcl/tk4.1/man/mann/dialog.n.gz
-share/itcl/tk4.1/man/mann/entry.n.gz
-share/itcl/tk4.1/man/mann/focus.n.gz
-share/itcl/tk4.1/man/mann/focusNext.n.gz
-share/itcl/tk4.1/man/mann/frame.n.gz
-share/itcl/tk4.1/man/mann/grab.n.gz
-share/itcl/tk4.1/man/mann/grid.n.gz
-share/itcl/tk4.1/man/mann/image.n.gz
-share/itcl/tk4.1/man/mann/label.n.gz
-share/itcl/tk4.1/man/mann/listbox.n.gz
-share/itcl/tk4.1/man/mann/lower.n.gz
-share/itcl/tk4.1/man/mann/menu.n.gz
-share/itcl/tk4.1/man/mann/menubar.n.gz
-share/itcl/tk4.1/man/mann/menubutton.n.gz
-share/itcl/tk4.1/man/mann/message.n.gz
-share/itcl/tk4.1/man/mann/option.n.gz
-share/itcl/tk4.1/man/mann/optionMenu.n.gz
-share/itcl/tk4.1/man/mann/options.n.gz
-share/itcl/tk4.1/man/mann/pack-old.n.gz
-share/itcl/tk4.1/man/mann/pack.n.gz
-share/itcl/tk4.1/man/mann/palette.n.gz
-share/itcl/tk4.1/man/mann/photo.n.gz
-share/itcl/tk4.1/man/mann/pixmap.n.gz
-share/itcl/tk4.1/man/mann/place.n.gz
-share/itcl/tk4.1/man/mann/popup.n.gz
-share/itcl/tk4.1/man/mann/radiobutton.n.gz
-share/itcl/tk4.1/man/mann/raise.n.gz
-share/itcl/tk4.1/man/mann/scale.n.gz
-share/itcl/tk4.1/man/mann/scrollbar.n.gz
-share/itcl/tk4.1/man/mann/selection.n.gz
-share/itcl/tk4.1/man/mann/send.n.gz
-share/itcl/tk4.1/man/mann/text.n.gz
-share/itcl/tk4.1/man/mann/tk.n.gz
-share/itcl/tk4.1/man/mann/tkerror.n.gz
-share/itcl/tk4.1/man/mann/tkvars.n.gz
-share/itcl/tk4.1/man/mann/tkwait.n.gz
-share/itcl/tk4.1/man/mann/toplevel.n.gz
-share/itcl/tk4.1/man/mann/winfo.n.gz
-share/itcl/tk4.1/man/mann/wm.n.gz
-lib/libitcl.a
-lib/libitcl21.a
-lib/libitcl.so
-lib/libitcl21.so.1.0
-bin/itclsh2.1
-bin/itclsh
-include/itcl/itcl.h
-lib/itclConfig.sh
-lib/itcl/itcl2.1/itcl.tcl
-lib/itcl/itcl2.1/tclAppInit.c
-share/itcl/itcl/man/man1/itclsh.1.gz
-share/itcl/itcl/man/mann/body.n.gz
-share/itcl/itcl/man/mann/class.n.gz
-share/itcl/itcl/man/mann/configbody.n.gz
-share/itcl/itcl/man/mann/delete.n.gz
-share/itcl/itcl/man/mann/info.n.gz
-share/itcl/itcl/man/mann/itcl.n.gz
-share/itcl/itcl/man/mann/itcl_class.n.gz
-share/itcl/itcl/man/mann/itcl_info.n.gz
-share/itcl/itcl/man/mann/itclvars.n.gz
-share/itcl/itcl/man/mann/local.n.gz
-lib/libitk.a
-lib/libitk21.a
-lib/libitk.so
-lib/libitk21.so.1.0
-bin/itkwish2.1
-include/itcl/itk.h
-lib/itcl/itk2.1/Archetype.itk
-lib/itcl/itk2.1/Toplevel.itk
-lib/itcl/itk2.1/Widget.itk
-lib/itcl/itk2.1/itk.tcl
-lib/itcl/itk2.1/tclIndex
-lib/itcl/itk2.1/tkAppInit.c
-share/itcl/itk/man/man1/itkwish.1.gz
-share/itcl/itk/man/mann/Archetype.n.gz
-share/itcl/itk/man/mann/Toplevel.n.gz
-share/itcl/itk/man/mann/Widget.n.gz
-share/itcl/itk/man/mann/itk.n.gz
-share/itcl/itk/man/mann/itkvars.n.gz
-share/itcl/itk/man/mann/usual.n.gz
-lib/itcl/iwidgets2.1.0/iwidgets.tcl
-lib/itcl/iwidgets2.1.0/buttonbox.itk
-lib/itcl/iwidgets2.1.0/canvasprintbox.itk
-lib/itcl/iwidgets2.1.0/canvasprintdialog.itk
-lib/itcl/iwidgets2.1.0/combobox.itk
-lib/itcl/iwidgets2.1.0/dialog.itk
-lib/itcl/iwidgets2.1.0/dialogshell.itk
-lib/itcl/iwidgets2.1.0/entryfield.itk
-lib/itcl/iwidgets2.1.0/feedback.itk
-lib/itcl/iwidgets2.1.0/fileselectionbox.itk
-lib/itcl/iwidgets2.1.0/fileselectiondialog.itk
-lib/itcl/iwidgets2.1.0/hyperhelp.itk
-lib/itcl/iwidgets2.1.0/labeledwidget.itk
-lib/itcl/iwidgets2.1.0/menubar.itk
-lib/itcl/iwidgets2.1.0/messagedialog.itk
-lib/itcl/iwidgets2.1.0/notebook.itk
-lib/itcl/iwidgets2.1.0/optionmenu.itk
-lib/itcl/iwidgets2.1.0/pane.itk
-lib/itcl/iwidgets2.1.0/panedwindow.itk
-lib/itcl/iwidgets2.1.0/promptdialog.itk
-lib/itcl/iwidgets2.1.0/pushbutton.itk
-lib/itcl/iwidgets2.1.0/radiobox.itk
-lib/itcl/iwidgets2.1.0/scrolledcanvas.itk
-lib/itcl/iwidgets2.1.0/scrolledframe.itk
-lib/itcl/iwidgets2.1.0/scrolledhtml.itk
-lib/itcl/iwidgets2.1.0/scrolledlistbox.itk
-lib/itcl/iwidgets2.1.0/scrolledtext.itk
-lib/itcl/iwidgets2.1.0/selectionbox.itk
-lib/itcl/iwidgets2.1.0/selectiondialog.itk
-lib/itcl/iwidgets2.1.0/shell.itk
-lib/itcl/iwidgets2.1.0/spindate.itk
-lib/itcl/iwidgets2.1.0/spinint.itk
-lib/itcl/iwidgets2.1.0/spinner.itk
-lib/itcl/iwidgets2.1.0/spintime.itk
-lib/itcl/iwidgets2.1.0/tabnotebook.itk
-lib/itcl/iwidgets2.1.0/tabset.itk
-lib/itcl/iwidgets2.1.0/toolbar.itk
-lib/itcl/iwidgets2.1.0/colors.itcl
-lib/itcl/iwidgets2.1.0/tclIndex
-lib/itcl/iwidgets2.1.0/unknownimage.gif
-lib/itcl/pkgIndex.tcl
-lib/itcl/iwidgets2.1.0/demos/box.xbm
-lib/itcl/iwidgets2.1.0/demos/buttonbox
-lib/itcl/iwidgets2.1.0/demos/canvasprint
-lib/itcl/iwidgets2.1.0/demos/catalog
-lib/itcl/iwidgets2.1.0/demos/combobox
-lib/itcl/iwidgets2.1.0/demos/demo.html
-lib/itcl/iwidgets2.1.0/demos/dialog
-lib/itcl/iwidgets2.1.0/demos/dialogshell
-lib/itcl/iwidgets2.1.0/demos/entryfield
-lib/itcl/iwidgets2.1.0/demos/feedback
-lib/itcl/iwidgets2.1.0/demos/fileselectionbox
-lib/itcl/iwidgets2.1.0/demos/fileselectiondialog
-lib/itcl/iwidgets2.1.0/demos/hyperhelp
-lib/itcl/iwidgets2.1.0/demos/labeledwidget
-lib/itcl/iwidgets2.1.0/demos/line.xbm
-lib/itcl/iwidgets2.1.0/demos/menubar
-lib/itcl/iwidgets2.1.0/demos/messagedialog
-lib/itcl/iwidgets2.1.0/demos/notebook
-lib/itcl/iwidgets2.1.0/demos/optionmenu
-lib/itcl/iwidgets2.1.0/demos/oval.xbm
-lib/itcl/iwidgets2.1.0/demos/panedwindow
-lib/itcl/iwidgets2.1.0/demos/points.xbm
-lib/itcl/iwidgets2.1.0/demos/promptdialog
-lib/itcl/iwidgets2.1.0/demos/pushbutton
-lib/itcl/iwidgets2.1.0/demos/radiobox
-lib/itcl/iwidgets2.1.0/demos/scrolledcanvas
-lib/itcl/iwidgets2.1.0/demos/scrolledframe
-lib/itcl/iwidgets2.1.0/demos/scrolledhtml
-lib/itcl/iwidgets2.1.0/demos/scrolledlistbox
-lib/itcl/iwidgets2.1.0/demos/scrolledtext
-lib/itcl/iwidgets2.1.0/demos/selectionbox
-lib/itcl/iwidgets2.1.0/demos/selectiondialog
-lib/itcl/iwidgets2.1.0/demos/shell
-lib/itcl/iwidgets2.1.0/demos/spindate
-lib/itcl/iwidgets2.1.0/demos/spinint
-lib/itcl/iwidgets2.1.0/demos/spinner
-lib/itcl/iwidgets2.1.0/demos/spintime
-lib/itcl/iwidgets2.1.0/demos/tabnotebook
-lib/itcl/iwidgets2.1.0/demos/tabset
-lib/itcl/iwidgets2.1.0/demos/text.xbm
-lib/itcl/iwidgets2.1.0/demos/toolbar
-share/itcl/iwidgets/man/mann/buttonbox.n.gz
-share/itcl/iwidgets/man/mann/canvasprintbox.n.gz
-share/itcl/iwidgets/man/mann/canvasprintdialog.n.gz
-share/itcl/iwidgets/man/mann/combobox.n.gz
-share/itcl/iwidgets/man/mann/dialog.n.gz
-share/itcl/iwidgets/man/mann/dialogshell.n.gz
-share/itcl/iwidgets/man/mann/entryfield.n.gz
-share/itcl/iwidgets/man/mann/feedback.n.gz
-share/itcl/iwidgets/man/mann/fileselectionbox.n.gz
-share/itcl/iwidgets/man/mann/fileselectiondialog.n.gz
-share/itcl/iwidgets/man/mann/hyperhelp.n.gz
-share/itcl/iwidgets/man/mann/labeledwidget.n.gz
-share/itcl/iwidgets/man/mann/menubar.n.gz
-share/itcl/iwidgets/man/mann/messagedialog.n.gz
-share/itcl/iwidgets/man/mann/notebook.n.gz
-share/itcl/iwidgets/man/mann/optionmenu.n.gz
-share/itcl/iwidgets/man/mann/panedwindow.n.gz
-share/itcl/iwidgets/man/mann/promptdialog.n.gz
-share/itcl/iwidgets/man/mann/pushbutton.n.gz
-share/itcl/iwidgets/man/mann/radiobox.n.gz
-share/itcl/iwidgets/man/mann/scrolledcanvas.n.gz
-share/itcl/iwidgets/man/mann/scrolledframe.n.gz
-share/itcl/iwidgets/man/mann/scrolledhtml.n.gz
-share/itcl/iwidgets/man/mann/scrolledlistbox.n.gz
-share/itcl/iwidgets/man/mann/scrolledtext.n.gz
-share/itcl/iwidgets/man/mann/selectionbox.n.gz
-share/itcl/iwidgets/man/mann/selectiondialog.n.gz
-share/itcl/iwidgets/man/mann/shell.n.gz
-share/itcl/iwidgets/man/mann/spindate.n.gz
-share/itcl/iwidgets/man/mann/spinint.n.gz
-share/itcl/iwidgets/man/mann/spinner.n.gz
-share/itcl/iwidgets/man/mann/spintime.n.gz
-share/itcl/iwidgets/man/mann/tabnotebook.n.gz
-share/itcl/iwidgets/man/mann/tabset.n.gz
-share/itcl/iwidgets/man/mann/toolbar.n.gz
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+bin/itclsh3.0
+include/itcl3.0/generic/itcl.h
+include/itcl3.0/generic/itclInt.h
+include/itcl3.0/itcl.h
+lib/libitcl30.so.1.1
+lib/libitcl30.so
+lib/libitcl30.a
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/itcl3.0/itclConfig.sh
+lib/itcl3.0/itcl.tcl
+lib/itcl3.0/tclAppInit.c
+lib/itcl3.0/pkgIndex.tcl
+@dirrm include/itcl3.0/generic
+@dirrm include/itcl3.0
+@dirrm lib/itcl3.0