Update tcl-itcl to 3.2.1, a bug fix release.

Also switch to Tcl/Tk 8.4.

12 files changed, 62 insertions, 485 deletions

diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index 6e40238d328..e85fca51201 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2005/09/28 14:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/26 04:22:38 minskim Exp $
 
-DISTNAME=	itcl3.2
-PKGNAME=	tcl-itcl-3.2
-PKGREVISION=	2
+DISTNAME=	itcl3.2.1_src
+PKGNAME=	tcl-itcl-3.2.1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/itcl/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://tcltk.com/itcl/
+HOMEPAGE=	http://incrtcl.sourceforge.net/itcl/
 COMMENT=	[incr Tcl] object-oriented extension to Tcl/Tk
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -16,6 +16,8 @@ CONFLICTS+=	tcl-itcl-current-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+
+WRKSRC=		${WRKDIR}/itcl3.2.1
 CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib	\
 		--with-tk=${BUILDLINK_PREFIX.tk}/lib	\
 		--enable-shared
@@ -23,22 +25,6 @@ CONFIGURE_ENV+=	AR="${AR}"
 
 MAKE_ENV+=	TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
 
-post-extract:
-	@${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/dialog.n 			\
-		${WRKSRC}/iwidgets3.0.0/doc/itcldialog.n
-	@${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/menubar.n 		\
-		${WRKSRC}/iwidgets3.0.0/doc/itclmenubar.n
-	@${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/tabset.n			\
-		${WRKSRC}/iwidgets3.0.0/doc/itcltabset.n
-	@${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/watch.n			\
-		${WRKSRC}/iwidgets3.0.0/doc/itclwatch.n
-	@${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/dialog.n 			\
-		${WRKSRC}/iwidgets2.2.0/doc/itcldialog.n
-	@${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n 		\
-		${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n
-	@${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/tabset.n			\
-		${WRKSRC}/iwidgets2.2.0/doc/itcltabset.n
-
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl/PLIST b/lang/tcl-itcl/PLIST
index 54cc2b52b46..f8a3e095315 100644
--- a/lang/tcl-itcl/PLIST
+++ b/lang/tcl-itcl/PLIST
@@ -1,332 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/10/26 04:22:38 minskim Exp $
 include/itcl.h
 include/itclDecls.h
 include/itclInt.h
 include/itclIntDecls.h
 include/itk.h
 include/itkDecls.h
-lib/iwidgets
-lib/tcl/itcl3.2/pkgIndex.tcl
+lib/libitcl32.la
+lib/libitclstub32.a
+lib/libitk32.la
+lib/libitkstub32.a
 lib/tcl/itcl3.2/itcl.tcl
-lib/tcl/itk3.2/pkgIndex.tcl
+lib/tcl/itcl3.2/pkgIndex.tcl
 lib/tcl/itk3.2/Archetype.itk
 lib/tcl/itk3.2/Toplevel.itk
 lib/tcl/itk3.2/Widget.itk
 lib/tcl/itk3.2/itk.tcl
+lib/tcl/itk3.2/pkgIndex.tcl
 lib/tcl/itk3.2/tclIndex
-lib/tcl/iwidgets
-lib/tcl/iwidgets2.2.0/scripts/buttonbox.itk
-lib/tcl/iwidgets2.2.0/scripts/canvasprintbox.itk
-lib/tcl/iwidgets2.2.0/scripts/canvasprintdialog.itk
-lib/tcl/iwidgets2.2.0/scripts/colors.itk
-lib/tcl/iwidgets2.2.0/scripts/combobox.itk
-lib/tcl/iwidgets2.2.0/scripts/dialog.itk
-lib/tcl/iwidgets2.2.0/scripts/dialogshell.itk
-lib/tcl/iwidgets2.2.0/scripts/entryfield.itk
-lib/tcl/iwidgets2.2.0/scripts/feedback.itk
-lib/tcl/iwidgets2.2.0/scripts/fileselectionbox.itk
-lib/tcl/iwidgets2.2.0/scripts/fileselectiondialog.itk
-lib/tcl/iwidgets2.2.0/scripts/hyperhelp.itk
-lib/tcl/iwidgets2.2.0/scripts/labeledwidget.itk
-lib/tcl/iwidgets2.2.0/scripts/menubar.itk
-lib/tcl/iwidgets2.2.0/scripts/messagedialog.itk
-lib/tcl/iwidgets2.2.0/scripts/notebook.itk
-lib/tcl/iwidgets2.2.0/scripts/optionmenu.itk
-lib/tcl/iwidgets2.2.0/scripts/pane.itk
-lib/tcl/iwidgets2.2.0/scripts/panedwindow.itk
-lib/tcl/iwidgets2.2.0/scripts/promptdialog.itk
-lib/tcl/iwidgets2.2.0/scripts/pushbutton.itk
-lib/tcl/iwidgets2.2.0/scripts/radiobox.itk
-lib/tcl/iwidgets2.2.0/scripts/scrolledcanvas.itk
-lib/tcl/iwidgets2.2.0/scripts/scrolledframe.itk
-lib/tcl/iwidgets2.2.0/scripts/scrolledhtml.itk
-lib/tcl/iwidgets2.2.0/scripts/scrolledlistbox.itk
-lib/tcl/iwidgets2.2.0/scripts/scrolledtext.itk
-lib/tcl/iwidgets2.2.0/scripts/selectionbox.itk
-lib/tcl/iwidgets2.2.0/scripts/selectiondialog.itk
-lib/tcl/iwidgets2.2.0/scripts/shell.itk
-lib/tcl/iwidgets2.2.0/scripts/spindate.itk
-lib/tcl/iwidgets2.2.0/scripts/spinint.itk
-lib/tcl/iwidgets2.2.0/scripts/spinner.itk
-lib/tcl/iwidgets2.2.0/scripts/spintime.itk
-lib/tcl/iwidgets2.2.0/scripts/tabnotebook.itk
-lib/tcl/iwidgets2.2.0/scripts/tabset.itk
-lib/tcl/iwidgets2.2.0/scripts/toolbar.itk
-lib/tcl/iwidgets2.2.0/scripts/tclIndex
-lib/tcl/iwidgets2.2.0/scripts/unknownimage.gif
-lib/tcl/iwidgets2.2.0/demos/images/mag.gif
-lib/tcl/iwidgets2.2.0/demos/images/poly.gif
-lib/tcl/iwidgets2.2.0/demos/images/ruler.gif
-lib/tcl/iwidgets2.2.0/demos/images/select.gif
-lib/tcl/iwidgets2.2.0/demos/html/buttonbox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/canvasprintbox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/canvasprintdialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/combobox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/dialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/dialogshell.n.html
-lib/tcl/iwidgets2.2.0/demos/html/entryfield.n.html
-lib/tcl/iwidgets2.2.0/demos/html/feedback.n.html
-lib/tcl/iwidgets2.2.0/demos/html/fileselectionbox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/fileselectiondialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/hyperhelp.n.html
-lib/tcl/iwidgets2.2.0/demos/html/iwidgets2.2.0UserCmds.html
-lib/tcl/iwidgets2.2.0/demos/html/labeledwidget.n.html
-lib/tcl/iwidgets2.2.0/demos/html/menubar.n.html
-lib/tcl/iwidgets2.2.0/demos/html/messagedialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/notebook.n.html
-lib/tcl/iwidgets2.2.0/demos/html/optionmenu.n.html
-lib/tcl/iwidgets2.2.0/demos/html/panedwindow.n.html
-lib/tcl/iwidgets2.2.0/demos/html/promptdialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/pushbutton.n.html
-lib/tcl/iwidgets2.2.0/demos/html/radiobox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/scrolledcanvas.n.html
-lib/tcl/iwidgets2.2.0/demos/html/scrolledframe.n.html
-lib/tcl/iwidgets2.2.0/demos/html/scrolledhtml.n.html
-lib/tcl/iwidgets2.2.0/demos/html/scrolledlistbox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/scrolledtext.n.html
-lib/tcl/iwidgets2.2.0/demos/html/selectionbox.n.html
-lib/tcl/iwidgets2.2.0/demos/html/selectiondialog.n.html
-lib/tcl/iwidgets2.2.0/demos/html/shell.n.html
-lib/tcl/iwidgets2.2.0/demos/html/spindate.n.html
-lib/tcl/iwidgets2.2.0/demos/html/spinint.n.html
-lib/tcl/iwidgets2.2.0/demos/html/spinner.n.html
-lib/tcl/iwidgets2.2.0/demos/html/spintime.n.html
-lib/tcl/iwidgets2.2.0/demos/html/tabnotebook.n.html
-lib/tcl/iwidgets2.2.0/demos/html/tabset.n.html
-lib/tcl/iwidgets2.2.0/demos/html/toolbar.n.html
-lib/tcl/iwidgets2.2.0/demos/buttonbox
-lib/tcl/iwidgets2.2.0/demos/canvasprintdialog
-lib/tcl/iwidgets2.2.0/demos/catalog
-lib/tcl/iwidgets2.2.0/demos/combobox
-lib/tcl/iwidgets2.2.0/demos/demo.html
-lib/tcl/iwidgets2.2.0/demos/dialog
-lib/tcl/iwidgets2.2.0/demos/dialogshell
-lib/tcl/iwidgets2.2.0/demos/entryfield
-lib/tcl/iwidgets2.2.0/demos/feedback
-lib/tcl/iwidgets2.2.0/demos/fileselectionbox
-lib/tcl/iwidgets2.2.0/demos/fileselectiondialog
-lib/tcl/iwidgets2.2.0/demos/hyperhelp
-lib/tcl/iwidgets2.2.0/demos/iwidgets.gif
-lib/tcl/iwidgets2.2.0/demos/labeledwidget
-lib/tcl/iwidgets2.2.0/demos/menubar
-lib/tcl/iwidgets2.2.0/demos/messagedialog
-lib/tcl/iwidgets2.2.0/demos/notebook
-lib/tcl/iwidgets2.2.0/demos/optionmenu
-lib/tcl/iwidgets2.2.0/demos/panedwindow
-lib/tcl/iwidgets2.2.0/demos/promptdialog
-lib/tcl/iwidgets2.2.0/demos/pushbutton
-lib/tcl/iwidgets2.2.0/demos/radiobox
-lib/tcl/iwidgets2.2.0/demos/scrolledcanvas
-lib/tcl/iwidgets2.2.0/demos/scrolledframe
-lib/tcl/iwidgets2.2.0/demos/scrolledhtml
-lib/tcl/iwidgets2.2.0/demos/scrolledlistbox
-lib/tcl/iwidgets2.2.0/demos/scrolledtext
-lib/tcl/iwidgets2.2.0/demos/selectionbox
-lib/tcl/iwidgets2.2.0/demos/selectiondialog
-lib/tcl/iwidgets2.2.0/demos/spindate
-lib/tcl/iwidgets2.2.0/demos/spinint
-lib/tcl/iwidgets2.2.0/demos/spinner
-lib/tcl/iwidgets2.2.0/demos/spintime
-lib/tcl/iwidgets2.2.0/demos/tabnotebook
-lib/tcl/iwidgets2.2.0/demos/tabset
-lib/tcl/iwidgets2.2.0/demos/toolbar
-lib/tcl/iwidgets2.2.0/demos/catalog.bat
-lib/tcl/iwidgets2.2.0/iwidgets.tcl
-lib/tcl/iwidgets2.2.0/pkgIndex.tcl
-lib/tcl/iwidgets2.2.0/license.terms
-lib/tcl/iwidgets3.0.1/scripts/scopedobject.tcl
-lib/tcl/iwidgets3.0.1/scripts/buttonbox.itk
-lib/tcl/iwidgets3.0.1/scripts/calendar.itk
-lib/tcl/iwidgets3.0.1/scripts/canvasprintbox.itk
-lib/tcl/iwidgets3.0.1/scripts/canvasprintdialog.itk
-lib/tcl/iwidgets3.0.1/scripts/checkbox.itk
-lib/tcl/iwidgets3.0.1/scripts/combobox.itk
-lib/tcl/iwidgets3.0.1/scripts/dateentry.itk
-lib/tcl/iwidgets3.0.1/scripts/datefield.itk
-lib/tcl/iwidgets3.0.1/scripts/dialog.itk
-lib/tcl/iwidgets3.0.1/scripts/dialogshell.itk
-lib/tcl/iwidgets3.0.1/scripts/disjointlistbox.itk
-lib/tcl/iwidgets3.0.1/scripts/entryfield.itk
-lib/tcl/iwidgets3.0.1/scripts/extfileselectionbox.itk
-lib/tcl/iwidgets3.0.1/scripts/extfileselectiondialog.itk
-lib/tcl/iwidgets3.0.1/scripts/feedback.itk
-lib/tcl/iwidgets3.0.1/scripts/fileselectionbox.itk
-lib/tcl/iwidgets3.0.1/scripts/fileselectiondialog.itk
-lib/tcl/iwidgets3.0.1/scripts/finddialog.itk
-lib/tcl/iwidgets3.0.1/scripts/hierarchy.itk
-lib/tcl/iwidgets3.0.1/scripts/hyperhelp.itk
-lib/tcl/iwidgets3.0.1/scripts/labeledframe.itk
-lib/tcl/iwidgets3.0.1/scripts/labeledwidget.itk
-lib/tcl/iwidgets3.0.1/scripts/mainwindow.itk
-lib/tcl/iwidgets3.0.1/scripts/menubar.itk
-lib/tcl/iwidgets3.0.1/scripts/messagebox.itk
-lib/tcl/iwidgets3.0.1/scripts/messagedialog.itk
-lib/tcl/iwidgets3.0.1/scripts/notebook.itk
-lib/tcl/iwidgets3.0.1/scripts/optionmenu.itk
-lib/tcl/iwidgets3.0.1/scripts/pane.itk
-lib/tcl/iwidgets3.0.1/scripts/panedwindow.itk
-lib/tcl/iwidgets3.0.1/scripts/promptdialog.itk
-lib/tcl/iwidgets3.0.1/scripts/pushbutton.itk
-lib/tcl/iwidgets3.0.1/scripts/radiobox.itk
-lib/tcl/iwidgets3.0.1/scripts/regexpfield.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledcanvas.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledframe.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledhtml.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledlistbox.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledtext.itk
-lib/tcl/iwidgets3.0.1/scripts/scrolledwidget.itk
-lib/tcl/iwidgets3.0.1/scripts/selectionbox.itk
-lib/tcl/iwidgets3.0.1/scripts/selectiondialog.itk
-lib/tcl/iwidgets3.0.1/scripts/shell.itk
-lib/tcl/iwidgets3.0.1/scripts/spindate.itk
-lib/tcl/iwidgets3.0.1/scripts/spinint.itk
-lib/tcl/iwidgets3.0.1/scripts/spinner.itk
-lib/tcl/iwidgets3.0.1/scripts/spintime.itk
-lib/tcl/iwidgets3.0.1/scripts/tabnotebook.itk
-lib/tcl/iwidgets3.0.1/scripts/tabset.itk
-lib/tcl/iwidgets3.0.1/scripts/timeentry.itk
-lib/tcl/iwidgets3.0.1/scripts/timefield.itk
-lib/tcl/iwidgets3.0.1/scripts/toolbar.itk
-lib/tcl/iwidgets3.0.1/scripts/watch.itk
-lib/tcl/iwidgets3.0.1/scripts/colors.itcl
-lib/tcl/iwidgets3.0.1/scripts/roman.itcl
-lib/tcl/iwidgets3.0.1/scripts/scopedobject.itcl
-lib/tcl/iwidgets3.0.1/scripts/tclIndex
-lib/tcl/iwidgets3.0.1/scripts/unknownimage.gif
-lib/tcl/iwidgets3.0.1/demos/images/box.xbm
-lib/tcl/iwidgets3.0.1/demos/images/clear.gif
-lib/tcl/iwidgets3.0.1/demos/images/close.gif
-lib/tcl/iwidgets3.0.1/demos/images/copy.gif
-lib/tcl/iwidgets3.0.1/demos/images/cut.gif
-lib/tcl/iwidgets3.0.1/demos/images/exit.gif
-lib/tcl/iwidgets3.0.1/demos/images/find.gif
-lib/tcl/iwidgets3.0.1/demos/images/help.gif
-lib/tcl/iwidgets3.0.1/demos/images/line.xbm
-lib/tcl/iwidgets3.0.1/demos/images/mag.gif
-lib/tcl/iwidgets3.0.1/demos/images/new.gif
-lib/tcl/iwidgets3.0.1/demos/images/open.gif
-lib/tcl/iwidgets3.0.1/demos/images/oval.xbm
-lib/tcl/iwidgets3.0.1/demos/images/paste.gif
-lib/tcl/iwidgets3.0.1/demos/images/points.xbm
-lib/tcl/iwidgets3.0.1/demos/images/poly.gif
-lib/tcl/iwidgets3.0.1/demos/images/print.gif
-lib/tcl/iwidgets3.0.1/demos/images/ruler.gif
-lib/tcl/iwidgets3.0.1/demos/images/save.gif
-lib/tcl/iwidgets3.0.1/demos/images/select.gif
-lib/tcl/iwidgets3.0.1/demos/images/text.xbm
-lib/tcl/iwidgets3.0.1/demos/html/buttonbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/calendar.n.html
-lib/tcl/iwidgets3.0.1/demos/html/canvasprintbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/canvasprintdialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/checkbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/combobox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/dateentry.n.html
-lib/tcl/iwidgets3.0.1/demos/html/datefield.n.html
-lib/tcl/iwidgets3.0.1/demos/html/dialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/dialogshell.n.html
-lib/tcl/iwidgets3.0.1/demos/html/disjointlistbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/entryfield.n.html
-lib/tcl/iwidgets3.0.1/demos/html/extfileselectionbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/extfileselectiondialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/feedback.n.html
-lib/tcl/iwidgets3.0.1/demos/html/finddialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/fileselectionbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/fileselectiondialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/hierarchy.n.html
-lib/tcl/iwidgets3.0.1/demos/html/hyperhelp.n.html
-lib/tcl/iwidgets3.0.1/demos/html/iwidgets3.0.0UserCmds.html
-lib/tcl/iwidgets3.0.1/demos/html/labeledframe.n.html
-lib/tcl/iwidgets3.0.1/demos/html/labeledwidget.n.html
-lib/tcl/iwidgets3.0.1/demos/html/mainwindow.n.html
-lib/tcl/iwidgets3.0.1/demos/html/menubar.n.html
-lib/tcl/iwidgets3.0.1/demos/html/messagebox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/messagedialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/notebook.n.html
-lib/tcl/iwidgets3.0.1/demos/html/optionmenu.n.html
-lib/tcl/iwidgets3.0.1/demos/html/panedwindow.n.html
-lib/tcl/iwidgets3.0.1/demos/html/promptdialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/pushbutton.n.html
-lib/tcl/iwidgets3.0.1/demos/html/radiobox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scopedobject.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scrolledcanvas.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scrolledframe.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scrolledhtml.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scrolledlistbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/scrolledtext.n.html
-lib/tcl/iwidgets3.0.1/demos/html/selectionbox.n.html
-lib/tcl/iwidgets3.0.1/demos/html/selectiondialog.n.html
-lib/tcl/iwidgets3.0.1/demos/html/shell.n.html
-lib/tcl/iwidgets3.0.1/demos/html/spindate.n.html
-lib/tcl/iwidgets3.0.1/demos/html/spinint.n.html
-lib/tcl/iwidgets3.0.1/demos/html/spinner.n.html
-lib/tcl/iwidgets3.0.1/demos/html/spintime.n.html
-lib/tcl/iwidgets3.0.1/demos/html/tabnotebook.n.html
-lib/tcl/iwidgets3.0.1/demos/html/tabset.n.html
-lib/tcl/iwidgets3.0.1/demos/html/timeentry.n.html
-lib/tcl/iwidgets3.0.1/demos/html/timefield.n.html
-lib/tcl/iwidgets3.0.1/demos/html/toolbar.n.html
-lib/tcl/iwidgets3.0.1/demos/html/watch.n.html
-lib/tcl/iwidgets3.0.1/demos/buttonbox
-lib/tcl/iwidgets3.0.1/demos/calendar
-lib/tcl/iwidgets3.0.1/demos/canvasprintbox
-lib/tcl/iwidgets3.0.1/demos/canvasprintdialog
-lib/tcl/iwidgets3.0.1/demos/catalog
-lib/tcl/iwidgets3.0.1/demos/checkbox
-lib/tcl/iwidgets3.0.1/demos/combobox
-lib/tcl/iwidgets3.0.1/demos/dateentry
-lib/tcl/iwidgets3.0.1/demos/datefield
-lib/tcl/iwidgets3.0.1/demos/demo.html
-lib/tcl/iwidgets3.0.1/demos/dialog
-lib/tcl/iwidgets3.0.1/demos/dialogshell
-lib/tcl/iwidgets3.0.1/demos/disjointlistbox
-lib/tcl/iwidgets3.0.1/demos/entryfield
-lib/tcl/iwidgets3.0.1/demos/extfileselectionbox
-lib/tcl/iwidgets3.0.1/demos/extfileselectiondialog
-lib/tcl/iwidgets3.0.1/demos/feedback
-lib/tcl/iwidgets3.0.1/demos/fileselectionbox
-lib/tcl/iwidgets3.0.1/demos/fileselectiondialog
-lib/tcl/iwidgets3.0.1/demos/finddialog
-lib/tcl/iwidgets3.0.1/demos/hierarchy
-lib/tcl/iwidgets3.0.1/demos/hyperhelp
-lib/tcl/iwidgets3.0.1/demos/iwidgets.gif
-lib/tcl/iwidgets3.0.1/demos/labeledframe
-lib/tcl/iwidgets3.0.1/demos/labeledwidget
-lib/tcl/iwidgets3.0.1/demos/mainwindow
-lib/tcl/iwidgets3.0.1/demos/menubar
-lib/tcl/iwidgets3.0.1/demos/messagebox
-lib/tcl/iwidgets3.0.1/demos/messagedialog
-lib/tcl/iwidgets3.0.1/demos/notebook
-lib/tcl/iwidgets3.0.1/demos/optionmenu
-lib/tcl/iwidgets3.0.1/demos/panedwindow
-lib/tcl/iwidgets3.0.1/demos/promptdialog
-lib/tcl/iwidgets3.0.1/demos/pushbutton
-lib/tcl/iwidgets3.0.1/demos/radiobox
-lib/tcl/iwidgets3.0.1/demos/scopedobject
-lib/tcl/iwidgets3.0.1/demos/scrolledcanvas
-lib/tcl/iwidgets3.0.1/demos/scrolledframe
-lib/tcl/iwidgets3.0.1/demos/scrolledhtml
-lib/tcl/iwidgets3.0.1/demos/scrolledlistbox
-lib/tcl/iwidgets3.0.1/demos/scrolledtext
-lib/tcl/iwidgets3.0.1/demos/selectionbox
-lib/tcl/iwidgets3.0.1/demos/selectiondialog
-lib/tcl/iwidgets3.0.1/demos/shell
-lib/tcl/iwidgets3.0.1/demos/spindate
-lib/tcl/iwidgets3.0.1/demos/spinint
-lib/tcl/iwidgets3.0.1/demos/spinner
-lib/tcl/iwidgets3.0.1/demos/spintime
-lib/tcl/iwidgets3.0.1/demos/tabnotebook
-lib/tcl/iwidgets3.0.1/demos/tabset
-lib/tcl/iwidgets3.0.1/demos/timeentry
-lib/tcl/iwidgets3.0.1/demos/timefield
-lib/tcl/iwidgets3.0.1/demos/toolbar
-lib/tcl/iwidgets3.0.1/demos/watch
-lib/tcl/iwidgets3.0.1/iwidgets.tcl
-lib/tcl/iwidgets3.0.1/pkgIndex.tcl
-lib/tcl/iwidgets3.0.1/license.terms
-lib/libitcl32.la
-lib/libitclstub32.a
-lib/libitk32.la
-lib/libitkstub32.a
+man/mann/Archetype.n
+man/mann/Toplevel.n
+man/mann/Widget.n
 man/mann/body.n
 man/mann/class.n
 man/mann/code.n
@@ -338,75 +31,11 @@ man/mann/itcl.n
 man/mann/itcl_class.n
 man/mann/itcl_info.n
 man/mann/itclvars.n
-man/mann/local.n
-man/mann/scope.n
-man/mann/Archetype.n
-man/mann/Toplevel.n
-man/mann/Widget.n
 man/mann/itk.n
 man/mann/itkvars.n
+man/mann/local.n
+man/mann/scope.n
 man/mann/usual.n
-man/mann/buttonbox.n
-man/mann/canvasprintbox.n
-man/mann/shell.n
-man/mann/canvasprintdialog.n
-man/mann/combobox.n
-man/mann/itcldialog.n
-man/mann/dialogshell.n
-man/mann/entryfield.n
-man/mann/feedback.n
-man/mann/fileselectionbox.n
-man/mann/fileselectiondialog.n
-man/mann/hyperhelp.n
-man/mann/labeledwidget.n
-man/mann/itclmenubar.n
-man/mann/messagedialog.n
-man/mann/notebook.n
-man/mann/optionmenu.n
-man/mann/panedwindow.n
-man/mann/promptdialog.n
-man/mann/pushbutton.n
-man/mann/radiobox.n
-man/mann/scrolledcanvas.n
-man/mann/scrolledframe.n
-man/mann/scrolledhtml.n
-man/mann/itclwatch.n
-man/mann/scrolledlistbox.n
-man/mann/scrolledtext.n
-man/mann/selectionbox.n
-man/mann/selectiondialog.n
-man/mann/spindate.n
-man/mann/spinint.n
-man/mann/spinner.n
-man/mann/spintime.n
-man/mann/tabnotebook.n
-man/mann/itcltabset.n
-man/mann/toolbar.n
-man/mann/calendar.n
-man/mann/checkbox.n
-man/mann/dateentry.n
-man/mann/datefield.n
-man/mann/disjointlistbox.n
-man/mann/extfileselectionbox.n
-man/mann/extfileselectiondialog.n
-man/mann/finddialog.n
-man/mann/hierarchy.n
-man/mann/labeledframe.n
-man/mann/timeentry.n
-man/mann/mainwindow.n
-man/mann/messagebox.n
-man/mann/scopedobject.n
-man/mann/timefield.n
-@dirrm lib/tcl/itcl3.2
 @dirrm lib/tcl/itk3.2
-@dirrm lib/tcl/iwidgets2.2.0/win
-@dirrm lib/tcl/iwidgets2.2.0/scripts
-@dirrm lib/tcl/iwidgets2.2.0/demos/images
-@dirrm lib/tcl/iwidgets2.2.0/demos/html
-@dirrm lib/tcl/iwidgets2.2.0/demos
-@dirrm lib/tcl/iwidgets2.2.0
-@dirrm lib/tcl/iwidgets3.0.1/scripts
-@dirrm lib/tcl/iwidgets3.0.1/demos/images
-@dirrm lib/tcl/iwidgets3.0.1/demos/html
-@dirrm lib/tcl/iwidgets3.0.1/demos
-@dirrm lib/tcl/iwidgets3.0.1
+@dirrm lib/tcl/itcl3.2
+@comment in tcl: @dirrm lib/tcl
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 6c94ef3c67e..5c1f956d787 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:15:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/10/26 04:22:38 minskim Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_ITCL_BUILDLINK3_MK:=	${TCL_ITCL_BUILDLINK3_MK}+
@@ -11,12 +11,11 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl}
 BUILDLINK_PACKAGES+=	tcl-itcl
 
 .if !empty(TCL_ITCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2
-BUILDLINK_RECOMMENDED.tcl-itcl+=	tcl-itcl>=3.2nb2
+BUILDLINK_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../lang/tcl-itcl
 .endif	# TCL_ITCL_BUILDLINK3_MK
 
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-itcl/distinfo b/lang/tcl-itcl/distinfo
index 5cdc53ed177..f9804164321 100644
--- a/lang/tcl-itcl/distinfo
+++ b/lang/tcl-itcl/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/10/26 04:22:38 minskim Exp $
 
-SHA1 (itcl3.2.tar.gz) = 9e51a309414d4894f2bc7b33a1c44b51c7e1dbd5
-RMD160 (itcl3.2.tar.gz) = dcbea3d5f2c33069e7b654ab70eecd871d306fe4
-Size (itcl3.2.tar.gz) = 1498517 bytes
-SHA1 (patch-aa) = eb96c474ecb44129eba14434e9553def093b4128
-SHA1 (patch-ab) = 4644c9e271a37502fbd51477340a47f4d0ecf8fe
-SHA1 (patch-ac) = ae91e2aefe7d8c3ab3d000b8e1d2405aebc046d6
-SHA1 (patch-ad) = 2f61ebe7d8c4062426d1a79d93ef544b0b46c856
-SHA1 (patch-ae) = e7ebc0443bc4fae29ce67909d8e35e9f65a0ef69
-SHA1 (patch-af) = ca6609bd91fb3e94ec637d50568e5116b83c870a
-SHA1 (patch-ag) = 5b21951b82de53875efd5289dd87abae8bb11073
-SHA1 (patch-ah) = 58985a1b21625fc00dbbfe4e793dcbb2f7ef2929
+SHA1 (itcl3.2.1_src.tgz) = 890f56e61826a9c3522fb24bf3c08f73cea8a1dd
+RMD160 (itcl3.2.1_src.tgz) = 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1
+Size (itcl3.2.1_src.tgz) = 427026 bytes
+SHA1 (patch-aa) = 5357555498f874a5d90de6451847e50df167ab9f
+SHA1 (patch-ab) = f78dd17f2da70187a1b8aca0f484a6813876625c
+SHA1 (patch-ac) = 7885a8d126449068f3af7e748193b2cdf3051fce
+SHA1 (patch-ad) = 9131b2aa318410100f5477a70a7ce5221133f49b
+SHA1 (patch-ae) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-af) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ag) = 3d12b3a2cf0cd35c39f622cf8f9b4872772c12c6
+SHA1 (patch-ah) = cb47b46d9762d29bbc5b7ba5ae7d3889cd1a0327
diff --git a/lang/tcl-itcl/patches/patch-aa b/lang/tcl-itcl/patches/patch-aa
index b1287d5f85e..84999ba050f 100644
--- a/lang/tcl-itcl/patches/patch-aa
+++ b/lang/tcl-itcl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/05/12 23:38:35 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/26 04:22:38 minskim Exp $
 
---- itcl/configure.orig	2000-08-28 22:58:00.000000000 -0500
+--- itcl/configure.orig	2001-05-28 02:18:31.000000000 -0500
 +++ itcl/configure
-@@ -1119,7 +1119,7 @@ case "`uname -s`" in
+@@ -1130,7 +1130,7 @@ case "`uname -s`" in
      ;;
      *)
  	CYGPATH=echo
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/12 23:38:35 minskim Exp $
      ;;
  esac
  
-@@ -1303,7 +1303,7 @@ echo "configure:1293: checking for Tcl p
+@@ -1314,7 +1314,7 @@ echo "configure:1304: checking for Tcl p
  	    TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
  	;;
  	*)
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/12 23:38:35 minskim Exp $
  	    TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
  	    TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
  	    TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
-@@ -1575,12 +1575,12 @@ fi
+@@ -1586,12 +1586,12 @@ fi
  # link against the non-stubbed Tcl library.
  #--------------------------------------------------------------------
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.3 2004/05/12 23:38:35 minskim Exp $
  
  #--------------------------------------------------------------------
  # This macro generates a line to use when building a library.  It
-@@ -1598,7 +1598,7 @@ fi
+@@ -1609,7 +1609,7 @@ fi
  	    ;;
  	*)
  	    MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab
index a6f2c458b89..8d237e90541 100644
--- a/lang/tcl-itcl/patches/patch-ab
+++ b/lang/tcl-itcl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/05/01 16:13:54 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $
 
 --- itcl/Makefile.in.orig	Tue Aug 29 03:58:00 2000
 +++ itcl/Makefile.in
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 16:13:54 jtb Exp $
 +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl83 -lm
++SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl -lm
  STLIB_LD = @STLIB_LD@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_DEFS = @TCL_DEFS@
diff --git a/lang/tcl-itcl/patches/patch-ac b/lang/tcl-itcl/patches/patch-ac
index 8955fe75735..93cb39c5b92 100644
--- a/lang/tcl-itcl/patches/patch-ac
+++ b/lang/tcl-itcl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2004/05/12 23:38:35 minskim Exp $
+$NetBSD: patch-ac,v 1.4 2005/10/26 04:22:38 minskim Exp $
 
---- itk/configure.orig	2000-08-28 22:58:00.000000000 -0500
+--- itk/configure.orig	2001-05-28 02:18:56.000000000 -0500
 +++ itk/configure
-@@ -1119,7 +1119,7 @@ case "`uname -s`" in
+@@ -1130,7 +1130,7 @@ case "`uname -s`" in
      ;;
      *)
  	CYGPATH=echo
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2004/05/12 23:38:35 minskim Exp $
      ;;
  esac
  
-@@ -1564,7 +1564,7 @@ echo "configure:1554: checking for Tcl p
+@@ -1575,7 +1575,7 @@ echo "configure:1565: checking for Tcl p
  	    TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
  	;;
  	*)
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2004/05/12 23:38:35 minskim Exp $
  	    TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
  	    TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
  	    TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
-@@ -1871,20 +1871,20 @@ fi
+@@ -1882,20 +1882,20 @@ fi
  # link against the non-stubbed Tcl library.
  #--------------------------------------------------------------------
  
@@ -67,8 +67,8 @@ $NetBSD: patch-ac,v 1.3 2004/05/12 23:38:35 minskim Exp $
  	;;
      *)
  	if test "${SHARED_BUILD}" = "1" ; then
--	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
-+	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/itclStubLib.lo"
+-	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
++	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/itclStubLib.lo"
  	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
  	    RANLIB=:
  	else
diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad
index 2e30a025749..87a91782b4c 100644
--- a/lang/tcl-itcl/patches/patch-ad
+++ b/lang/tcl-itcl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2001/05/01 16:13:54 jtb Exp $
+$NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $
 
 --- itk/Makefile.in.orig	Tue Aug 29 03:58:00 2000
 +++ itk/Makefile.in
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.2 2001/05/01 16:13:54 jtb Exp $
 +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
 -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk83 -ltcl83 -lX11 -lm
++SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk -ltcl -lX11 -lm
  STLIB_LD = @STLIB_LD@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_DEFS = @TCL_DEFS@
diff --git a/lang/tcl-itcl/patches/patch-ae b/lang/tcl-itcl/patches/patch-ae
index 5c6d97afd4f..e69de29bb2d 100644
--- a/lang/tcl-itcl/patches/patch-ae
+++ b/lang/tcl-itcl/patches/patch-ae
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $
-
---- iwidgets2.2.0/Makefile.in.orig	Tue Aug 29 15:58:00 2000
-+++ iwidgets2.2.0/Makefile.in	Thu Nov  9 17:34:21 2000
-@@ -40,7 +40,7 @@
- INSTALL_ROOT =
- 
- # Path name to use when installing library scripts:
--SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(VERSION)
-+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/tcl/iwidgets$(VERSION)
- 
- # Directory in which to install the archive libtcl.a:
- LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
diff --git a/lang/tcl-itcl/patches/patch-af b/lang/tcl-itcl/patches/patch-af
index 638279167ce..e69de29bb2d 100644
--- a/lang/tcl-itcl/patches/patch-af
+++ b/lang/tcl-itcl/patches/patch-af
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $
-
---- iwidgets3.0.0/Makefile.in.orig	Tue Aug 29 15:58:00 2000
-+++ iwidgets3.0.0/Makefile.in	Fri Nov 10 00:01:46 2000
-@@ -40,7 +40,7 @@
- INSTALL_ROOT =
- 
- # Path name to use when installing library scripts:
--SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(VERSION)
-+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/tcl/iwidgets$(VERSION)
- 
- # Directory in which to install the archive libtcl.a:
- LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
-@@ -163,8 +163,8 @@
- 
- install-libraries:
- 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
--	@rm -f $(LIB_INSTALL_DIR)/iwidgets
--	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
-+	@rm -f $(LIB_INSTALL_DIR)/tcl/iwidgets
-+	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/tcl/iwidgets
- 	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
- 	@echo "Installing files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
- 	@for i in $(GENERIC_DIR)/*.tcl $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
diff --git a/lang/tcl-itcl/patches/patch-ag b/lang/tcl-itcl/patches/patch-ag
index 87693e95534..5ff4d68bd74 100644
--- a/lang/tcl-itcl/patches/patch-ag
+++ b/lang/tcl-itcl/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2004/05/12 23:38:35 minskim Exp $
+$NetBSD: patch-ag,v 1.3 2005/10/26 04:22:38 minskim Exp $
 
---- itcl/generic/itcl_cmds.c.orig	2000-08-28 22:58:00.000000000 -0500
+--- itcl/generic/itcl_cmds.c.orig	2001-05-21 20:50:21.000000000 -0500
 +++ itcl/generic/itcl_cmds.c
 @@ -62,9 +62,9 @@ namespace eval ::itcl {\n\
              if {[info exists env(ITCL_LIBRARY)]} {\n\
diff --git a/lang/tcl-itcl/patches/patch-ah b/lang/tcl-itcl/patches/patch-ah
index 3006dfeb6ab..dc2ac9fcfc6 100644
--- a/lang/tcl-itcl/patches/patch-ah
+++ b/lang/tcl-itcl/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2004/05/12 23:38:35 minskim Exp $
+$NetBSD: patch-ah,v 1.3 2005/10/26 04:22:38 minskim Exp $
 
---- itk/generic/itk_cmds.c.orig	2000-08-28 22:58:00.000000000 -0500
+--- itk/generic/itk_cmds.c.orig	2001-06-21 23:38:54.000000000 -0500
 +++ itk/generic/itk_cmds.c
-@@ -55,9 +55,9 @@ namespace eval ::itk {\n\
+@@ -67,7 +67,7 @@ namespace eval ::itk {\n\
              if {[info exists env(ITK_LIBRARY)]} {\n\
                  lappend dirs $env(ITK_LIBRARY)\n\
              }\n\