diff -uNr wavesurfer-1.7.5-orig/wavesurfer.tcl wavesurfer-1.7.5/wavesurfer.tcl

--- wavesurfer-1.7.5-orig/wavesurfer.tcl	2004-12-02 18:05:39 +0200

+++ wavesurfer-1.7.5/wavesurfer.tcl	2004-12-24 03:45:12 +0200

@@ -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 7

 set version ${version_major}.${version_minor}

+lappend auto_path [file dirname [info script]]

 package require surfutil

 namespace eval ::splash {

@@ -2339,7 +2329,7 @@

 }

 proc About {} {

- tk_messageBox -title "About WaveSurfer" -message "WaveSurfer $::RELEASE/$::BUILD\n©2004 Kåre Sjölander\nand Jonas Beskow\n"

+ tk_messageBox -title "About WaveSurfer" -message "WaveSurfer $::RELEASE/$::BUILD\n 2004 Kåre Sjölander\nand Jonas Beskow\n"

 #Get the latest version at\nhttp://www.speech.kth.se/wavesurfer"

 }

@@ -3074,8 +3064,6 @@

  }

 }

-package require cmdline

-

 set argvcopy ""

 while {$argvcopy != $argv} {

  set argvcopy $argv

diff -uNr wavesurfer-1.7.5-orig/wsurf1.7/surfutil.tcl wavesurfer-1.7.5/wsurf1.7/surfutil.tcl

--- wavesurfer-1.7.5-orig/wsurf1.7/surfutil.tcl	2004-12-02 18:05:39 +0200

+++ wavesurfer-1.7.5/wsurf1.7/surfutil.tcl	2004-12-24 03:46:53 +0200

@@ -5,11 +5,11 @@

 # The latest version can be found at http://www.speech.kth.se/wavesurfer/

 #

+package require msgcat

 package provide surfutil 1.7

 if {[lsearch [package names] msgcat] != -1} {

   namespace eval util {

-    package require msgcat

     # load language files, stored in either ~/.wavesurfer/$version/msgs/ or

     # in msgs/ subdirectories

     if {[info exists ::version] && \

@@ -122,7 +122,13 @@

 proc util::tmpdir {} {

  switch -glob [string tolower $::tcl_platform(platform)] {

-  unix {set dir "/tmp"}

+  unix {

+   if {[info exists ::env(TMPDIR)] && $::env(TMPDIR) != ""} {

+    set dir $::env(TMPDIR)

+   } else {

+    set dir "/tmp"

+   }

+  }

   win* {

    if {[info exists ::env(TEMP)] && $::env(TEMP) != ""} {

     set dir $::env(TEMP)

@@ -253,7 +259,9 @@

  return

  switch $::tcl_platform(platform) {

   unix {

-    exec sh -c "netscape -remote 'openURL($url)' " &

+   if {[info exists ::env(BROWSER)] && ![string eq $::env(BROWSER) {}]} {

+    exec sh -c "$::env(BROWSER) $url" &

+   } 

   }

   windows {

    if {[string match $::tcl_platform(os) "Windows NT"]} {

@@ -281,6 +289,11 @@

  variable urlStack {}

  package require http

+

+ if {[info exists ::env(http_proxy)] &&

+     [regexp {http://([^:]+):(.+)$} $::env(http_proxy) {} proxyhost proxyport]} {

+     http::config -proxyhost $proxyhost -proxyport $proxyport

+ }

  proc ::HMset_image {.htmlbrowser.t handle src junk} {

   set tmp [lreplace [split $::util::currentUrl /] end end]

diff -uNr wavesurfer-1.7.5-orig/wsurf1.7/wsurf.tcl wavesurfer-1.7.5/wsurf1.7/wsurf.tcl

--- wavesurfer-1.7.5-orig/wsurf1.7/wsurf.tcl	2004-12-02 18:05:39 +0200

+++ wavesurfer-1.7.5/wsurf1.7/wsurf.tcl	2004-12-24 03:45:35 +0200

@@ -9,6 +9,7 @@

 package require -exact snack 2.2

 package require surfutil

 package require combobox

+package require http

 namespace eval wsurf {

  variable Info

@@ -3009,7 +3010,6 @@

  $p.f2.lb insert end \

    "Looking for plugins at http://www.speech.kth.se/wavesurfer/"

- package require http

  ::http::geturl http://www.speech.kth.se/wavesurfer/download_tcl -command [namespace code [list _showAvailablePlugins $p]]

  bind $p.f2.lb <<ListboxSelect>> \