- Force binding with wish8.3, even if wish8.4 is installed.

- install and build, even if no DISPLAY is running
This will allow packages to be build on bento

4 files changed, 44 insertions, 16 deletions

diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index 32659183b207..54e457ae5305 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -22,13 +22,17 @@ RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 .if defined(ZIRCON_WITH_TCL84) || defined(ZIRCON_WITH_TK84)
-TCL_INCLUDE=	${LOCALBASE}/include/tcl8.4
+TCL_VER=	8.4
 .else
-TCL_INCLUDE=	${LOCALBASE}/include/tcl8.3
+TCL_VER=	8.3
 .endif
 
 do-configure:
-	${REINPLACE_CMD} -e 's=%%TCL_INCLUDE%%=${TCL_INCLUDE}=' \
+	${REINPLACE_CMD} -e 's=%%WISH%%=wish${TCL_VER}=' \
+		-e 's=%%TCLSH%%=tclsh${TCL_VER}=' \
+		${WRKSRC}/installZircon
+	${REINPLACE_CMD} -e 's=%%WISH%%=wish${TCL_VER}=' \
+		-e 's=%%TCL_INCLUDE%%=${LOCALBASE}/include/tcl${TCL_VER}=' \
 		${WRKSRC}/installer/unix.tcl
 
 do-install:
diff --git a/irc/zircon/files/patch-installZircon b/irc/zircon/files/patch-installZircon
new file mode 100644
index 000000000000..63ac791a203f
--- /dev/null
+++ b/irc/zircon/files/patch-installZircon
@@ -0,0 +1,24 @@
+--- installZircon.orig	Wed Jun  7 11:16:06 2000
++++ installZircon	Fri Aug 15 20:29:58 2003
+@@ -2,19 +2,14 @@
+ #
+ # Thanks to Alain Nissen for this - I couldn't be fashed to do it!!
+ #
+-if test -z "$DISPLAY"
+-then
+-  echo You must run this program under the X-Window System
+-  exit 1
+-fi
+ IFS="${IFS=   }"
+ old_ifs="$IFS"
+ IFS="${IFS}:"
+ if test -z "$*"
+ then
+-    progs="wish8.4 wish8.3 wish8.2 wish8.1 wish8.0 wish4.2 wish4.1 wish wish"
++    progs="%%WISH%%"
+ else 
+-    progs="tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh4.2 tclsh"
++    progs="%%TCLSH%%"
+ fi
+ my_wish=
+ for wish in $progs
diff --git a/irc/zircon/files/patch-support.tcl b/irc/zircon/files/patch-support.tcl
index 415aacd1177c..b0048edd5621 100644
--- a/irc/zircon/files/patch-support.tcl
+++ b/irc/zircon/files/patch-support.tcl
@@ -5,7 +5,7 @@
  	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} {
++	    foreach x {Type Lib Bin CC SCflag SLDflag CFlags WishCmd TIDir} {
  		puts $fd "set $x {[uplevel #0 set $x]}"
  	    }
  	    close $fd
@@ -14,7 +14,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\
++    global Type types Lib Bin CC LD Version Patchlevel WishCmd types cflags\
        libs share SCflag GCC SLDflag CFlags TIDir Prefix ExecPrefix SED go \
        pseudo
  #
@@ -23,7 +23,7 @@
      set SLDflag {}
      set CFlags {}
 -    set Wish {}
-+    set IWish {}
++    set WishCmd {}
      set TIDir {}
      set go 0
      set SED 0
@@ -32,7 +32,7 @@
  	-s {set SCflag $v}
  	-t {set Type $v }
 -	-w {set Wish $v}
-+	-w {set IWish $v}
++	-w {set WishCmd $v}
  	-z {set SLDflag $v }
  	}
  	set argv [lrange $argv 2 end]
@@ -41,7 +41,7 @@
  proc makeBinary {} {
      zinfo "Making zircon..."
 -    global Bin Lib Version Patchlevel Wish Xtn
-+    global Bin Lib Version Patchlevel IWish Xtn
++    global Bin Lib Version Patchlevel WishCmd Xtn
      if {![file exists [pWrap [set Bin [fixPath $Bin]]]]} {
  	if {[catch {dirmake [pWrap $Bin]} msg]} {
  	    fail "Cannot create directory \"$Bin\" - $msg"
@@ -50,7 +50,7 @@
  	return 0
      }
 -    puts $fd "#!$Wish
-+    puts $fd "#!$IWish
++    puts $fd "#!$WishCmd
  set zircon(lib) [whereLib]
  #
  proc zVersion {} {
diff --git a/irc/zircon/files/patch-unix.tcl b/irc/zircon/files/patch-unix.tcl
index 045813ac0092..d593ff5feed2 100644
--- a/irc/zircon/files/patch-unix.tcl
+++ b/irc/zircon/files/patch-unix.tcl
@@ -5,7 +5,7 @@
      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\
++    global Type types Lib Bin CC LD Version Patchlevel WishCmd 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}
@@ -14,7 +14,7 @@
  # Wish
  #
 -    makeEntry $w wish {Tcl/Tk Interpreter} Wish [incr i] getWish
-+    makeEntry $w wish {Tcl/Tk Interpreter} IWish [incr i] getWish
++    makeEntry $w wish {Tcl/Tk Interpreter} WishCmd [incr i] getWish
  #
  # Info
  #
@@ -24,13 +24,13 @@
  proc getWish {} {
 -    global Wish
 -    switch {} $Wish {set Wish [findWish]}
-+    global IWish
-+    switch {} $IWish {set IWish [findWish]}
++    global WishCmd
++    switch {} $WishCmd {set WishCmd [findWish]}
  }
  #
  proc getBin {} {
 -    global Bin env Lib Wish
-+    global Bin env Lib IWish
++    global Bin env Lib WishCmd
      switch {} $Bin {} default return
      foreach x [split $env(PATH) :] {
  	set z [file join $x zircon]
@@ -39,7 +39,7 @@
  	    if {![catch {open $z r} fd]} {
  		gets $fd wish
 -		set Wish [string range $wish 2 end]
-+		set IWish [string range $wish 2 end]
++		set WishCmd [string range $wish 2 end]
  		gets $fd lib
  		close $fd
  		set Lib [lindex $lib 2]	
@@ -57,7 +57,7 @@
      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} {
++	foreach y {%%WISH%%} {
  	    if {[file exists [set f [file join $x $y]]]} {
  		return $f
  	    }