- Fix a Installation problem, when only tk8.4 is installed.

3 files changed, 119 insertions, 11 deletions

diff --git a/irc/zircon/files/patch-aa b/irc/zircon/files/patch-aa
deleted file mode 100644
index 21795fe21bb2..000000000000
--- a/irc/zircon/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- installer/unix.tcl.orig	Wed Jul 14 05:39:14 1999
-+++ installer/unix.tcl	Fri Oct 29 12:56:37 1999
-@@ -181,7 +181,7 @@
- proc getCC {} {
-     global CC GCC SCflag CFlags Type SLDflag share scflags
-     switch {} $CC {} default return
--    set CFlags -O
-+    set CFlags {-O -I/usr/local/include/tcl8.4}
-     catch {set CFlags $cflags($Type)}
-     switch BSDI $Type {
- 	set CC gcc2
diff --git a/irc/zircon/files/patch-support.tcl b/irc/zircon/files/patch-support.tcl
new file mode 100644
index 000000000000..415aacd1177c
--- /dev/null
+++ b/irc/zircon/files/patch-support.tcl
@@ -0,0 +1,56 @@
+--- installer/support.tcl.orig	Wed Feb  2 11:09:16 2000
++++ installer/support.tcl	Sat Jul 26 18:54:54 2003
+@@ -45,7 +45,7 @@
+ 	zinfo Done!!
+ 	if {[catch {open install.in w} fd]} {
+ 	} {
+-	    foreach x {Type Lib Bin CC SCflag SLDflag CFlags Wish TIDir} {
++	    foreach x {Type Lib Bin CC SCflag SLDflag CFlags IWish TIDir} {
+ 		puts $fd "set $x {[uplevel #0 set $x]}"
+ 	    }
+ 	    close $fd
+@@ -110,7 +110,7 @@
+ }
+ #
+ proc doGlobals {argv} {
+-    global Type types Lib Bin CC LD Version Patchlevel Wish types cflags\
++    global Type types Lib Bin CC LD Version Patchlevel IWish types cflags\
+       libs share SCflag GCC SLDflag CFlags TIDir Prefix ExecPrefix SED go \
+       pseudo
+ #
+@@ -124,7 +124,7 @@
+     set SCflag {}
+     set SLDflag {}
+     set CFlags {}
+-    set Wish {}
++    set IWish {}
+     set TIDir {}
+     set go 0
+     set SED 0
+@@ -144,7 +144,7 @@
+ 	-p {set pseudo $v}
+ 	-s {set SCflag $v}
+ 	-t {set Type $v }
+-	-w {set Wish $v}
++	-w {set IWish $v}
+ 	-z {set SLDflag $v }
+ 	}
+ 	set argv [lrange $argv 2 end]
+@@ -273,7 +273,7 @@
+ #
+ proc makeBinary {} {
+     zinfo "Making zircon..."
+-    global Bin Lib Version Patchlevel Wish Xtn
++    global Bin Lib Version Patchlevel IWish Xtn
+     if {![file exists [pWrap [set Bin [fixPath $Bin]]]]} {
+ 	if {[catch {dirmake [pWrap $Bin]} msg]} {
+ 	    fail "Cannot create directory \"$Bin\" - $msg"
+@@ -298,7 +298,7 @@
+ 	}
+ 	return 0
+     }
+-    puts $fd "#!$Wish
++    puts $fd "#!$IWish
+ set zircon(lib) [whereLib]
+ #
+ proc zVersion {} {
diff --git a/irc/zircon/files/patch-unix.tcl b/irc/zircon/files/patch-unix.tcl
new file mode 100644
index 000000000000..0b480976a5f2
--- /dev/null
+++ b/irc/zircon/files/patch-unix.tcl
@@ -0,0 +1,63 @@
+--- installer/unix.tcl.orig	Wed Jun 13 09:20:29 2001
++++ installer/unix.tcl	Sat Jul 26 18:50:45 2003
+@@ -16,7 +16,7 @@
+     package require support
+     package require -exact unixfile 1.18.[info tclversion]
+ #
+-    global Type types Lib Bin CC LD Version Patchlevel Wish types cflags\
++    global Type types Lib Bin CC LD Version Patchlevel IWish types cflags\
+       libs share SCflag GCC SLDflag CFlags TIDir v7 SED go NoGUI Xtn
+ #
+     set types {AIX Alpha BSDI FreeBSD HP-UX IRIX Linux OSF1 {SunOS 4} {SunOS 5} UNIX_SV}
+@@ -81,7 +81,7 @@
+ #
+ # Wish
+ #
+-    makeEntry $w wish {Tcl/Tk Interpreter} Wish [incr i] getWish
++    makeEntry $w wish {Tcl/Tk Interpreter} IWish [incr i] getWish
+ #
+ # Info
+ #
+@@ -153,12 +153,12 @@
+ }
+ #
+ proc getWish {} {
+-    global Wish
+-    switch {} $Wish {set Wish [findWish]}
++    global IWish
++    switch {} $IWish {set IWish [findWish]}
+ }
+ #
+ proc getBin {} {
+-    global Bin env Lib Wish
++    global Bin env Lib IWish
+     switch {} $Bin {} default return
+     foreach x [split $env(PATH) :] {
+ 	set z [file join $x zircon]
+@@ -167,7 +167,7 @@
+ 	    set Bin $x
+ 	    if {![catch {open $z r} fd]} {
+ 		gets $fd wish
+-		set Wish [string range $wish 2 end]
++		set IWish [string range $wish 2 end]
+ 		gets $fd lib
+ 		close $fd
+ 		set Lib [lindex $lib 2]	
+@@ -181,7 +181,7 @@
+ proc getCC {} {
+     global CC GCC SCflag CFlags Type SLDflag share scflags
+     switch {} $CC {} default return
+-    set CFlags -O
++    set CFlags {-O -I/usr/local/include/tcl8.4}
+     catch {set CFlags $cflags($Type)}
+     switch BSDI $Type {
+ 	set CC gcc2
+@@ -220,7 +220,7 @@
+ proc findWish {} {
+     global env
+     foreach x [split $env(PATH) :] {
+-	foreach y {wish8.3 wish8.2 wish8.1 wish8.0 wish4.2 wish4.1 wish wishx} {
++	foreach y {wish8.4 wish8.3 wish8.2 wish8.1 wish8.0 wish4.2 wish4.1 wishx wishx} {
+ 	    if {[file exists [set f [file join $x $y]]]} {
+ 		return $f
+ 	    }