$NetBSD: patch-aa,v 1.6 2001/07/03 20:59:40 zuntum Exp $

--- doinstall.tcl.orig	Sun Dec 31 04:28:19 2000
+++ doinstall.tcl
@@ -2,5 +2,5 @@
 #-*-tcl-*-
 # the next line restarts using wish \
-if [ -z "$DISPLAY" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
+exec tclsh "$0" -- ${1+"$@"}
 
 #
@@ -20,6 +20,6 @@
   } else {
     set BINDIR [file join $INSTALLROOT bin]
-    set LIBDIR [file join $INSTALLROOT lib]
-    set MANDIR [file join $INSTALLROOT man mann]
+    set LIBDIR [file join $INSTALLROOT share]
+    set MANDIR [file join $INSTALLROOT man man1]
   }
 }
@@ -31,21 +31,4 @@
 
   set_paths $INSTALLROOT
-
-  set msg(1) [file join $BINDIR $TKCVS]
-  set msg(2) [file join $BINDIR $TKDIFF]
-  set msg(3) [file join $LIBDIR tkcvs *.tcl]
-  set msg(4) [file join $LIBDIR tkcvs bitmaps *.gif,xbm]
-  if {$tcl_platform(platform) == "unix"} {
-     set msg(5) [file join $MANDIR tkcvs.n]
-  }
-  foreach m [lsort [array names msg]] {
-    if {[winfo exists .messages.$m]} {
-      destroy .messages.$m
-    }
-    global var$m
-    set var$m $msg($m)
-    label .messages.$m -text $msg($m) -justify left -textvariable var$m
-    pack .messages.$m -side top -anchor w
-  }
 }
 
@@ -84,6 +67,6 @@
     file attributes [file join $BINDIR $TKDIFF] -permissions 0755
     file mkdir $MANDIR
-    puts "Installing manpage tkcvs.n in $MANDIR"
-    file copy -force [file join tkcvs tkcvs.n] $MANDIR
+    puts "Installing manpage tkcvs.1 in $MANDIR"
+    file copy -force [file join tkcvs tkcvs.1] $MANDIR
   }
 
@@ -103,11 +86,4 @@
   cd ..
   puts "Finished!"
-
-  if {$X} {
-    destroy .bottom.do
-    destroy .bottom.not
-    button .bottom.done -text "Finished!" -command {destroy .}
-    pack .bottom.done
-  }
 }
 
@@ -122,10 +98,5 @@
 
 # Check Tcl/TK version
-if {$tcl_version < 8.1} {
-   tk_dialog .wrongversion "Tcl/Tk too old" \
-   "TkCVS requires Tcl/Tk 8.1 or better!" \
-   error 0 {Bye Bye}
-   exit 1
-}
+# This is done by the package Makefile
 
 # Some rational and reasonable defaults.