Merge old 8.7 674a6ad0472c7

1 files changed, 4 insertions, 1 deletions

diff --git a/library/install.tcl b/library/install.tcl
index e62226e..26e5e68 100644
--- a/library/install.tcl
+++ b/library/install.tcl
@@ -35,6 +35,7 @@ proc ::practcl::_pkgindex_directory {path} {
       # Read the file, and override assumptions as needed
       ###
       set fin [open $file r]
+      fconfigure $fin -eofchar \032
       set dat [read $fin]
       close $fin
       # Look for a teapot style Package statement
@@ -58,6 +59,7 @@ proc ::practcl::_pkgindex_directory {path} {
     foreach file [glob -nocomplain $path/*.tcl] {
       if { [file tail $file] == "version_info.tcl" } continue
       set fin [open $file r]
+      fconfigure $fin -eofchar \032
       set dat [read $fin]
       close $fin
       if {![regexp "package provide" $dat]} continue
@@ -77,6 +79,7 @@ proc ::practcl::_pkgindex_directory {path} {
     return $buffer
   }
   set fin [open $pkgidxfile r]
+  fconfigure $fin -eofchar \032
   set dat [read $fin]
   close $fin
   set trace 0
@@ -104,7 +107,7 @@ proc ::practcl::_pkgindex_directory {path} {
     }
     if {![regexp "package.*ifneeded" $thisline]} {
       # This package index contains arbitrary code
-      # source instead of trying to add it to the master
+      # source instead of trying to add it to the main
       # package index
       if {$trace} { puts "[file dirname $pkgidxfile] Arbitrary code $thisline" }
       return {source [file join $dir pkgIndex.tcl]}