Ticket #5065: destroot.patch

src/port1.0/portdestroot.tcl

@@ -105 +105 @@
 
 proc destroot_finish {args} {
     global UI_PREFIX destroot prefix portname startupitem.create destroot::oldmask
-        global os.platform os.version
+        global os.platform os.version x11prefix
 
     # Create startup-scripts/items
     if {[tbool startupitem.create]} {
         package require portstartupitem 1.0
         startupitem_create
     }
+    
+    # Check for X11/app-defaults directory and move it if needed
+    if {[file exists ${destroot}${x11prefix}/lib/X11/app-defaults]} {
+        if {[file type ${x11prefix}/lib/X11] == "link" } {
+            xinstall -d ${destroot}/etc/X11
+            file rename -force ${destroot}${x11prefix}/lib/X11/app-defaults ${destroot}/etc/X11
+        }
+    } elseif {[file exists ${destroot}/etc/X11/app-defaults]} {
+        if {[file type ${x11prefix}/lib/X11] == "directory" } {
+            xinstall -d ${destroot}${x11prefix}/lib/X11
+            file rename -force ${destroot}/etc/X11/app-defaults ${destroot}${x11prefix}/lib/X11
+        }
+    }
 
     # Prune empty directories in ${destroot}
     set exclude_dirs [list]