--- saods9.orig/src/ds9.tcl	2009-11-04 02:32:17.000000000 +0000
+++ saods9/src/ds9.tcl	2009-11-04 02:50:39.000000000 +0000
@@ -34,24 +34,32 @@
 option add {*Label*BorderWidth} 2
 
 # initialize
-set ds9(root) "zvfsmntpt"
+set ds9(root) "/usr/share/ds9"
 
-source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl
-source $ds9(root)/tcl8.4/http2.5/http.tcl
+package require msgcat
+package require http
 
-source $ds9(root)/tk8.4/tearoff.tcl
 
-source $ds9(root)/tcllib1.10/base64/base64.tcl
-source $ds9(root)/tcllib1.10/log/log.tcl
-source $ds9(root)/tcllib1.10/ftp/ftp.tcl
-source $ds9(root)/tcllib1.10/textutil/repeat.tcl
-source $ds9(root)/tcllib1.10/textutil/tabify.tcl
-
-source $ds9(root)/tkcon2.5/tkcon.tcl
-source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
-
-source $ds9(root)/blt2.4/graph.tcl
-source $ds9(root)/blt2.4/tabset.tcl
+package require base64
+package require log
+package require ftp
+package require textutil::repeat
+package require textutil::tabify
+
+package require tkcon
+
+package require BLT
+package require Tktable
+package require tclxpa
+package require img::base
+package require img::jpeg
+package require img::tiff
+package require img::png
+package require img::gif
+package require img::ppm
+package require img::bmp
+package require img::xbm
+package require img::window
 
 source $ds9(root)/src/source.tcl