--- saods9/ds9/library/ds9.tcl.orig	2017-02-14 16:28:37.809983043 +0100
+++ saods9/ds9/library/ds9.tcl	2017-02-14 16:32:17.544092297 +0100
@@ -179,30 +179,24 @@
     x11 {
 	# set to absolute path so that if -cd command is used,
 	# so we can still find our files
-	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
+	set ds9(root) [file normalize /usr/share/ds9/zvfsmntpt]
 
 	if {![namespace exists msgcat]} {
-	    source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
+	    package require msgcat
 	}
 	if {![namespace exists http]} {
-	    source $ds9(root)/tcl8/8.6/http-2.8.9.tm
+	    package require http
 	    source $ds9(root)/library/htp.tcl
 	}
-
-	source $ds9(root)/tk8.6/tearoff.tcl
-	source $ds9(root)/tk8.6/comdlg.tcl
-	source $ds9(root)/tk8.6/focus.tcl
-	source $ds9(root)/tk8.6/mkpsenc.tcl
-	source $ds9(root)/tk8.6/msgbox.tcl
-	source $ds9(root)/tk8.6/optMenu.tcl
-	source $ds9(root)/tk8.6/unsupported.tcl
-
-	source $ds9(root)/tcllib/base64/base64.tcl
-	source $ds9(root)/tcllib/log/log.tcl
-	source $ds9(root)/tcllib/ftp/ftp.tcl
-	source $ds9(root)/tcllib/textutil/repeat.tcl
-	source $ds9(root)/tcllib/textutil/tabify.tcl
-	source $ds9(root)/tcllib/math/fuzzy.tcl
+	package require base64
+	package require log
+	package require ftp
+	package require textutil::repeat
+	package require textutil::tabify
+	package require math::fuzzy
+	package require xmlrpc
+	package require xml
+#	package require tclxpa
 
 	source $ds9(root)/tkcon/tkcon.tcl
 	source $ds9(root)/tkblt/graph.tcl