--- wavesurfer-1.8.3/wavesurfer.tcl..misc	2005-04-08 17:28:52 +0300
+++ wavesurfer-1.8.3/wavesurfer.tcl	2005-07-14 23:02:27 +0300
@@ -10,19 +10,8 @@
 # This file is part of the WaveSurfer package.
 # The latest version can be found at http://www.speech.kth.se/wavesurfer/
 #
-catch {package require Tk}
-
-# wrapit.tcl will insert code here to set the elements of the wrap() array
-
-if {[info exists wrap]} {
- # package dirs have to be listed explicitly for wrapping
- # a line setting wrap(dir) is added by the wrapping script
- set dir $wrap(dir)
- set auto_path "[file join $dir snack] [file join $dir wsurf] $auto_path"
-} else {
- set auto_path [concat [list [file dirname [info script]]] $auto_path]
-}
 
+package require cmdline
 package require tkcon
 set ::tkcon::OPT(exec) {}
 set ::tkcon::PRIV(root) .tkcon
@@ -32,6 +21,7 @@
 set version_minor 8
 set version ${version_major}.${version_minor}
 
+lappend auto_path [file dirname [info script]]
 package require surfutil
 namespace eval ::splash {
 
@@ -3250,8 +3240,6 @@
  }
 }
 
-package require cmdline
-
 set argvcopy ""
 while {$argvcopy != $argv} {
  set argvcopy $argv
--- wavesurfer-1.8.5/wsurf1.8/wsurf.tcl..notile	2005-11-01 16:29:54 +0300
+++ wavesurfer-1.8.5/wsurf1.8/wsurf.tcl	2006-07-24 01:37:13 +0400
@@ -9,8 +9,7 @@
 package require -exact snack 2.2
 package require surfutil
 package require combobox
-lappend auto_path /space/lib
-if {[catch {package require tile 0.5} msg]} {
+if {1 || [catch {package require tile 0.5} msg]} {
  set useTile 0
  set ::ocdir right
 } else {