--- saods9/ds9/unix/ds9.C.orig	2015-07-31 18:18:31.000000000 +0200
+++ saods9/ds9/unix/ds9.C	2016-03-30 18:08:03.509093523 +0200
@@ -70,11 +70,11 @@
 
   // so that tcl and tk know where to find their libs
   // we do it here before InitLibraryPath is called
-  putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
-  putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
+  // putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
+  // putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
 
   // startup script
-  Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/library/ds9.tcl",-1);
+  Tcl_Obj *path = Tcl_NewStringObj("/usr/share/ds9/zvfsmntpt/library/ds9.tcl",-1);
   Tcl_SetStartupScript(path, NULL);
 
   return TCL_OK;
@@ -173,69 +173,6 @@
   Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init, 
 		     (Tcl_PackageInitProc*)NULL);
 
-  // Tclxml
-  if (Tclxml_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-
-  // Tkimg
-  if (Tkimg_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "img", Tkimg_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // zlibtcl
-  if (Zlibtcl_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // jpegtcl
-  if (Jpegtcl_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimgjpeg
-  if (Tkimgjpeg_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // Tifftcl
-  if (Tifftcl_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimgtiff
-  if (Tkimgtiff_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // Pngtcl
-  if (Pngtcl_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
-  		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimgpng
-  if (Tkimgpng_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
-  		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimggif
-  if (Tkimggif_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimgwindow
-  if (Tkimgwindow_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "window", Tkimgwindow_Init,
-		     (Tcl_PackageInitProc*)NULL);
 
   // Signal_Ext
   if (Signal_ext_Init(interp) == TCL_ERROR)