Update to use Tcl/Tk version 8.2.

Submitted by:	Ade Lovett <ade@lovett.com>

6 files changed, 104 insertions, 68 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index ec72101eebcd..8905bf1b6fee 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -1,27 +1,27 @@
 # New ports collection makefile for:	tix
-# Version required:	4.1.0.006
+# Version required:	4.1.0.007
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Tix4.1.0.006
-PKGNAME=	tix-4.1.0.006
-CATEGORIES=	x11-toolkits tk80
-MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/devel/ \
-		ftp://ftp.gwdg.de/pub/x11/tcl/ftp.xpi.com/ \
-		ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/sorted/packages-7.6/devel/
+DISTNAME=	Tix4.1.0.007
+PKGNAME=	tix-4.1.0.007
+CATEGORIES=	x11-toolkits tk82
+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
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk8.0
+WRKSRC=		${WRKDIR}/Tix4.1.0.007/unix/tk8.0
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tcl="${PREFIX}/include/tcl8.0" \
-		--with-tk="${PREFIX}/include/tk8.0"
+		--with-tcl="${PREFIX}/include/tcl8.2" \
+		--with-tk="${PREFIX}/include/tk8.2"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN1=		tixwish.1
@@ -39,13 +39,8 @@ TIXSAM_LIB=	libtixsam4180.so
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
 TIX_LIB_FILE=	${TIX_LIB}.1
 TIXSAM_LIB_FILE=${TIXSAM_LIB}.1
-.else
-TIX_LIB_FILE=	${TIX_LIB}.1.2
-TIXSAM_LIB_FILE=${TIXSAM_LIB}.1.2
-.endif
 
 pre-configure:
 	@(cd ${WRKSRC}/.. && \
@@ -57,8 +52,6 @@ pre-configure:
 post-install:
 	@(cd ${WRKSRC}/.. && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-	@${MKDIR} ${PREFIX}/man/man1
-	@${CP} ${PREFIX}/man/mann/tixwish.1 ${PREFIX}/man/man1
 	${LN} -fs ${PREFIX}/bin/tixwish4.1.8.0 ${PREFIX}/bin/tixwish
 	${LN} -fs ${TIX_LIB_FILE} ${PREFIX}/lib/${TIX_LIB}
 	${LN} -fs ${TIXSAM_LIB_FILE} ${PREFIX}/lib/${TIXSAM_LIB}
diff --git a/x11-toolkits/tix/distinfo b/x11-toolkits/tix/distinfo
index 927791c36e5c..0c60a972d7bd 100644
--- a/x11-toolkits/tix/distinfo
+++ b/x11-toolkits/tix/distinfo
@@ -1 +1 @@
-MD5 (Tix4.1.0.006.tar.gz) = a3f5af73dfcd2b5dd9dab96040358efa
+MD5 (Tix4.1.0.007.tar.gz) = 3330c20d294cc3a6d20f08d1a4e7fdeb
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 38e6a37481b6..d376cc882950 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,40 +1,58 @@
---- configure.orig	Tue Sep 23 16:57:21 1997
-+++ configure	Sat Apr 24 14:13:14 1999
-@@ -1060,6 +1060,7 @@
+--- configure.orig	Sun Feb 14 21:20:06 1999
++++ configure	Wed Nov  3 14:21:25 1999
+@@ -1006,13 +1006,14 @@
  
  if test "$val" != ""; then
      TCL_SRC_DIR=$val
 +    tclsrcdir=$val
      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; }
-@@ -1082,7 +1083,7 @@
+-        { 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; }
+         exit 1
+     fi
+ else
+-    dirs="../../../tcl8.0"
++    dirs="../../../tcl8.2"
+     TCL_SRC_DIR="no-no"
+     for i in $dirs; do
+         if test -d $i; then
+@@ -1028,7 +1029,7 @@
  fi
  echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
 -TCL_BIN_DIR=$TCL_SRC_DIR/unix
-+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.0
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.2
  
  #--------------------------------------------------------------------
  #	See if there was a command-line option for where Tk is;  if
-@@ -1102,6 +1103,7 @@
+@@ -1048,13 +1049,14 @@
  
  if test "$val" != ""; then
      TK_SRC_DIR=$val
 +    tksrcdir=$val
      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; }
-@@ -1124,7 +1126,7 @@
+-        { 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; }
+         exit 1
+     fi
+ else
+-    dirs="../../../tk8.0"
++    dirs="../../../tk8.2"
+     TK_SRC_DIR="no-no"
+     for i in $dirs; do
+         if test -d $i; then
+@@ -1070,7 +1072,7 @@
  fi
  echo "$ac_t""$TK_SRC_DIR" 1>&6
  
 -TK_BIN_DIR=$TK_SRC_DIR/unix
-+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.0
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.2
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
-@@ -1195,17 +1197,19 @@
+@@ -1141,17 +1143,19 @@
  # up the Tcl library.
  
  if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
@@ -44,7 +62,7 @@
      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}"
++    LIBVERSION="${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"
@@ -52,11 +70,11 @@
      TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`"
      TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`"
      TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`"
-+	LIB_VERSION="`echo ${VERSION} | tr -d .`"
++    LIB_VERSION="`echo ${VERSION} | tr -d .`"
  fi
  
  #--------------------------------------------------------------------
-@@ -1227,7 +1231,7 @@
+@@ -1173,7 +1177,7 @@
  
      # The main Tix library
      #
@@ -65,7 +83,7 @@
      TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
  
      # The Tcl SAM library
-@@ -1245,7 +1249,7 @@
+@@ -1191,7 +1195,7 @@
      # The Tix SAM library
      #
      VERSION=${BIN_VERSION}
@@ -74,7 +92,7 @@
      TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}"
  
  else
-@@ -1707,15 +1711,15 @@
+@@ -1653,15 +1657,15 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@DL_LIBS@%$DL_LIBS%g
  s%@LD_FLAGS@%$LD_FLAGS%g
@@ -94,7 +112,7 @@
  s%@TK_BIN_DIR@%$TK_BIN_DIR%g
  s%@TK_XINCLUDES@%$TK_XINCLUDES%g
  s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g
-@@ -1738,8 +1742,8 @@
+@@ -1684,8 +1688,8 @@
  s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g
  s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g
  s%@TIX_DEFS@%$TIX_DEFS%g
diff --git a/x11-toolkits/tix/files/patch-ab b/x11-toolkits/tix/files/patch-ab
index 4f1522890f89..2c171fb6502c 100644
--- a/x11-toolkits/tix/files/patch-ab
+++ b/x11-toolkits/tix/files/patch-ab
@@ -1,5 +1,5 @@
---- ../Makefile.in.orig	Wed Jul  9 22:33:48 1997
-+++ ../Makefile.in	Wed Oct  1 12:03:37 1997
+--- ../Makefile.in.orig	Thu Mar 18 11:44:17 1999
++++ ../Makefile.in	Wed Nov  3 14:35:27 1999
 @@ -28,7 +28,7 @@
  # Directory in which to install the library of Tix scripts and demos
  # (note: you can set the TIX_LIBRARY environment variable at run-time to
@@ -18,3 +18,26 @@
  
  install-headers:
  	@for i in $(INCLUDE_DIR); \
+@@ -219,12 +219,20 @@
+ 		else true; \
+ 		fi; \
+ 	    done;
+-	@cd $(MANUAL_DIR); for i in *.n *.1; \
++	@cd $(MANUAL_DIR); for i in *.1; \
++	    do \
++	    echo "Installing doc/$$i"; \
++	    rm -f $(MAN1_DIR)/$$i; \
++	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
++		    $$i > $(MAN1_DIR)/$$i; \
++	    chmod 444 $(MAN1_DIR)/$$i; \
++	    done;
++	@cd $(MANUAL_DIR); for i in *.n; \
+ 	    do \
+ 	    echo "Installing doc/$$i"; \
+ 	    rm -f $(MANN_DIR)/$$i; \
+ 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+-		    $$i > $(MANN_DIR)/$$i; \
++		$$i > $(MANN_DIR)/$$i; \
+ 	    chmod 444 $(MANN_DIR)/$$i; \
+ 	    done;
+ 
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 2ff8b1059a6b..8de6caceb052 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Sep 23 16:57:18 1997
-+++ Makefile.in	Wed Apr  7 03:20:49 1999
+--- Makefile.in.orig	Thu Feb 11 11:11:46 1999
++++ Makefile.in	Wed Nov  3 14:25:19 1999
 @@ -29,7 +29,7 @@
  # Directory in which to install the library of Tix scripts and demos
  # (note: you can set the TIX_LIBRARY environment variable at run-time to
@@ -26,18 +26,18 @@
 -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.0 \
-+		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.0 \
-+	          $(TCL_SRC_DIR)/../../bin/tclsh8.0
++RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.2 \
++		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.2 \
++	          $(TCL_SRC_DIR)/../../bin/tclsh8.2
  
  
  #----------------------------------------------------------------
-@@ -210,29 +213,29 @@
+@@ -210,30 +210,30 @@
  # scripts of TK must be included in the fixed order.
  #----------------------------------------------------------------------
  
 -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
-+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.0/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.2/*.tcl
  
  TK_SCRIPTS = \
 -    $(TK_SRC_DIR)/library/bgerror.tcl \
@@ -60,26 +60,28 @@
 -    $(TK_SRC_DIR)/library/scale.tcl \
 -    $(TK_SRC_DIR)/library/scrlbar.tcl \
 -    $(TK_SRC_DIR)/library/text.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/bgerror.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/dialog.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/focus.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/obsolete.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/optMenu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/palette.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/tearoff.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/clrpick.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/comdlg.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/msgbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/tkfbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/xmfbox.tcl \
-+    $(SRC_DIR)/generic/tk8.0/tk.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/button.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/entry.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/listbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/menu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/scale.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/scrlbar.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.0/text.tcl \
-     $(SRC_DIR)/generic/tk8.0/console.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
  
  TIX_SCRIPTS = \
+     $(SRC_DIR)/library/pref/*.fsc \
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index f7b12fde612b..fc812a20eb36 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -16,9 +16,9 @@ include/tix/generic/tixPort.h
 include/tix/generic/tixTList.h
 include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
-lib/libtix4180.so.1.2
+lib/libtix4180.so.1
 lib/libtix4180.so
-lib/libtixsam4180.so.1.2
+lib/libtixsam4180.so.1
 lib/libtixsam4180.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R