import tcl-itcl-current-20040920. This is a snapshot from the [incr Tcl] CVS

repository.  They have not made a release in years but development
has continued.

The largest item of note is this version works with tcl-8.4.


[incr Tcl] provides the extra language support needed to build large Tcl/Tk
applications. It introduces the notion of objects, which act as building
blocks for an application. Each object is a bag of data with a set of
procedures or "methods" that are used to manipulate it. Objects are organized
into "classes" with identical characteristics, and classes can inherit
functionality from one another. This object-oriented paradigm adds another
level of organization on top of the basic variable/procedure elements, and
the resulting code is easier to understand and maintain.

This package is based on CVS sources for [incr Tcl].

13 files changed, 619 insertions, 0 deletions

diff --git a/lang/tcl-itcl-current/DESCR b/lang/tcl-itcl-current/DESCR
new file mode 100644
index 00000000000..ff2d5fd6fa5
--- /dev/null
+++ b/lang/tcl-itcl-current/DESCR
@@ -0,0 +1,10 @@
+[incr Tcl] provides the extra language support needed to build large Tcl/Tk
+applications. It introduces the notion of objects, which act as building
+blocks for an application. Each object is a bag of data with a set of
+procedures or "methods" that are used to manipulate it. Objects are organized
+into "classes" with identical characteristics, and classes can inherit
+functionality from one another. This object-oriented paradigm adds another
+level of organization on top of the basic variable/procedure elements, and
+the resulting code is easier to understand and maintain.
+
+This package is based on CVS sources for [incr Tcl].
diff --git a/lang/tcl-itcl-current/Makefile b/lang/tcl-itcl-current/Makefile
new file mode 100644
index 00000000000..a8761de29db
--- /dev/null
+++ b/lang/tcl-itcl-current/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+DISTNAME=	tcl-itcl-20040920
+PKGNAME=	${DISTNAME:S/itcl/itcl-current/}
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://tcltk.com/itcl/
+COMMENT=	[incr Tcl] object-oriented extension to Tcl/Tk.  CVS snapshot
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+CONFLICTS+=	tcl-itcl-[0-9]*
+
+WRKSRC=		${WRKDIR}/tcl-itcl-3.3
+USE_BUILDLINK3=	yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib	\
+		--with-tk=${BUILDLINK_PREFIX.tk}/lib	\
+		--enable-shared
+
+MAKE_ENV+=	TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl-current/PLIST b/lang/tcl-itcl-current/PLIST
new file mode 100644
index 00000000000..45bc24a0a91
--- /dev/null
+++ b/lang/tcl-itcl-current/PLIST
@@ -0,0 +1,296 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+include/itcl.h
+include/itclDecls.h
+include/itclInt.h
+include/itclIntDecls.h
+include/itk.h
+include/itkDecls.h
+lib/iwidgets
+lib/itclConfig.sh
+lib/tcl/itcl3.3/pkgIndex.tcl
+lib/tcl/itcl3.3/itcl.tcl
+lib/tcl/itcl3.3/libitcl33.so
+lib/tcl/itcl3.3/libitcl33.so.0
+lib/tcl/itcl3.3/libitcl33.so.0.0
+lib/tcl/itcl3.3/libitcl33.la
+lib/tcl/itcl3.3/libitcl33.a
+lib/tcl/itcl3.3/libitclstub33.a
+lib/tcl/itk3.3/pkgIndex.tcl
+lib/tcl/itk3.3/Archetype.itk
+lib/tcl/itk3.3/Toplevel.itk
+lib/tcl/itk3.3/Widget.itk
+lib/tcl/itk3.3/itk.tcl
+lib/tcl/itk3.3/tclIndex
+lib/tcl/itk3.3/libitk33.so
+lib/tcl/itk3.3/libitk33.so.0
+lib/tcl/itk3.3/libitk33.so.0.0
+lib/tcl/itk3.3/libitk33.la
+lib/tcl/itk3.3/libitk33.a
+lib/tcl/iwidgets/scripts/buttonbox.itk
+lib/tcl/iwidgets/scripts/calendar.itk
+lib/tcl/iwidgets/scripts/canvasprintbox.itk
+lib/tcl/iwidgets/scripts/canvasprintdialog.itk
+lib/tcl/iwidgets/scripts/checkbox.itk
+lib/tcl/iwidgets/scripts/combobox.itk
+lib/tcl/iwidgets/scripts/dateentry.itk
+lib/tcl/iwidgets/scripts/datefield.itk
+lib/tcl/iwidgets/scripts/dialog.itk
+lib/tcl/iwidgets/scripts/dialogshell.itk
+lib/tcl/iwidgets/scripts/disjointlistbox.itk
+lib/tcl/iwidgets/scripts/entryfield.itk
+lib/tcl/iwidgets/scripts/extbutton.itk
+lib/tcl/iwidgets/scripts/extfileselectionbox.itk
+lib/tcl/iwidgets/scripts/extfileselectiondialog.itk
+lib/tcl/iwidgets/scripts/feedback.itk
+lib/tcl/iwidgets/scripts/fileselectionbox.itk
+lib/tcl/iwidgets/scripts/fileselectiondialog.itk
+lib/tcl/iwidgets/scripts/finddialog.itk
+lib/tcl/iwidgets/scripts/hierarchy.itk
+lib/tcl/iwidgets/scripts/hyperhelp.itk
+lib/tcl/iwidgets/scripts/labeledframe.itk
+lib/tcl/iwidgets/scripts/labeledwidget.itk
+lib/tcl/iwidgets/scripts/mainwindow.itk
+lib/tcl/iwidgets/scripts/menubar.itk
+lib/tcl/iwidgets/scripts/messagebox.itk
+lib/tcl/iwidgets/scripts/messagedialog.itk
+lib/tcl/iwidgets/scripts/notebook.itk
+lib/tcl/iwidgets/scripts/optionmenu.itk
+lib/tcl/iwidgets/scripts/pane.itk
+lib/tcl/iwidgets/scripts/panedwindow.itk
+lib/tcl/iwidgets/scripts/promptdialog.itk
+lib/tcl/iwidgets/scripts/pushbutton.itk
+lib/tcl/iwidgets/scripts/radiobox.itk
+lib/tcl/iwidgets/scripts/regexpfield.itk
+lib/tcl/iwidgets/scripts/scrolledcanvas.itk
+lib/tcl/iwidgets/scripts/scrolledframe.itk
+lib/tcl/iwidgets/scripts/scrolledhtml.itk
+lib/tcl/iwidgets/scripts/scrolledlistbox.itk
+lib/tcl/iwidgets/scripts/scrolledtext.itk
+lib/tcl/iwidgets/scripts/scrolledwidget.itk
+lib/tcl/iwidgets/scripts/selectionbox.itk
+lib/tcl/iwidgets/scripts/selectiondialog.itk
+lib/tcl/iwidgets/scripts/shell.itk
+lib/tcl/iwidgets/scripts/spindate.itk
+lib/tcl/iwidgets/scripts/spinint.itk
+lib/tcl/iwidgets/scripts/spinner.itk
+lib/tcl/iwidgets/scripts/spintime.itk
+lib/tcl/iwidgets/scripts/tabnotebook.itk
+lib/tcl/iwidgets/scripts/tabset.itk
+lib/tcl/iwidgets/scripts/timeentry.itk
+lib/tcl/iwidgets/scripts/timefield.itk
+lib/tcl/iwidgets/scripts/toolbar.itk
+lib/tcl/iwidgets/scripts/watch.itk
+lib/tcl/iwidgets/scripts/colors.itcl
+lib/tcl/iwidgets/scripts/roman.itcl
+lib/tcl/iwidgets/scripts/scopedobject.itcl
+lib/tcl/iwidgets/scripts/tclIndex
+lib/tcl/iwidgets/scripts/unknownimage.gif
+lib/tcl/iwidgets/demos/images/box.xbm
+lib/tcl/iwidgets/demos/images/clear.gif
+lib/tcl/iwidgets/demos/images/close.gif
+lib/tcl/iwidgets/demos/images/copy.gif
+lib/tcl/iwidgets/demos/images/cut.gif
+lib/tcl/iwidgets/demos/images/exit.gif
+lib/tcl/iwidgets/demos/images/find.gif
+lib/tcl/iwidgets/demos/images/help.gif
+lib/tcl/iwidgets/demos/images/line.xbm
+lib/tcl/iwidgets/demos/images/mag.gif
+lib/tcl/iwidgets/demos/images/new.gif
+lib/tcl/iwidgets/demos/images/open.gif
+lib/tcl/iwidgets/demos/images/oval.xbm
+lib/tcl/iwidgets/demos/images/paste.gif
+lib/tcl/iwidgets/demos/images/points.xbm
+lib/tcl/iwidgets/demos/images/poly.gif
+lib/tcl/iwidgets/demos/images/print.gif
+lib/tcl/iwidgets/demos/images/ruler.gif
+lib/tcl/iwidgets/demos/images/save.gif
+lib/tcl/iwidgets/demos/images/select.gif
+lib/tcl/iwidgets/demos/images/text.xbm
+lib/tcl/iwidgets/demos/html/buttonbox.n.html
+lib/tcl/iwidgets/demos/html/calendar.n.html
+lib/tcl/iwidgets/demos/html/canvasprintbox.n.html
+lib/tcl/iwidgets/demos/html/canvasprintdialog.n.html
+lib/tcl/iwidgets/demos/html/checkbox.n.html
+lib/tcl/iwidgets/demos/html/combobox.n.html
+lib/tcl/iwidgets/demos/html/dateentry.n.html
+lib/tcl/iwidgets/demos/html/datefield.n.html
+lib/tcl/iwidgets/demos/html/dialog.n.html
+lib/tcl/iwidgets/demos/html/dialogshell.n.html
+lib/tcl/iwidgets/demos/html/disjointlistbox.n.html
+lib/tcl/iwidgets/demos/html/entryfield.n.html
+lib/tcl/iwidgets/demos/html/extbutton.n.html
+lib/tcl/iwidgets/demos/html/extfileselectionbox.n.html
+lib/tcl/iwidgets/demos/html/extfileselectiondialog.n.html
+lib/tcl/iwidgets/demos/html/feedback.n.html
+lib/tcl/iwidgets/demos/html/finddialog.n.html
+lib/tcl/iwidgets/demos/html/fileselectionbox.n.html
+lib/tcl/iwidgets/demos/html/fileselectiondialog.n.html
+lib/tcl/iwidgets/demos/html/hierarchy.n.html
+lib/tcl/iwidgets/demos/html/hyperhelp.n.html
+lib/tcl/iwidgets/demos/html/iwidgets4.0.0UserCmds.html
+lib/tcl/iwidgets/demos/html/labeledframe.n.html
+lib/tcl/iwidgets/demos/html/labeledwidget.n.html
+lib/tcl/iwidgets/demos/html/mainwindow.n.html
+lib/tcl/iwidgets/demos/html/menubar.n.html
+lib/tcl/iwidgets/demos/html/messagebox.n.html
+lib/tcl/iwidgets/demos/html/messagedialog.n.html
+lib/tcl/iwidgets/demos/html/notebook.n.html
+lib/tcl/iwidgets/demos/html/optionmenu.n.html
+lib/tcl/iwidgets/demos/html/panedwindow.n.html
+lib/tcl/iwidgets/demos/html/promptdialog.n.html
+lib/tcl/iwidgets/demos/html/pushbutton.n.html
+lib/tcl/iwidgets/demos/html/radiobox.n.html
+lib/tcl/iwidgets/demos/html/scopedobject.n.html
+lib/tcl/iwidgets/demos/html/scrolledcanvas.n.html
+lib/tcl/iwidgets/demos/html/scrolledframe.n.html
+lib/tcl/iwidgets/demos/html/scrolledhtml.n.html
+lib/tcl/iwidgets/demos/html/scrolledlistbox.n.html
+lib/tcl/iwidgets/demos/html/scrolledtext.n.html
+lib/tcl/iwidgets/demos/html/selectionbox.n.html
+lib/tcl/iwidgets/demos/html/selectiondialog.n.html
+lib/tcl/iwidgets/demos/html/shell.n.html
+lib/tcl/iwidgets/demos/html/spindate.n.html
+lib/tcl/iwidgets/demos/html/spinint.n.html
+lib/tcl/iwidgets/demos/html/spinner.n.html
+lib/tcl/iwidgets/demos/html/spintime.n.html
+lib/tcl/iwidgets/demos/html/tabnotebook.n.html
+lib/tcl/iwidgets/demos/html/tabset.n.html
+lib/tcl/iwidgets/demos/html/timeentry.n.html
+lib/tcl/iwidgets/demos/html/timefield.n.html
+lib/tcl/iwidgets/demos/html/toolbar.n.html
+lib/tcl/iwidgets/demos/html/watch.n.html
+lib/tcl/iwidgets/demos/buttonbox
+lib/tcl/iwidgets/demos/calendar
+lib/tcl/iwidgets/demos/canvasprintbox
+lib/tcl/iwidgets/demos/canvasprintdialog
+lib/tcl/iwidgets/demos/catalog
+lib/tcl/iwidgets/demos/checkbox
+lib/tcl/iwidgets/demos/combobox
+lib/tcl/iwidgets/demos/dateentry
+lib/tcl/iwidgets/demos/datefield
+lib/tcl/iwidgets/demos/demo.html
+lib/tcl/iwidgets/demos/dialog
+lib/tcl/iwidgets/demos/dialogshell
+lib/tcl/iwidgets/demos/disjointlistbox
+lib/tcl/iwidgets/demos/entryfield
+lib/tcl/iwidgets/demos/extbutton
+lib/tcl/iwidgets/demos/extfileselectionbox
+lib/tcl/iwidgets/demos/extfileselectiondialog
+lib/tcl/iwidgets/demos/feedback
+lib/tcl/iwidgets/demos/fileselectionbox
+lib/tcl/iwidgets/demos/fileselectiondialog
+lib/tcl/iwidgets/demos/finddialog
+lib/tcl/iwidgets/demos/hierarchy
+lib/tcl/iwidgets/demos/hyperhelp
+lib/tcl/iwidgets/demos/iwidgets.gif
+lib/tcl/iwidgets/demos/labeledframe
+lib/tcl/iwidgets/demos/labeledwidget
+lib/tcl/iwidgets/demos/mainwindow
+lib/tcl/iwidgets/demos/menubar
+lib/tcl/iwidgets/demos/messagebox
+lib/tcl/iwidgets/demos/messagedialog
+lib/tcl/iwidgets/demos/notebook
+lib/tcl/iwidgets/demos/optionmenu
+lib/tcl/iwidgets/demos/panedwindow
+lib/tcl/iwidgets/demos/promptdialog
+lib/tcl/iwidgets/demos/pushbutton
+lib/tcl/iwidgets/demos/radiobox
+lib/tcl/iwidgets/demos/scopedobject
+lib/tcl/iwidgets/demos/scrolledcanvas
+lib/tcl/iwidgets/demos/scrolledframe
+lib/tcl/iwidgets/demos/scrolledhtml
+lib/tcl/iwidgets/demos/scrolledlistbox
+lib/tcl/iwidgets/demos/scrolledtext
+lib/tcl/iwidgets/demos/selectionbox
+lib/tcl/iwidgets/demos/selectiondialog
+lib/tcl/iwidgets/demos/shell
+lib/tcl/iwidgets/demos/spindate
+lib/tcl/iwidgets/demos/spinint
+lib/tcl/iwidgets/demos/spinner
+lib/tcl/iwidgets/demos/spintime
+lib/tcl/iwidgets/demos/tabnotebook
+lib/tcl/iwidgets/demos/tabset
+lib/tcl/iwidgets/demos/timeentry
+lib/tcl/iwidgets/demos/timefield
+lib/tcl/iwidgets/demos/toolbar
+lib/tcl/iwidgets/demos/watch
+lib/tcl/iwidgets/iwidgets.tcl
+lib/tcl/iwidgets/pkgIndex.tcl
+lib/tcl/iwidgets/license.terms
+man/mann/Archetype.n
+man/mann/Toplevel.n
+man/mann/Widget.n
+man/mann/body.n
+man/mann/class.n
+man/mann/code.n
+man/mann/configbody.n
+man/mann/delete.n
+man/mann/ensemble.n
+man/mann/find.n
+man/mann/is.n
+man/mann/itcl.n
+man/mann/itclvars.n
+man/mann/itk.n
+man/mann/itkvars.n
+man/mann/iwidgets_buttonbox.n
+man/mann/iwidgets_calendar.n
+man/mann/iwidgets_canvasprintbox.n
+man/mann/iwidgets_canvasprintdialog.n
+man/mann/iwidgets_checkbox.n
+man/mann/iwidgets_combobox.n
+man/mann/iwidgets_dateentry.n
+man/mann/iwidgets_datefield.n
+man/mann/iwidgets_dialog.n
+man/mann/iwidgets_dialogshell.n
+man/mann/iwidgets_disjointlistbox.n
+man/mann/iwidgets_entryfield.n
+man/mann/iwidgets_extbutton.n
+man/mann/iwidgets_extfileselectionbox.n
+man/mann/iwidgets_extfileselectiondialog.n
+man/mann/iwidgets_feedback.n
+man/mann/iwidgets_fileselectionbox.n
+man/mann/iwidgets_fileselectiondialog.n
+man/mann/iwidgets_finddialog.n
+man/mann/iwidgets_hierarchy.n
+man/mann/iwidgets_hyperhelp.n
+man/mann/iwidgets_labeledframe.n
+man/mann/iwidgets_labeledwidget.n
+man/mann/iwidgets_mainwindow.n
+man/mann/iwidgets_menubar.n
+man/mann/iwidgets_messagebox.n
+man/mann/iwidgets_messagedialog.n
+man/mann/iwidgets_notebook.n
+man/mann/iwidgets_optionmenu.n
+man/mann/iwidgets_panedwindow.n
+man/mann/iwidgets_promptdialog.n
+man/mann/iwidgets_pushbutton.n
+man/mann/iwidgets_radiobox.n
+man/mann/iwidgets_scopedobject.n
+man/mann/iwidgets_scrolledcanvas.n
+man/mann/iwidgets_scrolledframe.n
+man/mann/iwidgets_scrolledhtml.n
+man/mann/iwidgets_scrolledlistbox.n
+man/mann/iwidgets_scrolledtext.n
+man/mann/iwidgets_selectionbox.n
+man/mann/iwidgets_selectiondialog.n
+man/mann/iwidgets_shell.n
+man/mann/iwidgets_spindate.n
+man/mann/iwidgets_spinint.n
+man/mann/iwidgets_spinner.n
+man/mann/iwidgets_spintime.n
+man/mann/iwidgets_tabnotebook.n
+man/mann/iwidgets_tabset.n
+man/mann/iwidgets_timeentry.n
+man/mann/iwidgets_timefield.n
+man/mann/iwidgets_toolbar.n
+man/mann/iwidgets_watch.n
+man/mann/local.n
+man/mann/scope.n
+man/mann/usual.n
+@dirrm lib/tcl/itcl3.3
+@dirrm lib/tcl/itk3.3
+@dirrm lib/tcl/iwidgets/scripts
+@dirrm lib/tcl/iwidgets/demos/images
+@dirrm lib/tcl/iwidgets/demos/html
+@dirrm lib/tcl/iwidgets/demos
+@dirrm lib/tcl/iwidgets
diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk
new file mode 100644
index 00000000000..298f5d0b901
--- /dev/null
+++ b/lang/tcl-itcl-current/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+TCL_ITCL_CURRENT_BUILDLINK3_MK:=	${TCL_ITCL_CURRENT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tcl-itcl-current
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl-current}
+BUILDLINK_PACKAGES+=	tcl-itcl-current
+
+.if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-itcl-current+=	tcl-itcl-current>=20040920
+BUILDLINK_PKGSRCDIR.tcl-itcl-current?=	../../lang/tcl-itcl-current
+.endif	# TCL_ITCL_CURRENT_BUILDLINK3_MK
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-itcl-current/distinfo b/lang/tcl-itcl-current/distinfo
new file mode 100644
index 00000000000..4d146fc404b
--- /dev/null
+++ b/lang/tcl-itcl-current/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+SHA1 (tcl-itcl-20040920.tar.gz) = 469d8df8d7b506e7d175eb5a15fe68b5a60e95c6
+Size (tcl-itcl-20040920.tar.gz) = 1133945 bytes
+SHA1 (patch-aa) = 181176465cd8891710dcd029c09fd0350e8dc47c
+SHA1 (patch-ab) = f6c9ef0d8a63d46459106438f6841d715a0cd209
+SHA1 (patch-ac) = 436198562c52f6b6b8e84ba812ba4ce7e8e93eb5
+SHA1 (patch-ad) = 0b30aabd3afc00020bfd0779997672e3cca929c6
+SHA1 (patch-ae) = 595d5fa2c322a6726af21f87cb5a74feadb9d515
+SHA1 (patch-ag) = 5b21951b82de53875efd5289dd87abae8bb11073
+SHA1 (patch-ah) = 58985a1b21625fc00dbbfe4e793dcbb2f7ef2929
+SHA1 (patch-ai) = 706151bc08f654aec1d2cce39fa794e516eae9a5
diff --git a/lang/tcl-itcl-current/patches/patch-aa b/lang/tcl-itcl-current/patches/patch-aa
new file mode 100644
index 00000000000..372935730f7
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itcl/configure.orig	Wed Sep  8 01:23:50 2004
++++ itcl/configure
+@@ -5883,7 +5883,7 @@ echo $ECHO_N "checking for Tcl private i
+ 
+ 	TCL_INCLUDES="-I${TCL_GENERIC_DIR_NATIVE} -I${TCL_PLATFORM_DIR_NATIVE}"
+     else
+-	TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
++	TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
+ 	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'
+@@ -8591,8 +8591,8 @@ fi
+ 	MAKE_STUB_LIB="\${STLIB_LD} -out:\$@ \$(PKG_STUB_OBJECTS)"
+     else
+ 	MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)"
+-	MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS}"
+-	MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)"
++	MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
++	MAKE_STUB_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_STUB_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
+     fi
+ 
+     if test "${SHARED_BUILD}" = "1" ; then
diff --git a/lang/tcl-itcl-current/patches/patch-ab b/lang/tcl-itcl-current/patches/patch-ab
new file mode 100644
index 00000000000..a45e9b6d851
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ab
@@ -0,0 +1,64 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itcl/Makefile.in.orig	Tue Aug 17 17:47:18 2004
++++ itcl/Makefile.in
+@@ -77,19 +77,19 @@ DESTDIR		=
+ 
+ PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir	= $(datadir)/$(PKG_DIR)
+-pkglibdir	= $(libdir)/$(PKG_DIR)
++pkglibdir	= $(libdir)/tcl/$(PKG_DIR)
+ pkgincludedir	= $(includedir)/$(PKG_DIR)
+ 
+ top_builddir	= .
+ 
+-INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+-INSTALL_DATA	= @INSTALL_DATA@
+-INSTALL_SCRIPT	= @INSTALL_SCRIPT@
++INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
++INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
++INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
++INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
+ 
+ PACKAGE_NAME	= @PACKAGE_NAME@
+ PACKAGE_VERSION	= @PACKAGE_VERSION@
+-CC		= @CC@
++CC		= ${LIBTOOL} --mode=compile @CC@
+ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+ CFLAGS_WARNING	= @CFLAGS_WARNING@
+ CLEANFILES	= @CLEANFILES@
+@@ -103,9 +103,9 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
+ SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl84 -lm
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+@@ -231,12 +231,10 @@ depend:
+ $(PKG_LIB_FILE): $(PKG_OBJECTS)
+ 	-rm -f $(PKG_LIB_FILE)
+ 	${MAKE_LIB}
+-	$(RANLIB) $(PKG_LIB_FILE)
+ 
+ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
+ 	-rm -f $(PKG_STUB_LIB_FILE)
+ 	${MAKE_STUB_LIB}
+-	$(RANLIB_STUB) $(PKG_STUB_LIB_FILE)
+ 
+ #========================================================================
+ # We need to enumerate the list of .c to .o lines here.
+@@ -292,7 +290,7 @@ distclean: clean
+ 
+ install-lib-binaries:
+ 	@mkdir -p $(DESTDIR)$(pkglibdir)
+-	@list='$(lib_BINARIES)'; for p in $$list; do \
++	@list='${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+ 	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
diff --git a/lang/tcl-itcl-current/patches/patch-ac b/lang/tcl-itcl-current/patches/patch-ac
new file mode 100644
index 00000000000..7481f9ec0f9
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itk/configure.orig	Wed Sep  8 01:23:51 2004
++++ itk/configure
+@@ -6142,7 +6142,7 @@ echo $ECHO_N "checking for Tcl private i
+ 
+ 	TCL_INCLUDES="-I${TCL_GENERIC_DIR_NATIVE} -I${TCL_PLATFORM_DIR_NATIVE}"
+     else
+-	TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
++	TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
+ 	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'
+@@ -9338,8 +9338,8 @@ fi
+ 	MAKE_STUB_LIB="\${STLIB_LD} -out:\$@ \$(PKG_STUB_OBJECTS)"
+     else
+ 	MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(PKG_OBJECTS)"
+-	MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(PKG_OBJECTS) \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS}"
+-	MAKE_STUB_LIB="\${STLIB_LD} \$@ \$(PKG_STUB_OBJECTS)"
++	MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
++	MAKE_STUB_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${PKG_STUB_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
+     fi
+ 
+     if test "${SHARED_BUILD}" = "1" ; then
+@@ -9407,7 +9407,7 @@ fi
+ if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+     SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${itcl_STUB_LIB_PATH}`\""
+ else
+-    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${itcl_STUB_LIB_SPEC}"
++    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/itclStubLib.lo"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/lang/tcl-itcl-current/patches/patch-ad b/lang/tcl-itcl-current/patches/patch-ad
new file mode 100644
index 00000000000..2d4aa41c3b7
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ad
@@ -0,0 +1,64 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itk/Makefile.in.orig	Tue Aug 17 17:47:18 2004
++++ itk/Makefile.in
+@@ -96,19 +96,19 @@ DESTDIR		=
+ 
+ PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir	= $(datadir)/$(PKG_DIR)
+-pkglibdir	= $(libdir)/$(PKG_DIR)
++pkglibdir	= $(libdir)/tcl/$(PKG_DIR)
+ pkgincludedir	= $(includedir)/$(PKG_DIR)
+ 
+ top_builddir	= .
+ 
+-INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+-INSTALL_DATA	= @INSTALL_DATA@
+-INSTALL_SCRIPT	= @INSTALL_SCRIPT@
++INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
++INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
++INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
++INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
+ 
+ PACKAGE_NAME	= @PACKAGE_NAME@
+ PACKAGE_VERSION	= @PACKAGE_VERSION@
+-CC		= @CC@
++CC		= ${LIBTOOL} --mode=compile @CC@
+ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+ CFLAGS_WARNING	= @CFLAGS_WARNING@
+ CLEANFILES	= @CLEANFILES@
+@@ -122,9 +122,9 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
+ SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk84 -ltcl84 -lX11 -lm
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+@@ -256,12 +256,10 @@ depend:
+ $(PKG_LIB_FILE): $(PKG_OBJECTS)
+ 	-rm -f $(PKG_LIB_FILE)
+ 	${MAKE_LIB}
+-	$(RANLIB) $(PKG_LIB_FILE)
+ 
+ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
+ 	-rm -f $(PKG_STUB_LIB_FILE)
+ 	${MAKE_STUB_LIB}
+-	$(RANLIB_STUB) $(PKG_STUB_LIB_FILE)
+ 
+ #========================================================================
+ # We need to enumerate the list of .c to .o lines here.
+@@ -317,7 +315,7 @@ distclean: clean
+ 
+ install-lib-binaries:
+ 	@mkdir -p $(DESTDIR)$(pkglibdir)
+-	@list='$(lib_BINARIES)'; for p in $$list; do \
++	@list='${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+ 	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
diff --git a/lang/tcl-itcl-current/patches/patch-ae b/lang/tcl-itcl-current/patches/patch-ae
new file mode 100644
index 00000000000..bda33889029
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- iwidgets/Makefile.in.orig	Wed Sep 25 23:12:59 2002
++++ iwidgets/Makefile.in
+@@ -40,7 +40,7 @@ libdir = @libdir@
+ INSTALL_ROOT =
+ 
+ # Path name to use when installing library scripts:
+-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)/iwidgets$(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)$(libdir)
diff --git a/lang/tcl-itcl-current/patches/patch-ag b/lang/tcl-itcl-current/patches/patch-ag
new file mode 100644
index 00000000000..a94e22ac078
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itcl/generic/itcl_cmds.c.orig	2000-08-28 22:58:00.000000000 -0500
++++ itcl/generic/itcl_cmds.c
+@@ -62,9 +62,9 @@ namespace eval ::itcl {\n\
+             if {[info exists env(ITCL_LIBRARY)]} {\n\
+                 lappend dirs $env(ITCL_LIBRARY)\n\
+             }\n\
+-            lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\
++            lappend dirs [file join [file dirname $tcl_library] tcl itcl$version]\n\
+             set bindir [file dirname [info nameofexecutable]]\n\
+-            lappend dirs [file join $bindir .. lib itcl$version]\n\
++            lappend dirs [file join $bindir .. lib tcl itcl$version]\n\
+             lappend dirs [file join $bindir .. library]\n\
+             lappend dirs [file join $bindir .. .. library]\n\
+             lappend dirs [file join $bindir .. .. itcl library]\n\
diff --git a/lang/tcl-itcl-current/patches/patch-ah b/lang/tcl-itcl-current/patches/patch-ah
new file mode 100644
index 00000000000..a796770eb90
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- itk/generic/itk_cmds.c.orig	2000-08-28 22:58:00.000000000 -0500
++++ itk/generic/itk_cmds.c
+@@ -55,9 +55,9 @@ namespace eval ::itk {\n\
+             if {[info exists env(ITK_LIBRARY)]} {\n\
+                 lappend dirs $env(ITK_LIBRARY)\n\
+             }\n\
+-            lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
++            lappend dirs [file join [file dirname $tcl_library] tcl itk$version]\n\
+             set bindir [file dirname [info nameofexecutable]]\n\
+-            lappend dirs [file join $bindir .. lib itk$version]\n\
++            lappend dirs [file join $bindir .. lib tcl itk$version]\n\
+             lappend dirs [file join $bindir .. library]\n\
+             lappend dirs [file join $bindir .. .. library]\n\
+             lappend dirs [file join $bindir .. .. itk library]\n\
diff --git a/lang/tcl-itcl-current/patches/patch-ai b/lang/tcl-itcl-current/patches/patch-ai
new file mode 100644
index 00000000000..3f80efa6e6b
--- /dev/null
+++ b/lang/tcl-itcl-current/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $
+
+--- configure.orig	Tue Aug 10 20:58:44 2004
++++ configure
+@@ -270,7 +270,7 @@ PACKAGE_VERSION='3.3'
+ PACKAGE_STRING='itcl-master 3.3'
+ PACKAGE_BUGREPORT=''
+ 
+-ac_subdirs_all="$ac_subdirs_all itcl itk"
++ac_subdirs_all="$ac_subdirs_all itcl itk iwidgets"
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS subdirs LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+@@ -1512,7 +1512,7 @@ echo "$as_me: --exec-prefix defaulting t
+ 
+ 
+ 
+-subdirs="$subdirs itcl itk"
++subdirs="$subdirs itcl itk iwidgets"
+ 
+ 
+           ac_config_files="$ac_config_files Makefile"