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)

3 files changed, 70 insertions, 69 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 4a5356b4e80b..a65930ff58d9 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	tix
 PORTVERSION=	4.1.0.007
-PORTREVISION=	2
-CATEGORIES=	x11-toolkits tk82
+PORTREVISION=	3
+CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=   http://www.neosoft.com/tcl/ftparchive/%SUBDIR%/ \
 		ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/%SUBDIR%/
 MASTER_SITE_SUBDIR= sorted/packages-8.0/x11/Tix/4.1.0.007
@@ -17,14 +17,14 @@ DISTNAME=	Tix${PORTVERSION}
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	An extension to the Tk toolkit
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/Tix4.1.0.007/unix/tk8.0
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tcl="${PREFIX}/include/tcl8.2" \
-		--with-tk="${PREFIX}/include/tk8.2"
+		--with-tcl="${PREFIX}/include/tcl8.4" \
+		--with-tk="${PREFIX}/include/tk8.4"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN1=		tixwish.1
@@ -37,8 +37,8 @@ MANN=		BtnBox.n Balloon.n ChkList.n Destroy.n ComboBox.n Control.n \
 		Select.n StdBBox.n TixIntro.n Tree.n Utils.n Wm.n compound.n \
 		pixmap.n tix.n
 
-TIX_LIB=	libtix4182.so
-TIXSAM_LIB=	libtixsam4182.so
+TIX_LIB=	libtix4184.so
+TIXSAM_LIB=	libtixsam4184.so
 TIX_LIB_FILE=	${TIX_LIB}.1
 TIXSAM_LIB_FILE=${TIXSAM_LIB}.1
 
@@ -54,7 +54,7 @@ pre-configure:
 post-install:
 	@(cd ${WRKSRC}/.. && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-	${LN} -fs ${PREFIX}/bin/tixwish4.1.8.2 ${PREFIX}/bin/tixwish
+	${LN} -fs ${PREFIX}/bin/tixwish4.1.8.4 ${PREFIX}/bin/tixwish
 	${LN} -fs ${TIX_LIB_FILE} ${PREFIX}/lib/${TIX_LIB}
 	${LN} -fs ${TIXSAM_LIB_FILE} ${PREFIX}/lib/${TIXSAM_LIB}
 .for dir in generic unix
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 2d809488aa9b..4cf59732d792 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Feb 15 03:20:06 1999
-+++ configure	Thu May  9 01:24:55 2002
+--- configure.orig	Mon Feb 15 04:20:06 1999
++++ configure	Fri Nov 28 11:11:28 2003
 @@ -14,9 +14,9 @@
  ac_help="$ac_help
    --enable-gcc            allow use of gcc if available"
  ac_help="$ac_help
 -  --with-tcl=DIR           use Tcl 8.0 source from DIR"
-+  --with-tcl=DIR           use Tcl 8.2 source from DIR"
++  --with-tcl=DIR           use Tcl 8.4 source from DIR"
  ac_help="$ac_help
 -  --with-tk=DIR           use Tk 8.0 source from DIR"
-+  --with-tk=DIR           use Tk 8.2 source from DIR"
++  --with-tk=DIR           use Tk 8.4 source from DIR"
  ac_help="$ac_help
    --enable-sam            build stand-alone modules"
  ac_help="$ac_help
@@ -17,7 +17,7 @@
  TIX_MINOR_VERSION=1
  
 -BIN_VERSION=${TIX_VERSION}.8.0
-+BIN_VERSION=${TIX_VERSION}.8.2
++BIN_VERSION=${TIX_VERSION}.8.4
  
  
  VERSION=${BIN_VERSION}
@@ -29,12 +29,12 @@
      if test ! -d $TCL_SRC_DIR; then
          { echo "configure: error: Directory $TCL_SRC_DIR doesn't exist" 1>&2; exit 1; }
 -        { echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; }
-+        { echo "configure: error: Please install the source code of Tcl 8.2" 1>&2; exit 1; }
++        { echo "configure: error: Please install the source code of Tcl 8.4" 1>&2; exit 1; }
          exit 1
      fi
  else
 -    dirs="../../../tcl8.0"
-+    dirs="../../../tcl8.2"
++    dirs="../../../tcl8.4"
      TCL_SRC_DIR="no-no"
      for i in $dirs; do
          if test -d $i; then
@@ -43,14 +43,14 @@
      if test ! -d $TCL_SRC_DIR; then
          { echo "configure: error: Cannot locate Tcl source directory in $dirs" 1>&2; exit 1; }
 -        { echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; }
-+        { echo "configure: error: Please install the source code of Tcl 8.2" 1>&2; exit 1; }
++        { echo "configure: error: Please install the source code of Tcl 8.4" 1>&2; exit 1; }
          exit 1
      fi
  fi
  echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
 -TCL_BIN_DIR=$TCL_SRC_DIR/unix
-+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.2
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.4
  
  #--------------------------------------------------------------------
  #	See if there was a command-line option for where Tk is;  if
@@ -62,12 +62,12 @@
      if test ! -d $TK_SRC_DIR; then
          { echo "configure: error: Directory $TK_SRC_DIR doesn't exist" 1>&2; exit 1; }
 -        { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; }
-+        { echo "configure: error: Please install the source code of Tk 8.2" 1>&2; exit 1; }
++        { echo "configure: error: Please install the source code of Tk 8.4" 1>&2; exit 1; }
          exit 1
      fi
  else
 -    dirs="../../../tk8.0"
-+    dirs="../../../tk8.2"
++    dirs="../../../tk8.4"
      TK_SRC_DIR="no-no"
      for i in $dirs; do
          if test -d $i; then
@@ -76,31 +76,24 @@
      if test ! -d $TK_SRC_DIR; then
          { echo "configure: error: Cannot locate Tk source directory in $dirs" 1>&2; exit 1; }
 -        { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; }
-+        { echo "configure: error: Please install the source code of Tk 8.2" 1>&2; exit 1; }
++        { echo "configure: error: Please install the source code of Tk 8.4" 1>&2; exit 1; }
          exit 1
      fi
  fi
  echo "$ac_t""$TK_SRC_DIR" 1>&6
  
 -TK_BIN_DIR=$TK_SRC_DIR/unix
-+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.2
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.4
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
-@@ -1141,17 +1143,19 @@
- # up the Tcl library.
- 
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}"
-+    TIX_BUILD_LIB_SPEC="`pwd`/libtix${VERSION}.so.1"
-     TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam${VERSION}"
+@@ -1146,12 +1148,14 @@
      TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}"
      TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}"
      TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}"
 +	LIB_VERSION="${VERSION}"
  else
--    TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`"
-+    TIX_BUILD_LIB_SPEC="`pwd`/libtix`echo ${VERSION} | tr -d .`.so.1"
+     TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`"
      TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`"
      TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`"
      TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`"
@@ -116,19 +109,19 @@
 -    eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
 -    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 +    eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1"
-+    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk82"
++    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk84"
  
      # The Tcl SAM library
      #
 -    VERSION=8.0
-+    VERSION=8.2
++    VERSION=8.4
      eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}"
      TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}"
      
      # The Tk SAM library
      #
 -    VERSION=8.0
-+    VERSION=8.2
++    VERSION=8.4
      eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}"
      TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}"
      
@@ -145,14 +138,14 @@
      # The Tcl SAM library
      
 -    VERSION=8.0
-+    VERSION=8.2
++    VERSION=8.4
      eval "TCL_SAM_FILE=libtclsam${TCL_UNSHARED_LIB_SUFFIX}"
      TCL_MAKE_SAM="ar cr ${TCL_SAM_FILE} \${TCL_SAM_OBJS}"
      
      # The Tk SAM library
      #
 -    VERSION=8.0
-+    VERSION=8.2
++    VERSION=8.4
      eval "TK_SAM_FILE=libtksam${TCL_UNSHARED_LIB_SUFFIX}"
      TK_MAKE_SAM="ar cr ${TK_SAM_FILE} \${TK_SAM_OBJS}"
      
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 85d20b0851c5..44d92d45258a 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