  }
  
  delete_empty_dist_subdirs () {
-@@ -1269,9 +1354,11 @@
+@@ -1269,9 +1365,11 @@
  	esac
  }
  

 		pm_sv "Running pkg_delete for $ro_upg_port"
 		pm_pkg_delete_s -f $ro_upg_port
 	fi
@@ -3681,6 +3924,7 @@
 			unset preserve_port files
 		esac
 

 	esac
 
 	unset glob_dirs
@@ -511,20 +522,35 @@
 origin_from_pdb () {
 	local o
 
