Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.78.2.5 -r1.78.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	25 Feb 2021 10:37:33 -0000	1.78.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	22 Mar 2022 20:05:07 -0000	1.78.2.6
@@ -76,7 +76,7 @@
   } {
     ns_log notice "-- UPGRADE $from_version_name -> $to_version_name"
 
-    set upgrade_file [acs_root_dir]/packages/xowiki/tcl/upgrade/upgrade.tcl
+    set upgrade_file $::acs::rootdir/packages/xowiki/tcl/upgrade/upgrade.tcl
     #
     # The upgrade file contains the upgrade proc of the following form:
     #
Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.74 -r1.1.2.75
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	9 Mar 2022 16:48:10 -0000	1.1.2.74
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	22 Mar 2022 20:05:07 -0000	1.1.2.75
@@ -1467,7 +1467,7 @@
                                  -package_id $package_id \
                                  -creation_user [dict get $user_info user_id]]
             $file_object set import_file \
-                [acs_root_dir]/packages/acs-templating/www/resources/sort-ascending.png
+                $::acs::rootdir/packages/acs-templating/www/resources/sort-ascending.png
             $file_object save_new
             aa_true "$file_object was saved" [string is integer [$file_object item_id]]