Update to 0.6.

Installation changes like with tcllib. Mentry and wcb are now in tklib. Too many patches for stupidities. Thanks to Steve Havelka for distfile hosting. ok landry@
2013-11-14 09:43:09 +00:00 · 2013-11-14 09:43:09 +00:00 · aabed3a403
commit aabed3a403
parent 8e8d495fb6
17 changed files with 611 additions and 179 deletions
--- a/devel/tklib/Makefile
+++ b/devel/tklib/Makefile
@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.10 2013/11/09 18:22:02 zhuk Exp $
+# $OpenBSD: Makefile,v 1.11 2013/11/14 09:43:09 stu Exp $

 COMMENT =	Tk Standard Library

-DISTNAME =	tklib-0.5
-REVISION =	2
+DISTNAME =	tklib-0.6pl0
 CATEGORIES =	devel x11/tk
-HOMEPAGE =	http://sourceforge.net/projects/tcllib/
+HOMEPAGE =	http://core.tcl.tk/tklib/home
 MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>

 # BSD style
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=tcllib/}
+# Fossil checkin 8a11db6d153c8e20cdf810896b4e7d2a976b7151
+MASTER_SITES =	http://mirror.arieslabs.com/openbsd/
 MODULES =	x11/tk
 BUILD_DEPENDS =	devel/tcllib
 RUN_DEPENDS =	devel/tcllib ${MODTK_RUN_DEPENDS}
@ -21,40 +21,26 @@ TEST_IS_INTERACTIVE =	X11
 NO_BUILD =	Yes
 PKG_ARCH =	*

-SCRIPTS_TCLSH = \
-	canvas/city.tcl \
-	ntext/ntextDemoBindings.tcl ntext/ntextDemoIndent.tcl ntext/ntextExample.tcl \
-	plotchart/plotdemos1.tcl plotchart/plotdemos2.tcl plotchart/plotdemos3.tcl \
-	plotchart/plotdemos4.tcl plotchart/plotdemos5.tcl plotchart/plotdemos6.tcl \
-	plotchart/plotdemos7.tcl plotchart/plotdemos8.tcl \
-	tablelist/embeddedWindows.tcl tablelist/embeddedWindows_tile.tcl \
-	tablelist/styles.tcl tablelist/styles_tile.tcl tablelist/tileWidgets.tcl \
-	tkpiechart/demo.tcl \
-	widget/screenruler.tcl
-
-SCRIPTS_TCLSH_NOEXEC = \
-	canvas/osm.tcl canvas/puzzle.tcl
-
 do-configure:
-	@${MODTCL_TCLSH_ADJ} \
-		${SCRIPTS_TCLSH:S!^!${WRKSRC}/examples/!} \
-		${SCRIPTS_TCLSH_NOEXEC:S!^!${WRKSRC}/examples/!}
+	@perl -pi -e \
+	's!\$$tk_library demos!${LOCALBASE}/share/examples/tk${MODTK_VERSION}!' \
+	${WRKSRC}/examples/wcb/listboxtest[12].tcl

 do-install:
 	${MODTCL_BIN} ${WRKSRC}/installer.tcl \
 	-no-wait -no-gui -no-html \
-	-pkgs -nroff -examples \
+	-pkgs -nroff -examples -apps \
 	-pkg-path ${DESTDIR}${MODTCL_TCLDIR} \
 	-nroff-path ${PREFIX}/man/mann \
-	-example-path ${PREFIX}/share/examples/tklib
-	@chmod ${BINMODE} ${SCRIPTS_TCLSH:S!^!${PREFIX}/share/examples/tklib/!}
-	${MODTCL_BIN} ${FILESDIR}/mkindex.tcl ${PREFIX}/man/mann \
-		${PKGDIR}/DESCR ${PREFIX}/man/mann/tklib.n tklib "${COMMENT}" 0.5
-	@chown ${MANOWN}:${MANGRP} ${PREFIX}/man/mann/tklib.n
-	@chmod ${MANMODE} ${PREFIX}/man/mann/tklib.n
+	-example-path ${PREFIX}/share/examples/tklib \
+	-app-path ${PREFIX}/share/examples/tklib/apps \
+	-csb ${PREFIX}/share/doc \
+	-tclsh ${MODTCL_BIN} \
+	-descr "`cat ${PKGDIR}/DESCR`"

+# Define TEST_MODULES to restrict to a subset of regression tests.
 do-test:
 	${SETENV} ${MAKE_ENV} ${TEST_FLAGS} \
-	${MODTCL_BIN} ${WRKSRC}/sak.tcl test
+	${MODTCL_BIN} ${WRKSRC}/sak.tcl test run -v ${TEST_MODULES}

 .include <bsd.port.mk>
--- a/devel/tklib/distinfo
+++ b/devel/tklib/distinfo
@ -1,5 +1,2 @@
-MD5 (tklib-0.5.tar.gz) = yLhPPrTa+9TlgY4p1Aj66g==
-RMD160 (tklib-0.5.tar.gz) = J88Aigcxpfbk6jpLjCBs2ai9VQE=
-SHA1 (tklib-0.5.tar.gz) = yrgHGIoJ9+DH6SUJVWuuKUCut3Q=
-SHA256 (tklib-0.5.tar.gz) = 09ZfpDBvLagxFcuSTEKt49x7sAJPO8nUC+mlZQavOpo=
-SIZE (tklib-0.5.tar.gz) = 4140632
+SHA256 (tklib-0.6pl0.tar.gz) = njfH2w6dz5Er9xAmEtu92gFh036c2gN5dZqeG4TDrEI=
+SIZE (tklib-0.6pl0.tar.gz) = 5349795
--- a/devel/tklib/files/mkindex.tcl
+++ b/devel/tklib/files/mkindex.tcl
@ -1,45 +0,0 @@
-# Generate 'index' manpage
-# Stuart Cassoff
-# Version 0.1
-# Winter 2009
-
-package require doctools
-
-lassign $argv dir descrfn outfn name title version
-
-set modules {}
-foreach fn [glob -nocomplain -dir $dir *.n] {
-	set data [read [set f [open $fn]]][close $f]
-	if {[regexp {.SH NAME\n(.*?) \\- (.*?)\n} $data -> shname shtitle] &&
-			[regexp -line {^\.TH.*$} $data th]} {
-		lappend modules [list [string map {_ ::} $shname] [lindex $th 3] [lindex $th 5] $shtitle]
-	}
-}
-set modules [lsort -dictionary -index 0 $modules]
-
-set mp ""
-append mp {[comment {-*- tcl -*- doctools manpage}]}
-append mp "\[manpage_begin $name n $version\]"
-append mp "\[titledesc {$title}\]"
-append mp "\[moddesc {$title}\]"
-
-append mp {[description]} \n [read [set f [open $descrfn]]][close $f]
-append mp {
-To locate a manual page for a package with "::", replace "::" with "_".
-For example, the manual page for package "foo::bar" would be "foo_bar".
-}
-
-append mp {[section MODULES] [list_begin options]}
-foreach module $modules {
-	append mp "\[opt_def {[lindex $module 0]} [lindex $module 1]\] [lindex $module 2] - [lindex $module 3]" \n
-}
-append mp {[list_end]}
-
-append mp {[manpage_end]}
-
-set f [open $outfn w]
-puts -nonewline $f [[::doctools::new mp -format nroff] format $mp]
-close $f
-
-
-# EOF
--- a/devel/tklib/patches/patch-apps_bitmap-editor
+++ b/devel/tklib/patches/patch-apps_bitmap-editor
@ -0,0 +1,14 @@
+$OpenBSD: patch-apps_bitmap-editor,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Bug fix.
+
+--- apps/bitmap-editor.orig	Wed Oct 30 14:44:52 2013
+++ apps/bitmap-editor	Fri Nov  8 11:55:42 2013
+@@ -404,6 +404,7 @@ proc ParseBMP {raw} {
+ #
+ 
+ proc OpenBMP {} {
+    global S
+     set types { {{BMP Files} {.bmp}} {{All Files} * }}
+     set fname [tk_getOpenFile -defaultextension ".bmp" -initialfile $S(fname) \
+                    -filetypes $types]
--- a/devel/tklib/patches/patch-apps_diagram-viewer
+++ b/devel/tklib/patches/patch-apps_diagram-viewer
@ -0,0 +1,12 @@
+$OpenBSD: patch-apps_diagram-viewer,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Bad shell.
+
+--- apps/diagram-viewer.orig	Fri Nov  8 11:29:18 2013
+++ apps/diagram-viewer	Fri Nov  8 11:29:35 2013
+@@ -1,4 +1,4 @@
+-#!bin/bash
+#! /bin/sh
+ # -*- tcl -*- \
+ exec tclsh "$0" ${1+"$@"}
+ 
--- a/devel/tklib/patches/patch-examples_canvas_city_tcl
+++ b/devel/tklib/patches/patch-examples_canvas_city_tcl
@ -1,11 +0,0 @@
-$OpenBSD: patch-examples_canvas_city_tcl,v 1.1.1.1 2009/03/18 09:10:27 sthen Exp $
--- examples/canvas/city.tcl.orig	Thu Jan 29 18:19:20 2009
-+++ examples/canvas/city.tcl	Thu Jan 29 18:19:26 2009
-@@ -13,7 +13,6 @@ exec tclsh "$0" ${1+"$@"}
- set selfdir  [file dirname [file normalize [info script]]]
- set modules [file join [file dirname [file dirname $selfdir]] modules]
- 
-source $modules/canvas/canvas_sqmap.tcl
- source $selfdir/citygrid.tcl
- 
- # ### ### ### ######### ######### #########
--- a/devel/tklib/patches/patch-examples_controlwidget_demo-tachometer_tcl
+++ b/devel/tklib/patches/patch-examples_controlwidget_demo-tachometer_tcl
@ -0,0 +1,15 @@
+$OpenBSD: patch-examples_controlwidget_demo-tachometer_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Windowsism.
+
+--- examples/controlwidget/demo-tachometer.tcl.orig	Sun Oct 27 20:53:15 2013
+++ examples/controlwidget/demo-tachometer.tcl	Sun Oct 27 20:53:26 2013
+@@ -36,7 +36,7 @@ proc main { argc argv } \
+     grid .t1 .s1 .t2 .s2 .b -padx 2 -pady 2
+     wm deiconify .
+ 
+-    console show
+    catch { console show }
+ 
+ 
+     vwait forever
--- a/devel/tklib/patches/patch-examples_plotchart_testtable_tcl
+++ b/devel/tklib/patches/patch-examples_plotchart_testtable_tcl
@ -0,0 +1,15 @@
+$OpenBSD: patch-examples_plotchart_testtable_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Windowsism.
+
+--- examples/plotchart/testtable.tcl.orig	Sun Oct 27 20:52:18 2013
+++ examples/plotchart/testtable.tcl	Sun Oct 27 20:52:30 2013
+@@ -33,7 +33,7 @@ proc setColor {table widget row col value} {
+ # Command must already exist ...
+ $t formatcommand setColor
+ 
+-console show
+catch { console show }
+ $t title "Demonstration of table charts"
+ $t separator
+ 
--- a/devel/tklib/patches/patch-examples_tkpiechart_demo_tcl
+++ b/devel/tklib/patches/patch-examples_tkpiechart_demo_tcl
@ -1,12 +0,0 @@
-$OpenBSD: patch-examples_tkpiechart_demo_tcl,v 1.1.1.1 2009/03/18 09:10:27 sthen Exp $
--- examples/tkpiechart/demo.tcl.orig	Wed Jan 21 23:00:46 2009
-+++ examples/tkpiechart/demo.tcl	Mon Feb  2 15:44:58 2009
-@@ -2,6 +2,8 @@
- # the next line restarts using the interpreter \
- exec wish "$0" "$@"
- 
-+package require Tk
-+
- # copyright (C) 1995-2004 Jean-Luc Fontaine (mailto:jfontain@free.fr)
- 
- 
--- a/devel/tklib/patches/patch-installed_modules_tcl
+++ b/devel/tklib/patches/patch-installed_modules_tcl
@ -1,12 +0,0 @@
-$OpenBSD: patch-installed_modules_tcl,v 1.1.1.1 2009/03/18 09:10:27 sthen Exp $
--- installed_modules.tcl.orig	Wed Jan 21 23:00:46 2009
-+++ installed_modules.tcl	Mon Feb  2 15:44:58 2009
-@@ -34,7 +34,7 @@ foreach {m pkg doc exa} {
-     style       _tcl  _man  _null
-     swaplist    _tcl  _man  _null
-     tablelist   _tab  _null _exa
-    tkpiechart  _tcl  _man  _null
-+    tkpiechart  _tcl  _man  _exa
-     tooltip     _tcl  _man  _null
-     widget      _tcl  _man  _exa
- } {
--- a/devel/tklib/patches/patch-installer_tcl
+++ b/devel/tklib/patches/patch-installer_tcl
@ -1,45 +1,153 @@
-$OpenBSD: patch-installer_tcl,v 1.2 2011/01/05 16:37:10 stu Exp $
--- installer.tcl.orig	Wed Jan 21 23:00:46 2009
-+++ installer.tcl	Tue Oct  5 01:23:46 2010
-@@ -65,18 +65,25 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
-     puts  $index "unset maindir"
-     puts  $index ""
-     close $index
-+    file attributes [file join $outdir pkgIndex.tcl] -owner root -group bin -permissions 0444
-     return
- }
+$OpenBSD: patch-installer_tcl,v 1.3 2013/11/14 09:43:09 stu Exp $
+
+Install everything nicely.
+Generate tcllib.n.
+
+--- installer.tcl.orig	Wed Oct 30 14:44:52 2013
+++ installer.tcl	Fri Nov  8 15:44:59 2013
+@@ -84,16 +84,24 @@ if {![package vsatisfies [package provide Tcl] 8.0]} {
 
 proc xcopyfile {src dest} {
     # dest can be dir or file
-     run file copy -force $src $dest
 +    if {[file isdirectory $dest]} {
 +	set dest [file join $dest [file tail $src]]
 +    }
-+    file attributes $dest -owner root -group bin -permissions 0444
+    log "Installing $src to $dest"
+     run file copy -force $src $dest
+    file attributes $dest -owner root -group bin -permissions 0o444
     return
 }
 
 proc xcopy {src dest recurse {pattern *}} {
+    log "Making directory $dest"
     run file mkdir $dest
-+    file attributes $dest -owner root -group bin -permissions 0755
-     foreach file [glob [file join $src $pattern]] {
-+	if {[file extension $file] eq ".orig"} { continue }
-         set base [file tail $file]
- 	set sub  [file join $dest $base]
 
-@@ -100,6 +107,7 @@ proc write_out {f text} {
+    file attributes $dest -owner root -group bin -permissions 0o755
+     if {[string equal $pattern *] || !$recurse} {
+ 	foreach file [glob [file join $src $pattern]] {
+ 	    set base [file tail $file]
+	    if {$base eq "ChangeLog" || [file extension $base] in {.orig .beforesubst}} { continue }
+ 	    set sub  [file join $dest $base]
+ 
+ 	    if {0 == [string compare CVS $base]} {continue}
+@@ -144,6 +152,7 @@ proc write_out {f text} {
     catch {file delete -force $f}
     puts -nonewline [set of [open $f w]] $text
     close $of
-+    file attributes $f -owner root -group bin -permissions 0444
+    file attributes $f -owner root -group bin -permissions 0o444
 }
 
 
-@@ -160,7 +168,6 @@ proc doinstall {} {
+@@ -184,7 +193,6 @@ proc run {args} {
+             return -code error "Install error:\n $msg" 
+         }
+     }
+-    log* .
+     return
+ }
 
+@@ -209,12 +217,16 @@ proc ainstall {} {
+ 	set aexe [file join $distribution apps $a]
+ 	set adst [file join $config(app,path) ${a}$ext]
+ 
+-	log "\nGenerating $adst"
+-	if {!$config(dry)} {
+-	    file mkdir [file dirname  $adst]
+-	    catch {file delete -force $adst}
+-	    file copy -force $aexe    $adst
+	if {![file exists $config(app,path)]} {
+	    log "Making directory $config(app,path)"
+	    run file mkdir $config(app,path)
+	    file attributes $config(app,path) -owner root -group bin -permissions 0o755
+ 	}
+	_exafile $aexe $adst $config(tclsh)
+	if {[file exists $aexe.man]} {
+	    set fn [file tail $aexe].n
+	    _manfile [file join $distribution embedded man files apps $fn] [file join $config(doc,nroff,path) $fn]
+	}
+     }
+     return
+ }
+@@ -236,20 +248,27 @@ proc doinstall {} {
+     }
     if {$config(pkg)}       {
 	xinstall   pkg $config(pkg,path)
-	gen_main_index $config(pkg,path) $tklib_name $tklib_version
+-	gen_main_index $config(pkg,path) $package_name $package_version
     }
-     if {$config(doc,nroff)} {
- 	set config(man.macros) [string trim [get_input [file join $distribution man.macros]]]
+-    if {$config(doc,nroff)} {
+    if 0 {
+ 	foreach dir [glob -directory $distribution/embedded/man/files/modules *] {
+ 	    xcopy $dir $config(doc,nroff,path) 1
+ 	}
+ 	xcopy $distribution/embedded/man/files/apps $config(doc,nroff,path) 1
+     }
+    xinstall doc [file join $distribution embedded man files modules] $config(doc,nroff,path)
+    foreach module {mentry tablelist wcb} {
+	set srcdir [file join $distribution modules $module]
+	set dstdir [file join $config(csb) $module]
+	xcopy $srcdir $dstdir 0 *.txt
+	xcopy [file join $srcdir doc] $dstdir 0 *
+    }
+     if {$config(doc,html)}  {
+ 	#xinstall doc html  html $config(doc,html,path)
+ 	xcopy $distribution/embedded/www $config(doc,html,path) 1
+     }
+-    if {$config(exa)}       {xinstall exa $config(exa,path)}
+    if {$config(exa)}       {xinstall exa [file join $distribution examples] $config(exa,path) $config(tclsh)}
+     if {$config(app)}       {ainstall}
+    mkindex
+     log ""
+     return
+ }
+@@ -511,6 +530,10 @@ proc processargs {} {
+ 		set config(exa,path) [lindex $argv 1]
+ 		set argv             [lrange $argv 1 end]
+ 	    }
+	    -csb - -tclsh - -descr {
+		set config([string range [lindex $argv 0] 1 end]) [lindex $argv 1]
+		set argv [lrange $argv 1 end]
+	    }
+ 	    -help   -
+ 	    default {
+ 		puts stderr "usage: $argv0 ?-dry-run/-simulate? ?-no-wait? ?-no-gui? ?-html|-no-html? ?-nroff|-no-nroff? ?-examples|-no-examples? ?-pkgs|-no-pkgs? ?-pkg-path path? ?-apps|-no-apps? ?-app-path path? ?-nroff-path path? ?-html-path path? ?-example-path path?"
+@@ -566,6 +589,40 @@ proc wait {} {
+ 	exit 0
+     }
+     return
+}
+
+proc mkindex {} {
+    global config package_name package_version modinfos
+    package require doctools
+
+    set modinfos [lsort -dictionary -index 0 $modinfos]
+
+    set title [expr {[string index $package_name 1] eq "k" ? "Tk" : "Tcl"}]
+    append title " Standard Library"
+
+    set mp ""
+    append mp {[comment {-*- tcl -*- doctools manpage}]}
+    append mp "\[manpage_begin $package_name n $package_version\]"
+    append mp "\[titledesc {$title}\]"
+    append mp "\[moddesc {$title}\]"
+
+    append mp {[description]} \n $config(descr)
+
+    append mp {[section MODULES] [list_begin options]}
+    foreach mi $modinfos {
+	set s "\[opt_def {[lindex $mi 0]} [string map {\& ""} [lindex $mi 1]]\]"
+	append mp $s [string map {\& "" [ [lb] ] [rb]} " [lindex $mi 2] - [lindex $mi 3]"]
+    }
+    append mp {[list_end]}
+
+    append mp {[manpage_end]}
+
+    set fn [file join $config(doc,nroff,path) $package_name.n]
+    log "Installing $package_name.n to $fn"
+    set f [open $fn w]
+    puts -nonewline $f [[::doctools::new mp -format nroff] format $mp]
+    close $f
+    file attributes $fn -owner root -group bin -permissions 0o444
+ }
+ 
+ # --------------------------------------------------------------
--- a/devel/tklib/patches/patch-modules_plotchart_plotcontour_tcl
+++ b/devel/tklib/patches/patch-modules_plotchart_plotcontour_tcl
@ -1,21 +0,0 @@
-$OpenBSD: patch-modules_plotchart_plotcontour_tcl,v 1.1.1.1 2009/03/18 09:10:27 sthen Exp $
--- modules/plotchart/plotcontour.tcl.orig	Wed Jan 21 23:00:46 2009
-+++ modules/plotchart/plotcontour.tcl	Mon Feb  2 15:44:58 2009
-@@ -1361,7 +1361,7 @@ proc ::Plotchart::MakeContourClasses {values classes} 
- #####
- #####    return $cont
- 
-    puts "classes (cont) : $classes"
-+#debug#    puts "classes (cont) : $classes"
- 
-     return $classes
- }
-@@ -1531,7 +1531,7 @@ proc ::Plotchart::colorMap {cmap} {
- 
-         default {
-             if {[string is alpha $cmap] == 1} {
-                puts "Colormap : Unknown colorMapType, $cmap.  Using JET"
-+#debug#                puts "Colormap : Unknown colorMapType, $cmap.  Using JET"
-                 set colorMapType jet
- 
-             } else {
--- a/devel/tklib/patches/patch-modules_plotchart_plothist_test
+++ b/devel/tklib/patches/patch-modules_plotchart_plothist_test
@ -1,11 +0,0 @@
-$OpenBSD: patch-modules_plotchart_plothist_test,v 1.1.1.1 2009/03/18 09:10:27 sthen Exp $
--- modules/plotchart/plothist.test.orig	Wed Jan 21 23:00:46 2009
-+++ modules/plotchart/plothist.test	Mon Feb  2 15:44:58 2009
-@@ -9,6 +9,7 @@ package require Plotchart
- # plothist.test --
- #     Testing histograms
- #
-+destroy .c
-     canvas .c -width 600 -height 400 -bg white
-     pack   .c -fill both
-     .c delete all
--- a/devel/tklib/patches/patch-modules_plotchart_xyplot_tcl
+++ b/devel/tklib/patches/patch-modules_plotchart_xyplot_tcl
@ -0,0 +1,15 @@
+$OpenBSD: patch-modules_plotchart_xyplot_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Don't run example code in the extension iteself, duh.
+
+--- modules/plotchart/xyplot.tcl.orig	Sun Oct 27 23:55:10 2013
+++ modules/plotchart/xyplot.tcl	Sun Oct 27 23:55:17 2013
+@@ -549,7 +549,7 @@ proc xyplot::cget { path option args } {
+ }
+ 
+ # Test
+-if {1} {
+if {0} {
+ set xydata1 {}
+ set xydata2 {}
+ set xydata3 {}
--- a/devel/tklib/patches/patch-support_installation_actions_tcl
+++ b/devel/tklib/patches/patch-support_installation_actions_tcl
@ -0,0 +1,115 @@
+$OpenBSD: patch-support_installation_actions_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
+
+Retrieve module info from man pages.
+Perform shebang adjustments.
+
+--- support/installation/actions.tcl.orig	Wed Oct 30 14:44:52 2013
+++ support/installation/actions.tcl	Fri Nov  8 15:05:31 2013
+@@ -108,15 +108,98 @@ proc _tci {module libdir} {
+     return
+ }
+ 
+proc _manfile {fn dfn} {
+    global modinfos
+    if {[file tail $dfn] ni {tk_getString.n}} {
+	set dfn [file join [file dirname $dfn] [string map {_ ::} [file tail $dfn]]]
+    }
+    log "Installing $fn to $dfn"
+    set f [open $fn]
+    chan configure $f -buffersize 100000
+    set d [read -nonewline $f]
+    close $f
+    if {[regexp {\n\.SH NAME\n(.*?) \\- (.*?)\n} $d -> shname shtitle] && [regexp -line {^\.TH.*$} $d th]} {
+	lappend modinfos [list $shname [lindex $th 3] [lindex $th 5] $shtitle]
+    }
+    set f [open $dfn w]
+    puts -nonewline $f $d
+    close $f
+    file attributes $dfn -owner root -group bin -permissions 0o444
+}
+ 
+-proc _manfile {f format ext docdir} { return }
+-proc _man {module format ext docdir} { return }
+proc _man {module srcdir dstdir} {
+    foreach fn [glob -nocomplain -dir [file join $srcdir $module] *] {
+	if {[file extension $fn] eq ".n"} {
+	    _manfile $fn [file join $dstdir [file tail $fn]]
+	} else {
+	    xcopyfile $fn $dstdir
+	}
+    }
+}
+ 
+-proc _exa {module exadir} {
+-    global distribution
+-    xcopy \
+-	    [file join $distribution examples $module] \
+-	    [file join $exadir $module] \
+-	    1
+-    return
+proc _exafile {fn dfn tclsh} {
+    set f [open $fn]
+    set d [read $f 2]
+    if {$d ne "#!"} {
+	close $f
+	xcopyfile $fn [file dirname $dfn]
+	return
+    }
+    chan configure $f -buffersize 100000
+    append d [read -nonewline $f]
+    close $f
+    log "Installing $fn to $dfn"
+    set execreplace "exec $tclsh "; append execreplace {"$0" ${1+"$@"}}
+    set envreplace "#! $tclsh"
+    set perms 0o444
+    set l [split $d \n]
+    set l2 [string trim [lindex $l 2]]
+    if {
+	[string match {#!*/*} [lindex $l 0]] &&
+	[string match {#*\\} [lindex $l 1]] && 
+	([string match {exec*tclsh*} $l2] ||
+	 [string match {exec*wish*} $l2])
+    } {
+	if {[string match {exec*wish*} $l2]} {
+	    set execreplace [string map {tclsh wish} $execreplace]
+	}
+	lset l 2 $execreplace
+	set perms 0o555
+    } elseif {[string match {#!*/env*tclsh*} [lindex $l 0]]} {
+	lset l 0 $envreplace
+	set perms 0o555
+    }
+    set f [open $dfn w]
+    puts $f [join $l \n]
+    close $f
+    file attributes $dfn -owner root -group bin -permissions $perms
+}
+
+proc _exa {module srcdir dstdir tclsh} {
+    _exax $module $module $srcdir $dstdir $tclsh
+}
+
+proc _exax {actual module srcdir dstdir tclsh} {
+    set dstdir [file join $dstdir $module]
+    if {![file exists $dstdir]} {
+	log "Making directory $dstdir"
+	file mkdir $dstdir
+	file attributes $dstdir -owner root -group bin -permissions 0o755
+    }
+    foreach fn [glob -nocomplain -dir [file join $srcdir $actual] *] {
+	if {[file isdirectory $fn]} {
+	    set m [file tail $fn] 
+	    _exax $m $m [file dirname $fn] $dstdir $tclsh
+	    continue
+	}
+	set t [file tail $fn]
+	set e [file extension $fn]
+	if {$t eq "ChangeLog" || $e in {.orig .beforesubst}} { continue }
+	if {$t in {run.tcl}} { continue }
+	if {$e in {.tcl ""}} {
+	    _exafile $fn [file join $dstdir $t] $tclsh
+	} else {
+	    xcopyfile $fn $dstdir
+	}
+    }
+ }
--- a/devel/tklib/patches/patch-support_installation_modules_tcl
+++ b/devel/tklib/patches/patch-support_installation_modules_tcl
@ -0,0 +1,12 @@
+$OpenBSD: patch-support_installation_modules_tcl,v 1.1 2013/11/14 09:43:09 stu Exp $
+--- support/installation/modules.tcl.orig	Wed Oct 30 14:44:52 2013
+++ support/installation/modules.tcl	Wed Nov  6 21:47:52 2013
+@@ -32,7 +32,7 @@ array set guide {}
+ 
+ #      name           pkg   doc   example
+ Module autoscroll    _tcl  _man  _null
+-Module canvas        _tcl  _man  _null
+Module canvas        _tcl  _man  _exa
+ Module chatwidget    _tcl  _man  _null
+ Module controlwidget _tcl  _man  _exa
+ Module ctext         _ctxt _man  _null
--- a/devel/tklib/pkg/PLIST
+++ b/devel/tklib/pkg/PLIST
@ -1,14 +1,38 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/01/05 16:37:10 stu Exp $
+@comment $OpenBSD: PLIST,v 1.3 2013/11/14 09:43:09 stu Exp $
+@conflict mentry-*
+@conflict wcb-*
+@pkgpath devel/mentry
+@pkgpath devel/wcb
 lib/tcl/autoscroll/
 lib/tcl/autoscroll/autoscroll.tcl
 lib/tcl/autoscroll/pkgIndex.tcl
 lib/tcl/canvas/
+lib/tcl/canvas/canvas_drag.tcl
+lib/tcl/canvas/canvas_epoints.tcl
+lib/tcl/canvas/canvas_epolyline.tcl
+lib/tcl/canvas/canvas_equad.tcl
+lib/tcl/canvas/canvas_gradient.tcl
+lib/tcl/canvas/canvas_highlight.tcl
+lib/tcl/canvas/canvas_mvg.tcl
+lib/tcl/canvas/canvas_snap.tcl
 lib/tcl/canvas/canvas_sqmap.tcl
+lib/tcl/canvas/canvas_tags.tcl
+lib/tcl/canvas/canvas_trlines.tcl
 lib/tcl/canvas/canvas_zoom.tcl
 lib/tcl/canvas/pkgIndex.tcl
 lib/tcl/chatwidget/
 lib/tcl/chatwidget/chatwidget.tcl
 lib/tcl/chatwidget/pkgIndex.tcl
+lib/tcl/controlwidget/
+lib/tcl/controlwidget/bindDown.tcl
+lib/tcl/controlwidget/controlwidget.tcl
+lib/tcl/controlwidget/led.tcl
+lib/tcl/controlwidget/pkgIndex.tcl
+lib/tcl/controlwidget/radioMatrix.tcl
+lib/tcl/controlwidget/rdial.tcl
+lib/tcl/controlwidget/tachometer.tcl
+lib/tcl/controlwidget/vertical_meter.tcl
+lib/tcl/controlwidget/voltmeter.tcl
 lib/tcl/crosshair/
 lib/tcl/crosshair/crosshair.tcl
 lib/tcl/crosshair/pkgIndex.tcl
@ -22,8 +46,16 @@ lib/tcl/datefield/
 lib/tcl/datefield/datefield.tcl
 lib/tcl/datefield/pkgIndex.tcl
 lib/tcl/diagrams/
-lib/tcl/diagrams/draw_diagram.tcl
+lib/tcl/diagrams/application.tcl
+lib/tcl/diagrams/attributes.tcl
+lib/tcl/diagrams/basic.tcl
+lib/tcl/diagrams/core.tcl
+lib/tcl/diagrams/diagram.tcl
+lib/tcl/diagrams/direction.tcl
+lib/tcl/diagrams/element.tcl
+lib/tcl/diagrams/navigation.tcl
 lib/tcl/diagrams/pkgIndex.tcl
+lib/tcl/diagrams/point.tcl
 lib/tcl/getstring/
 lib/tcl/getstring/pkgIndex.tcl
 lib/tcl/getstring/tk_getString.tcl
@ -49,22 +81,50 @@ lib/tcl/khim/pkgIndex.tcl
 lib/tcl/khim/pl.msg
 lib/tcl/khim/ru.msg
 lib/tcl/khim/uk.msg
+lib/tcl/mentry/
+lib/tcl/mentry/mentry.tcl
+lib/tcl/mentry/mentryPublic.tcl
+lib/tcl/mentry/mentry_tile.tcl
+lib/tcl/mentry/pkgIndex.tcl
+lib/tcl/mentry/scripts/
+lib/tcl/mentry/scripts/mentryDateTime.tcl
+lib/tcl/mentry/scripts/mentryFixedPoint.tcl
+lib/tcl/mentry/scripts/mentryIPAddr.tcl
+lib/tcl/mentry/scripts/mentryIPv6Addr.tcl
+lib/tcl/mentry/scripts/mentryThemes.tcl
+lib/tcl/mentry/scripts/mentryWidget.tcl
+lib/tcl/mentry/scripts/mwutil.tcl
+lib/tcl/mentry/scripts/tclIndex
+lib/tcl/menubar/
+lib/tcl/menubar/debug.tcl
+lib/tcl/menubar/menubar.tcl
+lib/tcl/menubar/node.tcl
+lib/tcl/menubar/pkgIndex.tcl
+lib/tcl/menubar/tree.tcl
 lib/tcl/ntext/
 lib/tcl/ntext/ntext.tcl
 lib/tcl/ntext/pkgIndex.tcl
 lib/tcl/plotchart/
 lib/tcl/plotchart/pkgIndex.tcl
 lib/tcl/plotchart/plot3d.tcl
+lib/tcl/plotchart/plotanim.tcl
 lib/tcl/plotchart/plotannot.tcl
 lib/tcl/plotchart/plotaxis.tcl
+lib/tcl/plotchart/plotbind.tcl
 lib/tcl/plotchart/plotbusiness.tcl
 lib/tcl/plotchart/plotchart.tcl
+lib/tcl/plotchart/plotcombined.tcl
 lib/tcl/plotchart/plotconfig.tcl
 lib/tcl/plotchart/plotcontour.tcl
 lib/tcl/plotchart/plotgantt.tcl
+lib/tcl/plotchart/plotobject.tcl
 lib/tcl/plotchart/plotpack.tcl
 lib/tcl/plotchart/plotpriv.tcl
+lib/tcl/plotchart/plotscada.tcl
+lib/tcl/plotchart/plotspecial.tcl
+lib/tcl/plotchart/plottable.tcl
 lib/tcl/plotchart/scaling.tcl
+lib/tcl/plotchart/xyplot.tcl
 lib/tcl/style/
 lib/tcl/style/as.tcl
 lib/tcl/style/lobster.tcl
@ -79,9 +139,9 @@ lib/tcl/tablelist/scripts/
 lib/tcl/tablelist/scripts/mwutil.tcl
 lib/tcl/tablelist/scripts/repair.tcl
 lib/tcl/tablelist/scripts/tablelistBind.tcl
-lib/tcl/tablelist/scripts/tablelistBitmaps.tcl
 lib/tcl/tablelist/scripts/tablelistConfig.tcl
 lib/tcl/tablelist/scripts/tablelistEdit.tcl
+lib/tcl/tablelist/scripts/tablelistImages.tcl
 lib/tcl/tablelist/scripts/tablelistMove.tcl
 lib/tcl/tablelist/scripts/tablelistSort.tcl
 lib/tcl/tablelist/scripts/tablelistThemes.tcl
@ -108,7 +168,18 @@ lib/tcl/tooltip/
 lib/tcl/tooltip/pkgIndex.tcl
 lib/tcl/tooltip/tipstack.tcl
 lib/tcl/tooltip/tooltip.tcl
+lib/tcl/wcb/
+lib/tcl/wcb/pkgIndex.tcl
+lib/tcl/wcb/scripts/
+lib/tcl/wcb/scripts/tclIndex
+lib/tcl/wcb/scripts/wcbCommon.tcl
+lib/tcl/wcb/scripts/wcbEntry.tcl
+lib/tcl/wcb/scripts/wcbListbox.tcl
+lib/tcl/wcb/scripts/wcbTablelist.tcl
+lib/tcl/wcb/scripts/wcbText.tcl
+lib/tcl/wcb/wcb.tcl
 lib/tcl/widget/
+lib/tcl/widget/arrowb.tcl
 lib/tcl/widget/calendar.tcl
 lib/tcl/widget/dateentry.tcl
 lib/tcl/widget/dialog.tcl
@ -122,19 +193,40 @@ lib/tcl/widget/stext.tcl
 lib/tcl/widget/superframe.tcl
 lib/tcl/widget/toolbar.tcl
 lib/tcl/widget/widget.tcl
+lib/tcl/widgetl/
+lib/tcl/widgetl/listentry.tcl
+lib/tcl/widgetl/listsimple.tcl
+lib/tcl/widgetl/pkgIndex.tcl
+lib/tcl/widgetv/
+lib/tcl/widgetv/pkgIndex.tcl
+lib/tcl/widgetv/validator.tcl
@man man/mann/autoscroll.n
-@man man/mann/canvas_sqmap.n
-@man man/mann/canvas_zoom.n
+@man man/mann/bitmap-editor.n
+@man man/mann/canvas::drag.n
+@man man/mann/canvas::epoints.n
+@man man/mann/canvas::epolyline.n
+@man man/mann/canvas::equad.n
+@man man/mann/canvas::gradient.n
+@man man/mann/canvas::highlight.n
+@man man/mann/canvas::mvg.n
+@man man/mann/canvas::snap.n
+@man man/mann/canvas::sqmap.n
+@man man/mann/canvas::tags.n
+@man man/mann/canvas::trlines.n
+@man man/mann/canvas::zoom.n
@man man/mann/canvaslabel.n
@man man/mann/chatwidget.n
+@man man/mann/controlwidget.n
@man man/mann/crosshair.n
@man man/mann/ctext.n
@man man/mann/cursor.n
@man man/mann/datefield.n
-@man man/mann/draw_diagram.n
+@man man/mann/diagram-viewer.n
+@man man/mann/diagram.n
@man man/mann/ico.n
@man man/mann/ipentry.n
@man man/mann/khim.n
+@man man/mann/menubar.n
@man man/mann/ntext.n
@man man/mann/ntextBindings.n
@man man/mann/ntextIndent.n
@ -146,26 +238,151 @@ lib/tcl/widget/widget.tcl
@man man/mann/swaplist.n
@man man/mann/tk_getString.n
@man man/mann/tklib.n
-@man man/mann/tklib_history.n
+@man man/mann/tklib::history.n
@man man/mann/tooltip.n
@man man/mann/widget.n
-@man man/mann/widget_calendar.n
-@man man/mann/widget_toolbar.n
+@man man/mann/widget::calendar.n
+@man man/mann/widget::dateentry.n
+@man man/mann/widget::listentry.n
+@man man/mann/widget::listsimple.n
+@man man/mann/widget::toolbar.n
+@man man/mann/widget::validator.n
+share/doc/mentry/
+share/doc/mentry/CHANGES.txt
+share/doc/mentry/COPYRIGHT.txt
+share/doc/mentry/README.txt
+share/doc/mentry/datetime1.png
+share/doc/mentry/datetime2.png
+share/doc/mentry/ethernetaddr.png
+share/doc/mentry/index.html
+share/doc/mentry/mentry.html
+share/doc/mentry/mentryDateTime.html
+share/doc/mentry/mentryFixedPoint.html
+share/doc/mentry/mentryIPAddr.html
+share/doc/mentry/mentryIPv6Addr.html
+share/doc/mentry/mentryThemes.html
+share/doc/mentry/mentryWidget.html
+share/doc/mentry/phonenumber.png
+share/doc/mentry/phonenumber_tile.png
+share/doc/mentry/wcbRef.html
+share/doc/tablelist/
+share/doc/tablelist/CHANGES.txt
+share/doc/tablelist/COPYRIGHT.txt
+share/doc/tablelist/README.txt
+share/doc/tablelist/adwaita.png
+share/doc/tablelist/ambiance.png
+share/doc/tablelist/aqua.png
+share/doc/tablelist/arrowStyles.png
+share/doc/tablelist/baghira.png
+share/doc/tablelist/browse.png
+share/doc/tablelist/browseTree.png
+share/doc/tablelist/bwidget.png
+share/doc/tablelist/config.png
+share/doc/tablelist/dirViewer.png
+share/doc/tablelist/dust.png
+share/doc/tablelist/dustSand.png
+share/doc/tablelist/embeddedWindows.png
+share/doc/tablelist/embeddedWindows_tile.png
+share/doc/tablelist/gtk.png
+share/doc/tablelist/index.html
+share/doc/tablelist/klearlooks.png
+share/doc/tablelist/mint.png
+share/doc/tablelist/newWave.png
+share/doc/tablelist/oxygen1.png
+share/doc/tablelist/oxygen2.png
+share/doc/tablelist/phase.png
+share/doc/tablelist/plastik.png
+share/doc/tablelist/plastique.png
+share/doc/tablelist/radiance.png
+share/doc/tablelist/styles.png
+share/doc/tablelist/tablelist.html
+share/doc/tablelist/tablelistBWidget.html
+share/doc/tablelist/tablelistBinding.html
+share/doc/tablelist/tablelistColSort.html
+share/doc/tablelist/tablelistCombobox.html
+share/doc/tablelist/tablelistCtext.html
+share/doc/tablelist/tablelistIwidgets.html
+share/doc/tablelist/tablelistMentry.html
+share/doc/tablelist/tablelistThemes.html
+share/doc/tablelist/tablelistTile.html
+share/doc/tablelist/tablelistTkCore.html
+share/doc/tablelist/tablelistWidget.html
+share/doc/tablelist/tileWidgets.png
+share/doc/tablelist/ubuntu.png
+share/doc/tablelist/vistaAero.png
+share/doc/tablelist/vistaClassic.png
+share/doc/tablelist/win7Aero.png
+share/doc/tablelist/win7Classic.png
+share/doc/tablelist/winnative.png
+share/doc/tablelist/winxpBlue.png
+share/doc/tablelist/winxpOlive.png
+share/doc/tablelist/winxpSilver.png
+share/doc/wcb/
+share/doc/wcb/CHANGES.txt
+share/doc/wcb/COPYRIGHT.txt
+share/doc/wcb/README.txt
+share/doc/wcb/entrytest.png
+share/doc/wcb/index.html
+share/doc/wcb/listboxtest1.png
+share/doc/wcb/listboxtest2.png
+share/doc/wcb/texttest1.png
+share/doc/wcb/texttest2.png
+share/doc/wcb/wcb.html
+share/doc/wcb/wcbRef.html
 share/examples/tklib/
+share/examples/tklib/apps/
+share/examples/tklib/apps/bitmap-editor
+share/examples/tklib/apps/diagram-viewer
 share/examples/tklib/canvas/
 share/examples/tklib/canvas/city.tcl
 share/examples/tklib/canvas/citygrid.tcl
+share/examples/tklib/canvas/crosshairs_for_axes.tcl
+share/examples/tklib/canvas/crosshairs_for_multixyplot.tcl
+share/examples/tklib/canvas/crosshairs_scaled.tcl
+share/examples/tklib/canvas/demo_draghigh.tcl
+share/examples/tklib/canvas/demo_editpoints.tcl
+share/examples/tklib/canvas/demo_editpoly.tcl
+share/examples/tklib/canvas/demo_editquad.tcl
+share/examples/tklib/canvas/demo_editquadconvex.tcl
 share/examples/tklib/canvas/locationmarks.gps
 share/examples/tklib/canvas/morgens.jpg
 share/examples/tklib/canvas/osm.tcl
 share/examples/tklib/canvas/puzzle.tcl
 share/examples/tklib/canvas/seawalk.gps
+share/examples/tklib/controlwidget/
+share/examples/tklib/controlwidget/demo-meters.tcl
+share/examples/tklib/controlwidget/demo-rdial.tcl
+share/examples/tklib/controlwidget/demo-tachometer.tcl
+share/examples/tklib/controlwidget/demo-voltmeter.tcl
+share/examples/tklib/mentry/
+share/examples/tklib/mentry/datetime1.tcl
+share/examples/tklib/mentry/datetime1_tile.tcl
+share/examples/tklib/mentry/datetime2.tcl
+share/examples/tklib/mentry/datetime2_tile.tcl
+share/examples/tklib/mentry/ethernetaddr.tcl
+share/examples/tklib/mentry/ethernetaddr_tile.tcl
+share/examples/tklib/mentry/option.tcl
+share/examples/tklib/mentry/option_tile.tcl
+share/examples/tklib/mentry/phonenumber.tcl
+share/examples/tklib/mentry/phonenumber_tile.tcl
+share/examples/tklib/menubar/
+share/examples/tklib/menubar/demo.tcl
 share/examples/tklib/ntext/
 share/examples/tklib/ntext/ntextDemoBindings.tcl
 share/examples/tklib/ntext/ntextDemoIndent.tcl
 share/examples/tklib/ntext/ntextExample.tcl
 share/examples/tklib/plotchart/
+share/examples/tklib/plotchart/demo.tcl
+share/examples/tklib/plotchart/editgraph.tcl
 share/examples/tklib/plotchart/plotdemos1.tcl
+share/examples/tklib/plotchart/plotdemos10.tcl
+share/examples/tklib/plotchart/plotdemos11.tcl
+share/examples/tklib/plotchart/plotdemos12.tcl
+share/examples/tklib/plotchart/plotdemos13.tcl
+share/examples/tklib/plotchart/plotdemos14.tcl
+share/examples/tklib/plotchart/plotdemos15.tcl
+share/examples/tklib/plotchart/plotdemos16.tcl
+share/examples/tklib/plotchart/plotdemos17.tcl
 share/examples/tklib/plotchart/plotdemos2.tcl
 share/examples/tklib/plotchart/plotdemos3.tcl
 share/examples/tklib/plotchart/plotdemos4.tcl
@ -173,24 +390,55 @@ share/examples/tklib/plotchart/plotdemos5.tcl
 share/examples/tklib/plotchart/plotdemos6.tcl
 share/examples/tklib/plotchart/plotdemos7.tcl
 share/examples/tklib/plotchart/plotdemos8.tcl
+share/examples/tklib/plotchart/plotdemos9.tcl
+share/examples/tklib/plotchart/plothist.tcl
+share/examples/tklib/plotchart/rosenbrock.tcl
+share/examples/tklib/plotchart/scope.tcl
+share/examples/tklib/plotchart/slidercnv.tcl
 share/examples/tklib/plotchart/tcllogo.gif
+share/examples/tklib/plotchart/test-convex.tcl
+share/examples/tklib/plotchart/test-histogram.tcl
+share/examples/tklib/plotchart/test-spiralpie.tcl
+share/examples/tklib/plotchart/test_legend.tcl
+share/examples/tklib/plotchart/test_stripchart.tcl
+share/examples/tklib/plotchart/test_ternary.tcl
+share/examples/tklib/plotchart/testdots.tcl
+share/examples/tklib/plotchart/testfunc.tcl
+share/examples/tklib/plotchart/testmask.tcl
+share/examples/tklib/plotchart/testmultiplexy.tcl
+share/examples/tklib/plotchart/testmultixy.tcl
+share/examples/tklib/plotchart/testneedle.tcl
+share/examples/tklib/plotchart/testshadexy.tcl
+share/examples/tklib/plotchart/testtable.tcl
+share/examples/tklib/plotchart/testtxplot.tcl
+share/examples/tklib/plotchart/testxypie.tcl
+share/examples/tklib/plotchart/timeinxyplot.tcl
+share/examples/tklib/plotchart/xyplot_demo.tcl
 share/examples/tklib/tablelist/
 share/examples/tklib/tablelist/browse.tcl
+share/examples/tklib/tablelist/browseTree.tcl
+share/examples/tklib/tablelist/browseTree_tile.tcl
 share/examples/tklib/tablelist/browse_tile.tcl
 share/examples/tklib/tablelist/bwidget.tcl
 share/examples/tklib/tablelist/bwidget_tile.tcl
 share/examples/tklib/tablelist/checked.gif
+share/examples/tklib/tablelist/clsdFolder.gif
 share/examples/tklib/tablelist/comp.xbm
 share/examples/tklib/tablelist/config.tcl
 share/examples/tklib/tablelist/config_tile.tcl
+share/examples/tklib/tablelist/dirViewer.tcl
+share/examples/tklib/tablelist/dirViewer_tile.tcl
 share/examples/tklib/tablelist/embeddedWindows.tcl
 share/examples/tklib/tablelist/embeddedWindows_tile.tcl
+share/examples/tklib/tablelist/file.gif
+share/examples/tklib/tablelist/images.tcl
 share/examples/tklib/tablelist/iwidgets.tcl
 share/examples/tklib/tablelist/iwidgets_tile.tcl
 share/examples/tklib/tablelist/leaf.xbm
 share/examples/tklib/tablelist/miscWidgets.tcl
 share/examples/tklib/tablelist/miscWidgets_tile.tcl
 share/examples/tklib/tablelist/open.gif
+share/examples/tklib/tablelist/openFolder.gif
 share/examples/tklib/tablelist/option.tcl
 share/examples/tklib/tablelist/option_tile.tcl
 share/examples/tklib/tablelist/styles.tcl
@ -199,5 +447,12 @@ share/examples/tklib/tablelist/tileWidgets.tcl
 share/examples/tklib/tablelist/unchecked.gif
 share/examples/tklib/tkpiechart/
 share/examples/tklib/tkpiechart/demo.tcl
+share/examples/tklib/wcb/
+share/examples/tklib/wcb/entrytest.tcl
+share/examples/tklib/wcb/listboxtest1.tcl
+share/examples/tklib/wcb/listboxtest2.tcl
+share/examples/tklib/wcb/option.tcl
+share/examples/tklib/wcb/texttest1.tcl
+share/examples/tklib/wcb/texttest2.tcl
 share/examples/tklib/widget/
 share/examples/tklib/widget/screenruler.tcl