Bring the tix toolkit up to tcl/tk 8.4.

Also fix a broken shared lib configuration that caused the absolute
pathname (in the ports compilation directory) of the tix lib to be
recorded in the generated wish interpreter, so after removing the
compile directory from the machine, the interpreter could not be run
at all anymore.  Strange nobody ever comlained abou this.

Not Approved by:	maintainer (timeout)

1 files changed, 42 insertions, 34 deletions

diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 85d20b0..44d92d4 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,11 +1,11 @@
 --- Makefile.in.orig	Thu Feb 11 18:11:46 1999
-+++ Makefile.in	Sun Dec  5 07:04:11 1999
++++ Makefile.in	Fri Nov 28 11:12:45 2003
 @@ -1,7 +1,7 @@
  # Makefile --
  #
  # This file is a Makefile to compile Tix with Tk version
 -# 8.0. If it has the name "Makefile.in" then it is a
-+# 8.2. If it has the name "Makefile.in" then it is a
++# 8.4. If it has the name "Makefile.in" then it is a
  # template for a Makefile; to generate the actual Makefile, run
  # "./configure", which is a configuration script generated by the
  # "autoconf" program (constructs like "@foo@" will get replaced in the
@@ -14,13 +14,13 @@
  SHELL =		/bin/sh
  
 -# Location of the Tcl 8.0 source directory.
-+# Location of the Tcl 8.2 source directory.
++# Location of the Tcl 8.4 source directory.
  #
  TCL_SRC_DIR     = @TCL_SRC_DIR@
  TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
  
 -# Location of the Tk 8.0 source directory.
-+# Location of the Tk 8.2 source directory.
++# Location of the Tk 8.4 source directory.
  #
  TK_SRC_DIR      = @TK_SRC_DIR@
  TK_GENERIC_DIR  = $(TK_SRC_DIR)/generic
@@ -39,9 +39,9 @@
 -RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
 -		  TK_LIBRARY=$(TK_SRC_DIR)/library \
 -	          $(TCL_SRC_DIR)/unix/tclsh
-+RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.2 \
-+		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.2 \
-+	          $(TCL_SRC_DIR)/../../bin/tclsh8.2
++RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.4 \
++		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.4 \
++	          $(TCL_SRC_DIR)/../../bin/tclsh8.4
  
  
  #----------------------------------------------------------------
@@ -53,10 +53,10 @@
 -INST_TIX_SAMEXE  = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.0$(ITCL_EXT)
 -INST_TK_SAMEXE   = $(TK_SAMEXE_FILE)8.0
 -INST_TCL_SAMEXE  = $(TCL_SAMEXE_FILE)8.0
-+INST_EXE         = $(TIX_EXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
-+INST_TIX_SAMEXE  = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.2$(ITCL_EXT)
-+INST_TK_SAMEXE   = $(TK_SAMEXE_FILE)8.2
-+INST_TCL_SAMEXE  = $(TCL_SAMEXE_FILE)8.2
++INST_EXE         = $(TIX_EXE_FILE)$(TIX_VERSION).8.4$(ITCL_EXT)
++INST_TIX_SAMEXE  = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.4$(ITCL_EXT)
++INST_TK_SAMEXE   = $(TK_SAMEXE_FILE)8.4
++INST_TCL_SAMEXE  = $(TCL_SAMEXE_FILE)8.4
  
  SAM_TARGETS     = $(TIX_SAM_FILE)
  
@@ -65,7 +65,7 @@
  #----------------------------------------------------------------------
  
 -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
-+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.2/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.4/*.tcl
  
  TK_SCRIPTS = \
 -    $(TK_SRC_DIR)/library/bgerror.tcl \
@@ -89,31 +89,39 @@
 -    $(TK_SRC_DIR)/library/scrlbar.tcl \
 -    $(TK_SRC_DIR)/library/text.tcl \
 -    $(SRC_DIR)/generic/tk8.0/console.tcl
-+    $(TK_SRC_DIR)/../../lib/tk8.2/bgerror.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/dialog.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/focus.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/obsolete.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/optMenu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/palette.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/tearoff.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/clrpick.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/comdlg.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/msgbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/tkfbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/xmfbox.tcl \
-+    $(SRC_DIR)/generic/tk8.2/tk.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/button.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/entry.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/listbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/menu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/scale.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/scrlbar.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.2/text.tcl \
-+    $(SRC_DIR)/generic/tk8.2/console.tcl
++    $(TK_SRC_DIR)/../../lib/tk8.4/bgerror.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/dialog.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/focus.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/obsolete.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/optMenu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/palette.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/tearoff.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/clrpick.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/comdlg.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/msgbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/tkfbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/xmfbox.tcl \
++    $(SRC_DIR)/generic/tk8.4/tk.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/button.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/entry.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/listbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/menu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/scale.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/scrlbar.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.4/text.tcl \
++    $(SRC_DIR)/generic/tk8.4/console.tcl
  
  TIX_SCRIPTS = \
      $(SRC_DIR)/library/pref/*.fsc \
-@@ -372,7 +372,7 @@
+@@ -246,6 +246,7 @@
+ 	rm -f $(TIX_LIB_FILE)
+ 	@TIX_MAKE_LIB@
+ 	$(RANLIB) $(TIX_LIB_FILE)
++	ln -s $(TIX_LIB_FILE) ${TIX_LIB_FILE:C/\.[0-9]+$//}
+ 
+ $(TCL_SAM_FILE): $(TCL_SAM_OBJS)
+ 	rm -f $(TCL_SAM_FILE)
+@@ -372,7 +373,7 @@
  	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixImgXpm.c
  
  tixInit.o: $(GENERIC_DIR)/tixInit.c