Update to Ruby 1.8.2 base and thses changes:

	* ext/tk/lib/multi-tk.rb: ditto

	* some fixes to run examples (not yet complete).

6 files changed, 720 insertions, 34 deletions

diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index 6f27cf5ad8d..0f01d3e29f4 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/11/28 06:32:53 taca Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/23 17:37:48 taca Exp $
 # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -12,6 +12,7 @@ COMMENT=	Ruby interface to the Tk widget set
 
 DEPENDS+=	${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION_SUPPORTED=	18
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
@@ -21,7 +22,7 @@ WRKSRC=			${RUBY_WRKSRC}/ext/tk
 
 REPLACE_RUBY_DIRS=	${WRKSRC}/sample
 
-post-patch:
+pre-configure:
 	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) \
 		-exec rm -f {} \;
 
diff --git a/x11/ruby-tk/PLIST b/x11/ruby-tk/PLIST
index 13668d3a58e..d64597f134a 100644
--- a/x11/ruby-tk/PLIST
+++ b/x11/ruby-tk/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/04 17:20:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 17:37:48 taca Exp $
 ${RUBY_SITEARCHLIBDIR}/tkutil.${RUBY_DLEXT}
 ${RUBY_SITELIBDIR}/multi-tk.rb
+${RUBY_SITELIBDIR}/remote-tk.rb
 ${RUBY_SITELIBDIR}/tk.rb
 ${RUBY_SITELIBDIR}/tkafter.rb
 ${RUBY_SITELIBDIR}/tkbgerror.rb
@@ -18,9 +19,302 @@ ${RUBY_SITELIBDIR}/tkscrollbox.rb
 ${RUBY_SITELIBDIR}/tktext.rb
 ${RUBY_SITELIBDIR}/tkvirtevent.rb
 ${RUBY_SITELIBDIR}/tkwinpkg.rb
+${RUBY_SITELIBDIR}/tk/autoload.rb
+${RUBY_SITELIBDIR}/tk/after.rb
+${RUBY_SITELIBDIR}/tk/checkbutton.rb
+${RUBY_SITELIBDIR}/tk/bgerror.rb
+${RUBY_SITELIBDIR}/tk/bindtag.rb
+${RUBY_SITELIBDIR}/tk/button.rb
+${RUBY_SITELIBDIR}/tk/canvas.rb
+${RUBY_SITELIBDIR}/tk/canvastag.rb
+${RUBY_SITELIBDIR}/tk/encodedstr.rb
+${RUBY_SITELIBDIR}/tk/clipboard.rb
+${RUBY_SITELIBDIR}/tk/clock.rb
+${RUBY_SITELIBDIR}/tk/composite.rb
+${RUBY_SITELIBDIR}/tk/console.rb
+${RUBY_SITELIBDIR}/tk/dialog.rb
+${RUBY_SITELIBDIR}/tk/itemconfig.rb
+${RUBY_SITELIBDIR}/tk/entry.rb
+${RUBY_SITELIBDIR}/tk/event.rb
+${RUBY_SITELIBDIR}/tk/font.rb
+${RUBY_SITELIBDIR}/tk/frame.rb
+${RUBY_SITELIBDIR}/tk/grid.rb
+${RUBY_SITELIBDIR}/tk/image.rb
+${RUBY_SITELIBDIR}/tk/labelframe.rb
+${RUBY_SITELIBDIR}/tk/itemfont.rb
+${RUBY_SITELIBDIR}/tk/kinput.rb
+${RUBY_SITELIBDIR}/tk/label.rb
+${RUBY_SITELIBDIR}/tk/panedwindow.rb
+${RUBY_SITELIBDIR}/tk/listbox.rb
+${RUBY_SITELIBDIR}/tk/macpkg.rb
+${RUBY_SITELIBDIR}/tk/menu.rb
+${RUBY_SITELIBDIR}/tk/menubar.rb
+${RUBY_SITELIBDIR}/tk/menuspec.rb
+${RUBY_SITELIBDIR}/tk/message.rb
+${RUBY_SITELIBDIR}/tk/mngfocus.rb
+${RUBY_SITELIBDIR}/tk/msgcat.rb
+${RUBY_SITELIBDIR}/tk/namespace.rb
+${RUBY_SITELIBDIR}/tk/optiondb.rb
+${RUBY_SITELIBDIR}/tk/optionobj.rb
+${RUBY_SITELIBDIR}/tk/pack.rb
+${RUBY_SITELIBDIR}/tk/package.rb
+${RUBY_SITELIBDIR}/tk/palette.rb
+${RUBY_SITELIBDIR}/tk/radiobutton.rb
+${RUBY_SITELIBDIR}/tk/place.rb
+${RUBY_SITELIBDIR}/tk/scrollable.rb
+${RUBY_SITELIBDIR}/tk/root.rb
+${RUBY_SITELIBDIR}/tk/scale.rb
+${RUBY_SITELIBDIR}/tk/textwindow.rb
+${RUBY_SITELIBDIR}/tk/scrollbar.rb
+${RUBY_SITELIBDIR}/tk/text.rb
+${RUBY_SITELIBDIR}/tk/scrollbox.rb
+${RUBY_SITELIBDIR}/tk/selection.rb
+${RUBY_SITELIBDIR}/tk/spinbox.rb
+${RUBY_SITELIBDIR}/tk/tagfont.rb
+${RUBY_SITELIBDIR}/tk/textimage.rb
+${RUBY_SITELIBDIR}/tk/textmark.rb
+${RUBY_SITELIBDIR}/tk/texttag.rb
+${RUBY_SITELIBDIR}/tk/toplevel.rb
+${RUBY_SITELIBDIR}/tk/timer.rb
+${RUBY_SITELIBDIR}/tk/txtwin_abst.rb
+${RUBY_SITELIBDIR}/tk/validation.rb
+${RUBY_SITELIBDIR}/tk/variable.rb
+${RUBY_SITELIBDIR}/tk/virtevent.rb
+${RUBY_SITELIBDIR}/tk/winfo.rb
+${RUBY_SITELIBDIR}/tk/winpkg.rb
+${RUBY_SITELIBDIR}/tk/wm.rb
+${RUBY_SITELIBDIR}/tk/xim.rb
+@dirrm ${RUBY_SITELIBDIR}/tk
+${RUBY_SITELIBDIR}/tkextlib/ICONS.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget.rb
+${RUBY_SITELIBDIR}/tkextlib/blt.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets.rb
+${RUBY_SITELIBDIR}/tkextlib/itcl.rb
+${RUBY_SITELIBDIR}/tkextlib/itk.rb
+${RUBY_SITELIBDIR}/tkextlib/pkg_checker.rb
+${RUBY_SITELIBDIR}/tkextlib/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib.rb
+${RUBY_SITELIBDIR}/tkextlib/tclx.rb
+${RUBY_SITELIBDIR}/tkextlib/tile.rb
+${RUBY_SITELIBDIR}/tkextlib/tkDND.rb
+${RUBY_SITELIBDIR}/tkextlib/tkHTML.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg.rb
+${RUBY_SITELIBDIR}/tkextlib/tktable.rb
+${RUBY_SITELIBDIR}/tkextlib/tktrans.rb
+${RUBY_SITELIBDIR}/tkextlib/treectrl.rb
+${RUBY_SITELIBDIR}/tkextlib/vu.rb
+${RUBY_SITELIBDIR}/tkextlib/winico.rb
+${RUBY_SITELIBDIR}/tkextlib/ICONS/icons.rb
+${RUBY_SITELIBDIR}/tkextlib/ICONS/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/ICONS
+${RUBY_SITELIBDIR}/tkextlib/blt/stripchart.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/barchart.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/bitmap.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/busy.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/component.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/container.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/cutbuffer.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/dragdrop.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/eps.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/graph.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/htext.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/spline.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tabnotebook.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/table.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/win_printer.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tabset.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/ted.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tree.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/treeview.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/unix_dnd.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/vector.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/watch.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/winop.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/checkbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/button.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/radiobutton.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/frame.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/label.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/scrollbar.rb
+${RUBY_SITELIBDIR}/tkextlib/blt/tile/toplevel.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/blt/tile
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/blt
+${RUBY_SITELIBDIR}/tkextlib/bwidget/scrollableframe.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/arrowbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/bitmap.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/button.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/buttonbox.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/combobox.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/dialog.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/dragsite.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/dropsite.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/dynamichelp.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/entry.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/label.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/labelentry.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/labelframe.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/listbox.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/mainframe.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/messagedlg.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/notebook.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/pagesmanager.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/panedwindow.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/passwddlg.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/tree.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/progressbar.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/progressdlg.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/scrolledwindow.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/scrollview.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/selectcolor.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/selectfont.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/separator.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/spinbox.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/titleframe.rb
+${RUBY_SITELIBDIR}/tkextlib/bwidget/widget.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/bwidget
+${RUBY_SITELIBDIR}/tkextlib/itcl/incr_tcl.rb
+${RUBY_SITELIBDIR}/tkextlib/itcl/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/itcl
+${RUBY_SITELIBDIR}/tkextlib/itk/incr_tk.rb
+${RUBY_SITELIBDIR}/tkextlib/itk/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/itk
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/canvasprintbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/buttonbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/calendar.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/extfileselectionbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/canvasprintdialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/checkbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/combobox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/dateentry.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/datefield.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/dialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/dialogshell.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/disjointlistbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/entryfield.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/extbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/spindate.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/extfileselectiondialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/feedback.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/fileselectionbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/menubar.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/fileselectiondialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/finddialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/hierarchy.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/hyperhelp.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/labeledframe.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/labeledwidget.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/mainwindow.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/messagebox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/messagedialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/notebook.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/optionmenu.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/panedwindow.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/promptdialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/pushbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/radiobox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scopedobject.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledcanvas.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledframe.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledhtml.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/shell.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/spinint.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledlistbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledtext.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/scrolledwidget.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/selectionbox.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/selectiondialog.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/tabnotebook.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/spinner.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/spintime.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/tabset.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/timeentry.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/timefield.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/toolbar.rb
+${RUBY_SITELIBDIR}/tkextlib/iwidgets/watch.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/iwidgets
+${RUBY_SITELIBDIR}/tkextlib/tcllib/autoscroll.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/ctext.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/tkpiechart.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/cursor.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/datefield.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/ico.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/ip_entry.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/plotchart.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tcllib/style.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tcllib
+${RUBY_SITELIBDIR}/tkextlib/tclx/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tclx/tclx.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tclx
+${RUBY_SITELIBDIR}/tkextlib/tile/tbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/style.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/tcheckbutton.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/tlabel.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/tmenubutton.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/tnotebook.rb
+${RUBY_SITELIBDIR}/tkextlib/tile/tradiobutton.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tile
+${RUBY_SITELIBDIR}/tkextlib/tkDND/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tkDND/shape.rb
+${RUBY_SITELIBDIR}/tkextlib/tkDND/tkdnd.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tkDND
+${RUBY_SITELIBDIR}/tkextlib/tkHTML/htmlwidget.rb
+${RUBY_SITELIBDIR}/tkextlib/tkHTML/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tkHTML
+${RUBY_SITELIBDIR}/tkextlib/tkimg/pixmap.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/bmp.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/gif.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/ico.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/jpeg.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/pcx.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/png.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/ppm.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/ps.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/window.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/sgi.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/sun.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/tga.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/tiff.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/xbm.rb
+${RUBY_SITELIBDIR}/tkextlib/tkimg/xpm.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tkimg
+${RUBY_SITELIBDIR}/tkextlib/tktable/tktable.rb
+${RUBY_SITELIBDIR}/tkextlib/tktable/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tktable
+${RUBY_SITELIBDIR}/tkextlib/tktrans/tktrans.rb
+${RUBY_SITELIBDIR}/tkextlib/tktrans/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/tktrans
+${RUBY_SITELIBDIR}/tkextlib/treectrl/tktreectrl.rb
+${RUBY_SITELIBDIR}/tkextlib/treectrl/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/treectrl
+${RUBY_SITELIBDIR}/tkextlib/vu/bargraph.rb
+${RUBY_SITELIBDIR}/tkextlib/vu/charts.rb
+${RUBY_SITELIBDIR}/tkextlib/vu/dial.rb
+${RUBY_SITELIBDIR}/tkextlib/vu/pie.rb
+${RUBY_SITELIBDIR}/tkextlib/vu/setup.rb
+${RUBY_SITELIBDIR}/tkextlib/vu/spinbox.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/vu
+${RUBY_SITELIBDIR}/tkextlib/winico/winico.rb
+${RUBY_SITELIBDIR}/tkextlib/winico/setup.rb
+@dirrm ${RUBY_SITELIBDIR}/tkextlib/winico
+${RUBY_SITELIBDIR}/tkextlib/SUPPORT_STATUS
+@dirrm ${RUBY_SITELIBDIR}/tkextlib
+${RUBY_EXAMPLESDIR}/tk/binding_sample.rb
+${RUBY_EXAMPLESDIR}/tk/bindtag_sample.rb
+${RUBY_EXAMPLESDIR}/tk/binstr_usage.rb
+${RUBY_EXAMPLESDIR}/tk/btn_with_frame.rb
+${RUBY_EXAMPLESDIR}/tk/cmd_res_test.rb
+${RUBY_EXAMPLESDIR}/tk/cmd_resource
 ${RUBY_EXAMPLESDIR}/tk/demos-en/ChangeLog
 ${RUBY_EXAMPLESDIR}/tk/demos-en/ChangeLog.prev
 ${RUBY_EXAMPLESDIR}/tk/demos-en/README
+${RUBY_EXAMPLESDIR}/tk/demos-en/README.1st
 ${RUBY_EXAMPLESDIR}/tk/demos-en/README.tkencoding
 ${RUBY_EXAMPLESDIR}/tk/demos-en/arrow.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/bind.rb
@@ -29,6 +323,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-en/browse1
 ${RUBY_EXAMPLESDIR}/tk/demos-en/browse2
 ${RUBY_EXAMPLESDIR}/tk/demos-en/button.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/check.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/check2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/clrpick.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/colors.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/cscroll.rb
@@ -46,6 +341,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-en/entry2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/entry3.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/filebox.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/floor.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/floor2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/form.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/hello
 ${RUBY_EXAMPLESDIR}/tk/demos-en/hscale.rb
@@ -53,20 +349,6 @@ ${RUBY_EXAMPLESDIR}/tk/demos-en/icon.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/image1.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/image2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/image3.rb
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/earth.gif
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/earthris.gif
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/face.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/flagdown.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/flagup.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/gray25.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/grey.25
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/grey.5
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/letters.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/noletter.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/pattern.xbm
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/tcllogo.gif
-${RUBY_EXAMPLESDIR}/tk/demos-en/images/teapot.ppm
-@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-en/images
 ${RUBY_EXAMPLESDIR}/tk/demos-en/items.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/ixset
 ${RUBY_EXAMPLESDIR}/tk/demos-en/ixset2
@@ -83,6 +365,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-en/plot.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/puzzle.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/radio.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/radio2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/radio3.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/rmt
 ${RUBY_EXAMPLESDIR}/tk/demos-en/rolodex
 ${RUBY_EXAMPLESDIR}/tk/demos-en/rolodex-j
@@ -98,11 +381,13 @@ ${RUBY_EXAMPLESDIR}/tk/demos-en/text.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/timer
 ${RUBY_EXAMPLESDIR}/tk/demos-en/tkencoding.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/twind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/twind2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/unicodeout.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/vscale.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-en/widget
 @dirrm ${RUBY_EXAMPLESDIR}/tk/demos-en
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/README
+${RUBY_EXAMPLESDIR}/tk/demos-jp/README.1st
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/arrow.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/bind.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/bitmap.rb
@@ -110,6 +395,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-jp/browse1
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/browse2
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/button.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/check.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/check2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/clrpick.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/colors.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/cscroll.rb
@@ -127,6 +413,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-jp/entry2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/entry3.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/filebox.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/floor.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/floor2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/form.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/hello
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/hscale.rb
@@ -134,20 +421,6 @@ ${RUBY_EXAMPLESDIR}/tk/demos-jp/icon.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/image1.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/image2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/image3.rb
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/earth.gif
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/earthris.gif
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/face.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/flagdown.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/flagup.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/gray25.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/grey.25
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/grey.5
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/letters.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/noletter.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/pattern.bmp
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/tcllogo.gif
-${RUBY_EXAMPLESDIR}/tk/demos-jp/images/teapot.ppm
-@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-jp/images
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/items.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/ixset
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/ixset2
@@ -164,6 +437,7 @@ ${RUBY_EXAMPLESDIR}/tk/demos-jp/plot.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/puzzle.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/radio.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/radio2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/radio3.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/rmt
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/rolodex
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/rolodex-j
@@ -178,10 +452,70 @@ ${RUBY_EXAMPLESDIR}/tk/demos-jp/tcolor
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/text.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/timer
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/twind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/twind2.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/unicodeout.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/vscale.rb
 ${RUBY_EXAMPLESDIR}/tk/demos-jp/widget
 @dirrm ${RUBY_EXAMPLESDIR}/tk/demos-jp
+${RUBY_EXAMPLESDIR}/tk/encstr_usage.rb
+${RUBY_EXAMPLESDIR}/tk/images/earth.gif
+${RUBY_EXAMPLESDIR}/tk/images/earthris.gif
+${RUBY_EXAMPLESDIR}/tk/images/face.xbm
+${RUBY_EXAMPLESDIR}/tk/images/flagdown.xbm
+${RUBY_EXAMPLESDIR}/tk/images/flagup.xbm
+${RUBY_EXAMPLESDIR}/tk/images/gray25.xbm
+${RUBY_EXAMPLESDIR}/tk/images/grey.25
+${RUBY_EXAMPLESDIR}/tk/images/grey.5
+${RUBY_EXAMPLESDIR}/tk/images/letters.xbm
+${RUBY_EXAMPLESDIR}/tk/images/noletter.xbm
+${RUBY_EXAMPLESDIR}/tk/images/pattern.xbm
+${RUBY_EXAMPLESDIR}/tk/images/tcllogo.gif
+${RUBY_EXAMPLESDIR}/tk/images/teapot.ppm
+@dirrm ${RUBY_EXAMPLESDIR}/tk/images
+${RUBY_EXAMPLESDIR}/tk/iso2022-kr.txt
+${RUBY_EXAMPLESDIR}/tk/menubar1.rb
+${RUBY_EXAMPLESDIR}/tk/menubar2.rb
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/README
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/cs.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/de.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/el.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/en.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/en_gb.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/eo.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/es.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/fr.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/it.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/ja.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/nl.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/pl.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb/ru.msg
+@dirrm ${RUBY_EXAMPLESDIR}/tk/msgs_rb
+${RUBY_EXAMPLESDIR}/tk/msgs_rb2/README
+${RUBY_EXAMPLESDIR}/tk/msgs_rb2/de.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_rb2/ja.msg
+@dirrm ${RUBY_EXAMPLESDIR}/tk/msgs_rb2
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/README
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/cs.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/de.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/el.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/en.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/en_gb.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/eo.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/es.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/fr.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/it.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/ja.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/license.terms
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/nl.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/pl.msg
+${RUBY_EXAMPLESDIR}/tk/msgs_tk/ru.msg
+@dirrm ${RUBY_EXAMPLESDIR}/tk/msgs_tk
+${RUBY_EXAMPLESDIR}/tk/multi-ip_sample.rb
+${RUBY_EXAMPLESDIR}/tk/multi-ip_sample2.rb
+${RUBY_EXAMPLESDIR}/tk/optobj_sample.rb
+${RUBY_EXAMPLESDIR}/tk/propagate.rb
+${RUBY_EXAMPLESDIR}/tk/remote-ip_sample.rb
+${RUBY_EXAMPLESDIR}/tk/remote-ip_sample2.rb
 ${RUBY_EXAMPLESDIR}/tk/resource.en
 ${RUBY_EXAMPLESDIR}/tk/resource.ja
 ${RUBY_EXAMPLESDIR}/tk/safe-tk.rb
@@ -191,10 +525,233 @@ ${RUBY_EXAMPLESDIR}/tk/tkbiff.rb
 ${RUBY_EXAMPLESDIR}/tk/tkbrowse.rb
 ${RUBY_EXAMPLESDIR}/tk/tkcombobox.rb
 ${RUBY_EXAMPLESDIR}/tk/tkdialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS/tkIcons
+${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS/tkIcons-sample.kde
+${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS/tkIcons.kde
+${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS/viewIcons.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/ICONS
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/basic.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/bwidget.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/demo.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/dnd.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/manager.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/select.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/tmpldlg.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/tree.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget/x1.xbm
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/bwidget
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/box.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/clear.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/close.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/copy.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/cut.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/exit.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/find.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/help.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/line.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/mag.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/new.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/open.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/oval.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/paste.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/points.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/poly.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/print.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/ruler.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/save.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/select.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images/text.xbm
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo/images
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/catalog_demo
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/buttonbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/calendar.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/canvasprintbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/canvasprintdialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/checkbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/combobox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/dateentry.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/datefield.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/dialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/dialogshell.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/disjointlistbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/entryfield-1.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/entryfield-2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/entryfield-3.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/extbutton.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/extfileselectionbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/extfileselectiondialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/feedback.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/fileselectionbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/fileselectiondialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/finddialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/hierarchy.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/hyperhelp.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/labeledframe.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/labeledwidget.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/mainwindow.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/menubar.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/menubar2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/messagebox1.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/messagebox2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/messagedialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/notebook.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/notebook2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/optionmenu.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/panedwindow.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/panedwindow2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/promptdialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/pushbutton.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/radiobox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/scrolledcanvas.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/scrolledframe.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/scrolledhtml.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/scrolledlistbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/scrolledtext.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/selectionbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/selectiondialog.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/shell.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/spindate.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/spinint.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/spinner.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/spintime.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/tabnotebook.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/tabnotebook2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/tabset.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/timeentry.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/timefield.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/toolbar.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample/watch.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets/sample
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/iwidgets
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/datefield.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/plotdemos1.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/plotdemos2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/plotdemos3.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib/xyplot.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tcllib
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/Orig_COPYRIGHT.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/README
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/hv.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image1
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image10
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image11
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image12
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image13
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image14
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image2
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image3
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image4
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image5
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image6
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image7
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image8
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/image9
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1/index.html
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page1
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image1
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image10
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image11
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image12
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image13
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image14
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image15
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image16
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image17
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image18
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image19
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image2
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image20
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image21
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image22
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image23
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image24
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image25
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image26
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image27
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image28
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image29
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image3
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image30
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image31
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image32
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image33
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image34
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image35
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image36
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image37
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image38
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image39
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image4
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image5
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image6
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image7
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image8
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/image9
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2/index.html
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page2
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image1
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image10
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image11
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image12
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image13
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image14
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image2
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image3
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image4
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image5
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image6
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image7
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image8
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/image9
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3/index.html
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page3
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image1
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image2
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image3
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image4
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image5
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image6
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image7
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image8
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/image9
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4/index.html
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/page4
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML/ss.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tkHTML
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/basic.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/buttons.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/command.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/debug.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/dynarows.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/maxsize.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/spreadsheet.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/tcllogo.gif
+${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable/valid.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/tktable
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/Orig_LICENSE.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/README.txt
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/canvItems.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/canvSticker.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/canvSticker2.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/dial.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/m128_000.xbm
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/oscilloscope.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/pie.rb
+${RUBY_EXAMPLESDIR}/tk/tkextlib/vu/vu.rb
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib/vu
+@dirrm ${RUBY_EXAMPLESDIR}/tk/tkextlib
 ${RUBY_EXAMPLESDIR}/tk/tkfrom.rb
 ${RUBY_EXAMPLESDIR}/tk/tkhello.rb
 ${RUBY_EXAMPLESDIR}/tk/tkline.rb
 ${RUBY_EXAMPLESDIR}/tk/tkmenubutton.rb
+${RUBY_EXAMPLESDIR}/tk/tkmsgcat-load_rb.rb
+${RUBY_EXAMPLESDIR}/tk/tkmsgcat-load_rb2.rb
+${RUBY_EXAMPLESDIR}/tk/tkmsgcat-load_tk.rb
 ${RUBY_EXAMPLESDIR}/tk/tkmulticolumnlist.rb
 ${RUBY_EXAMPLESDIR}/tk/tkmultilistbox.rb
 ${RUBY_EXAMPLESDIR}/tk/tkmultilistframe.rb
@@ -204,4 +761,6 @@ ${RUBY_EXAMPLESDIR}/tk/tktextframe.rb
 ${RUBY_EXAMPLESDIR}/tk/tktimer.rb
 ${RUBY_EXAMPLESDIR}/tk/tktimer2.rb
 ${RUBY_EXAMPLESDIR}/tk/tktimer3.rb
+${RUBY_EXAMPLESDIR}/tk/tktree.rb
+${RUBY_EXAMPLESDIR}/tk/tktree.tcl
 @dirrm ${RUBY_EXAMPLESDIR}/tk
diff --git a/x11/ruby-tk/distinfo b/x11/ruby-tk/distinfo
index cbbd98cb505..42f63efcab4 100644
--- a/x11/ruby-tk/distinfo
+++ b/x11/ruby-tk/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/11/27 14:50:45 taca Exp $
+$NetBSD: distinfo,v 1.6 2005/01/23 17:37:48 taca Exp $
 
-SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515
-Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes
+SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
+Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
 SHA1 (patch-aa) = 7d402edea1e05172e586f5b3a7a3a230237c0058
+SHA1 (patch-ab) = 6407c380240bd1dc4735b96a94b4a3de3ff014c5
+SHA1 (patch-ac) = 9cd89e0ef2d0cd13d95d9f13c1cb217702791fa9
+SHA1 (patch-ad) = 251730515815bb430675ad2a164fe8da649cb160
diff --git a/x11/ruby-tk/patches/patch-ab b/x11/ruby-tk/patches/patch-ab
new file mode 100644
index 00000000000..f0a4e1cb2df
--- /dev/null
+++ b/x11/ruby-tk/patches/patch-ab
@@ -0,0 +1,90 @@
+$NetBSD: patch-ab,v 1.1 2005/01/23 17:37:48 taca Exp $
+
+--- lib/multi-tk.rb.orig	2004-12-20 14:10:33.000000000 +0900
++++ lib/multi-tk.rb
+@@ -189,7 +189,9 @@ class MultiTkIp
+     unless ip.deleted?
+       ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
+         begin
+-          ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
++          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
++          after_ids = ip._eval_without_enc("#{name} eval {after info}")
++          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
+         rescue Exception
+         end
+         begin
+@@ -236,7 +238,9 @@ class MultiTkIp
+         @slave_ip_tbl.each{|name, subip| 
+           _destroy_slaves_of_slaveIP(subip)
+           begin
+-            subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++            after_ids = subip._eval_without_enc("after info")
++            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+           rescue Exception
+           end
+ =begin
+@@ -270,7 +274,9 @@ class MultiTkIp
+         }
+ 
+         begin
+-          @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++          after_ids = @interp._eval_without_enc("after info")
++          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+         rescue Exception
+         end
+         begin
+@@ -310,7 +316,9 @@ class MultiTkIp
+           @slave_ip_tbl.each{|name, subip|
+             _destroy_slaves_of_slaveIP(subip)
+             begin
+-              subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++              after_ids = subip._eval_without_enc("after info")
++              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+             rescue Exception
+             end
+ =begin
+@@ -344,7 +352,9 @@ class MultiTkIp
+           }
+ 
+           begin
+-            @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++            after_ids = @interp._eval_without_enc("after info")
++            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+           rescue Exception
+           end
+ =begin
+@@ -1315,7 +1325,7 @@ class MultiTkIp
+         @cmd_queue.enq([nil, cmd, *args])
+       rescue Exception => e
+         # ignore
+-        if $DEBUG || true
++        if $DEBUG
+           warn("Warning: " + e.class.inspect + 
+                ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+                " on " + self.inspect) 
+@@ -1821,7 +1831,9 @@ class MultiTkIp
+       end
+ =end
+       begin
+-        subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
++        after_ids = subip._eval_without_enc("after info")
++        subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+       rescue Exception
+       end
+ 
+@@ -1850,7 +1862,9 @@ class MultiTkIp
+     }
+ 
+     begin
+-      @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
++      after_ids = @interp._eval_without_enc("after info")
++      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+     rescue Exception
+     end
+ =begin
diff --git a/x11/ruby-tk/patches/patch-ac b/x11/ruby-tk/patches/patch-ac
new file mode 100644
index 00000000000..960e56ed57f
--- /dev/null
+++ b/x11/ruby-tk/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/01/23 17:37:48 taca Exp $
+
+--- lib/tk/bindtag.rb.orig	2004-12-16 16:12:44.000000000 +0900
++++ lib/tk/bindtag.rb
+@@ -23,6 +23,7 @@ class TkBindTag
+       @id = name
+       BTagID_TBL[@id] = self
+       bind(*args, &b) if args != []
++      self
+     }
+   end
+ 
diff --git a/x11/ruby-tk/patches/patch-ad b/x11/ruby-tk/patches/patch-ad
new file mode 100644
index 00000000000..af8cc900a75
--- /dev/null
+++ b/x11/ruby-tk/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2005/01/23 17:37:48 taca Exp $
+
+--- lib/tk/menu.rb.orig	2004-12-09 03:13:37.000000000 +0900
++++ lib/tk/menu.rb
+@@ -437,14 +437,14 @@ class TkOptionMenubutton<TkMenubutton
+     keys = _symbolkey2str(keys)
+ 
+     parent = nil
+-    if args[0].kind_of?(TkWindow) || args[0] == nil
++    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
+       parent = args.shift 
+     else
+       parent = keys.delete('parent')
+     end
+ 
+     @variable = nil
+-    if args[0].kind_of?(TkVariable) || args[0] == nil
++    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
+       @variable = args.shift 
+     else
+       @variable = keys.delete('variable')