New upstream version 3.1.18.1

1 files changed, 39 insertions, 15 deletions

diff --git a/lib/app-critcl/critcl.tcl b/lib/app-critcl/critcl.tcl
index 5d8eb0e..5d4127c 100644
--- a/lib/app-critcl/critcl.tcl
+++ b/lib/app-critcl/critcl.tcl
@@ -120,7 +120,7 @@ proc ::critcl::HandleDeclAfterBuild {} {
     append err [lindex [info level -1] 0]
     append err $cloc
     append err ": Illegal attempt to define C code in [This] after it was built."
-    append err \n [at::SHOWFRAMES] 
+    append err \n [at::SHOWFRAMES]
     error $err
 }
 
@@ -605,7 +605,7 @@ proc ::critcl::app::ProcessInput {} {
 	set v::org      {} ; # Organization the package is licensed by.
 	set v::ver      {} ; # Version of the package.
 	set v::cfiles   {} ; # Companion files (.tcl, .c, .h, etc).
-	set v::teasrc   {} ; # Input file(s) transformed for use in the Makefile.in. 
+	set v::teasrc   {} ; # Input file(s) transformed for use in the Makefile.in.
 	set v::imported {} ; # List of stubs APIs imported from elsewhere.
 	set v::config   {} ; # List of user-specified configuration settings.
 
@@ -1087,7 +1087,7 @@ proc ::critcl::app::PreloadSearchPath {shlib} {
 	}
     }
 
-    set ext [critcl::sharedlibext]	    
+    set ext [critcl::sharedlibext]
     return [list \
 		$tail$ext \
 		[file join $dir $tail$ext] \
@@ -1407,12 +1407,12 @@ proc ::critcl::app::AssembleTEA {} {
     # Get a proper version number
     set ver 0.0
     if {[llength $v::ver]} {
-	set ver [lindex $v::ver 0] 
+	set ver [lindex $v::ver 0]
     }
     # Get a proper organization this is licensed by
     set org Unknown
     if {[llength $v::org]} {
-	set org [lindex $v::org 0] 
+	set org [lindex $v::org 0]
     }
 
     PlaceTEASupport    $pkgdir $libname $ver $org
@@ -1634,11 +1634,30 @@ proc ::critcl::app::PlaceCritclSupport {pkgdir} {
     # support packages, and copy them into the TEA hierarchy for use
     # by the generated Makefile.
     foreach {pkg dir} {
-	critcl           critcl
-	critcl::app      app-critcl
-	critcl::util     critcl-util
-	dict84           util84
-	stubs::container stubs
+	critcl            critcl
+	critcl::app       app-critcl
+	critcl::util      critcl-util
+        critcl::class     critcl-class
+        critcl::iassoc    critcl-iassoc
+        critcl::bitmap    critcl-bitmap
+        critcl::cutil     critcl-cutil
+        critcl::emap      critcl-emap
+        critcl::enum      critcl-enum
+        critcl::literals  critcl-literals
+        critcl::platform  critcl-platform
+	dict84            dict84
+        lassign84         lassign84
+        lmap84            lmap84
+	stubs::container  stubs_container
+        stubs::gen        stubs_genframe
+        stubs::gen::decl  stubs_gen_decl
+        stubs::gen::lib   stubs_gen_lib
+        stubs::gen::macro stubs_gen_macro
+        stubs::gen::slot  stubs_gen_slot
+        stubs::gen::header stubs_gen_header
+        stubs::gen::init  stubs_gen_init
+        stubs::reader     stubs_reader
+        stubs::writer     stubs_writer
     } {
 	set cmd      [package ifneeded $pkg [package require $pkg]]
 	set location [file dirname [lindex $cmd end]]
@@ -1654,12 +1673,17 @@ proc ::critcl::app::PlaceCritclSupport {pkgdir} {
     # by whatever is installed outside.
 
     set     pfiles {}
-    lappend pfiles util84/lassign util84/dict
-    lappend pfiles stubs/container  stubs/reader    stubs/genframe
-    lappend pfiles stubs/gen_decl   stubs/gen_macro stubs/gen_slot
-    lappend pfiles stubs/gen_header stubs/gen_init  stubs/gen_lib
-    lappend pfiles stubs/writer
+    lappend pfiles lassign84/lassign dict84/dict lmap84/lmap
+    lappend pfiles stubs_container/container stubs_reader/reader
+    lappend pfiles stubs_genframe/genframe stubs_gen_decl/gen_decl
+    lappend pfiles stubs_gen_macro/gen_macro stubs_gen_slot/gen_slot
+    lappend pfiles stubs_gen_header/gen_header stubs_gen_init/gen_init
+    lappend pfiles stubs_gen_lib/gen_lib stubs_writer/writer
     lappend pfiles critcl/critcl app-critcl/critcl critcl-util/util
+    lappend pfiles critcl-class/class critcl-iassoc/iassoc
+    lappend pfiles critcl-bitmap/bitmap critcl-cutil/cutil
+    lappend pfiles critcl-literals/literals critcl-platform/platform
+    lappend pfiles critcl-emap/emap critcl-enum/enum
 
     set fd [open [file join $pkgdir critcl main.tcl] w]
     puts $fd [join \