Ticket #25268: normalize-filepath.diff

src/registry2.0/portimage.tcl

@@ -705 +705 @@
             # match and activate will say that some file exists but doesn't
             # belong to any port.
             set theFile [file normalize $file]
-            lappend files $theFile
-
-            # Split out the filename's subpaths and add them to the image list as
-            # well. The realpath call is necessary because file normalize
+            # The realpath call is necessary because file normalize
             # does not resolve symlinks on OS X < 10.6
             set directory [realpath [file dirname $theFile]]
-            while { [lsearch -exact $files $directory] == -1 } { 
+            lappend files [file join $directory [file tail $theFile]]
+
+            # Split out the filename's subpaths and add them to the image list
+            # as well.
+            while { [lsearch -exact $files $directory] == -1 } {
                 lappend files $directory
                 set directory [file dirname $directory]
             }