Update to use Tcl/Tk version 8.2.

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

15 files changed, 99 insertions, 30 deletions

diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 8ebc6ccad5ca..7b66553d320c 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -8,12 +8,12 @@
 
 DISTNAME=	SpecTcl1.1
 PKGNAME=	SpecTcl-1.1
-CATEGORIES=	devel tk80
+CATEGORIES=	devel tk82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/guitools/
 
 MAINTAINER=	andreas@FreeBSD.org
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
 
diff --git a/devel/SpecTcl/files/patch-aa b/devel/SpecTcl/files/patch-aa
index da3ccd3320fc..affca9a72e0b 100644
--- a/devel/SpecTcl/files/patch-aa
+++ b/devel/SpecTcl/files/patch-aa
@@ -9,7 +9,7 @@
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.0
++WISH=wish8.2
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk $@ &
  echo "Starting SpecTcl 1.1"
diff --git a/devel/SpecTcl/files/patch-ab b/devel/SpecTcl/files/patch-ab
index 989a413e26ae..c7098ea79486 100644
--- a/devel/SpecTcl/files/patch-ab
+++ b/devel/SpecTcl/files/patch-ab
@@ -9,7 +9,7 @@
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.0
++WISH=wish8.2
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk -java $@ &
  echo "Starting SpecTcl 1.0"
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 272284e3e418..1fd8daa7c778 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -7,20 +7,20 @@
 #
 
 DISTNAME=	clig-1.1.3
-CATEGORIES=	devel tcl80
+CATEGORIES=	devel tcl82
 MASTER_SITES=	http://wsd.iitb.fhg.de/~kir/clighome/
 
 MAINTAINER=	billf@FreeBSD.org
 
 # This should work with any version of tcl.  See also ${MAKE_ENV}.
-BUILD_DEPENDS=	${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS=	${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+BUILD_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
+RUN_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 MAN1=		clig.1
 
 NO_BUILD=	yes
 MAKEFILE=	makefile
-MAKE_ENV=	tclsh=${PREFIX}/bin/tclsh8.0
+MAKE_ENV=	tclsh=${PREFIX}/bin/tclsh8.2
 PLIST_SUB=	VERSION=${DISTNAME}
 
 do-patch:
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index a8680cbcf34c..d00eac500460 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -8,18 +8,18 @@
 
 DISTNAME=	qtk
 PKGNAME=	qtk-0.50
-CATEGORIES=	devel
+CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.psn.net/~andrews/dist/
 
 MAINTAINER=	andrews@technologist.com
 
-RUN_DEPENDS=	${LOCALBASE}/bin/wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	${LOCALBASE}/bin/wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	YES
 
 USE_X_PREFIX=	YES
 
-WISH=		${LOCALBASE}/bin/wish8.0
+WISH=		${LOCALBASE}/bin/wish8.2
 
 post-patch:
 	@${SED} 's:/usr/bin/wish:${WISH}:' \
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 656310a5129d..355c51fb3541 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -20,10 +20,10 @@ LIB_DEPENDS=	ffi.2:${PORTSDIR}/devel/libffi \
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
-		--with-tclincludedir=${PREFIX}/include/tcl8.0 \
-		--with-tkincludedir=${PREFIX}/include/tk8.0 \
-		--with-tclscriptdir=${PREFIX}/lib/tcl8.0 \
-		--with-tkscriptdir=${PREFIX}/lib/tk8.0
+		--with-tclincludedir=${PREFIX}/include/tcl8.2 \
+		--with-tkincludedir=${PREFIX}/include/tk8.2 \
+		--with-tclscriptdir=${PREFIX}/lib/tcl8.2 \
+		--with-tkscriptdir=${PREFIX}/lib/tk8.2
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/swarm/files/patch-ad b/devel/swarm/files/patch-ad
index 78fc06e9bfeb..eb4cf476a7f0 100644
--- a/devel/swarm/files/patch-ad
+++ b/devel/swarm/files/patch-ad
@@ -1,5 +1,5 @@
---- configure.orig	Sun May 30 22:01:25 1999
-+++ configure	Sun May 30 22:01:47 1999
+--- configure.orig	Mon Feb  8 13:59:28 1999
++++ configure	Thu Nov  4 12:42:01 1999
 @@ -1105,7 +1105,7 @@
  test -n "$OBJC" || OBJC="$CC"
  
@@ -9,3 +9,70 @@
  
  
  # Check whether --enable-shared or --disable-shared was given.
+@@ -1394,8 +1394,8 @@
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+@@ -2647,8 +2647,8 @@
+ if test -n "$with_tcldir" ; then               
+   PATH=${with_tcldir}/bin:$PATH
+ fi
+-# Extract the first word of "tclsh8.0", so it can be a program name with args.
+-set dummy tclsh8.0; ac_word=$2
++# Extract the first word of "tclsh8.2", so it can be a program name with args.
++set dummy tclsh8.2; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:2654: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_tclsh8_found'+set}'`\" = set"; then
+@@ -2711,7 +2711,7 @@
+ fi
+ tclLibrary=''
+ if test $tclsh8_found = yes; then
+-  tclLibrary=`echo "puts [info library]" | tclsh8.0`
++  tclLibrary=`echo "puts [info library]" | tclsh8.2`
+ else
+   if test $tclsh_found = yes; then
+     tclLibrary=`echo "puts [info library]" | tclsh`
+@@ -2814,7 +2814,7 @@
+         break
+       fi
+     else
+-      for version in 81 8.1 80 8.0 76 7.6 7.5 7.4 ''; do
++      for version in 82 8.2 80 8.0 76 7.6 7.5 7.4 ''; do
+         if test -r $expand_dir/libtcl${version}${suffix}; then
+           tcllibdir=$dir  
+           tcllibname=tcl$version
+@@ -2901,7 +2901,7 @@
+ POTENTIALINCDIR=`dirname $POTENTIALINCDIR`
+ INCPLACES="$INCPLACES \
+ 	$tclincludedir \ 
+-        $POTENTIALINCDIR/tk8.1/include \
++        $POTENTIALINCDIR/tk8.2/include \
+ 	$POTENTIALINCDIR/tk8.0/include \
+ 	$POTENTIALINCDIR/tk4.2/include \
+ 	$POTENTIALINCDIR/tk4.1/include \
+@@ -2939,7 +2939,7 @@
+ POTENTIALLIBDIR=`dirname $tcllibdir`
+ POTENTIALLIBDIR=`dirname $POTENTIALLIBDIR`
+ LIBPLACES="`dirname $tkincludedir`/lib $tcllibdir $POTENTIALLIBDIR/tk/lib \
+-        $POTENTIALLIBDIR/tk8.1/lib \
++        $POTENTIALLIBDIR/tk8.2/lib \
+ 	$POTENTIALLIBDIR/tk8.0/lib \
+ 	$POTENTIALLIBDIR/tk4.2/lib \
+ 	$POTENTIALLIBDIR/tk4.1/lib \
+@@ -2960,7 +2960,7 @@
+         break
+       fi
+     else
+-      for version in 81 8.1 80 8.0 42 4.2 4.1 4.0 ''; do
++      for version in 82 8.2 80 8.0 42 4.2 4.1 4.0 ''; do
+         if test -r $expand_dir/libtk${version}${suffix}; then
+           tklibdir=$dir
+           tklibname=tk${version}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 5fca48851fe6..01eef8a0b5c4 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -13,12 +13,14 @@ MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
 
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
-LIB_DEPENDS=    tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		otcl.1:${PORTSDIR}/lang/otcl
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${PREFIX}/bin
diff --git a/devel/tclcl/files/patch-aa b/devel/tclcl/files/patch-aa
index f2a445e4631b..6a72d98a93ce 100644
--- a/devel/tclcl/files/patch-aa
+++ b/devel/tclcl/files/patch-aa
@@ -5,7 +5,7 @@
  # the exec restarts using tclsh which in turn ignores
  # the command because of this backslash: \
 -exec tclsh "$0" "$@"
-+exec tclsh8.0 "$0" "$@"
++exec tclsh8.2 "$0" "$@"
  
  #
  # otcldoc - a simple script for translating otcl classes into
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 532f5fef5ff2..cc6c41c42747 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -7,13 +7,13 @@
 #
 
 DISTNAME=	tkcvs-6.0
-CATEGORIES=	devel tk80
+CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
 		http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
 MAN1=		tkcvs.1 tkdiff.1
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index 2fbced5d12af..da2a59dc3e5e 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -22,14 +22,14 @@
  # Find a Tk interpreter.
   
 -WISH=`which wish4.0`
-+WISH=`which wish8.0`
++WISH=`which wish8.2`
  if [ ! -f $WISH ]; then
 -  WISH=`which wish4.1`
 +  WISH=`which wish4.0`
  fi
  if [ ! -f $WISH ]; then
 -  echo "I cant find a Tk interpreter on your system"
-+  echo "I cant find a usefull Tk interpreter on your system"
++  echo "I cant find a useful Tk interpreter on your system"
    exit 1
  fi
  
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index c32fabc41d78..49b95cf12dfe 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -7,18 +7,18 @@
 #
 
 DISTNAME=	tkref-1.01
-CATEGORIES=	devel tk80
+CATEGORIES=	devel tk82
 MASTER_SITES=	http://gtcs.com/softdist/ \
 		${MASTER_SITE_LOCAL}
 
 MAINTAINER=	bgingery@gtcs.com
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
 
 do-patch:
-	perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.0|;" \
+	perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.2|;" \
 		${WRKDIR}/TkRef
 
 do-install:
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index dca827849f70..ede945c72e7b 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -7,12 +7,12 @@
 #
 
 DISTNAME=	vtcl-1.2.0
-CATEGORIES=	devel tk80
+CATEGORIES=	devel tk82
 MASTER_SITES=	ftp://ftp.neuron.com/pub/vtcl/development/1.2/
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
 
diff --git a/devel/vtcl/files/patch-aa b/devel/vtcl/files/patch-aa
index 24429d80af1b..f9195dad9133 100644
--- a/devel/vtcl/files/patch-aa
+++ b/devel/vtcl/files/patch-aa
@@ -2,7 +2,7 @@
 +++ vt.tcl	Thu Oct  8 01:31:27 1998
 @@ -1,4 +1,4 @@
 -#!/usr/bin/wish -f
-+#!/usr/local/bin/wish8.0 -f
++#!/usr/local/bin/wish8.2 -f
  # $Id: vt.tcl,v 1.20 1998/02/02 05:11:27 stewart Exp $
  
  ##############################################################################
diff --git a/devel/vtcl/files/patch-ab b/devel/vtcl/files/patch-ab
index 635081de2706..aa9f6b5c1d54 100644
--- a/devel/vtcl/files/patch-ab
+++ b/devel/vtcl/files/patch-ab
@@ -5,7 +5,7 @@
  
 -PATH_TO_WISH=/usr/bin/wish
 -VTCL_HOME=/usr/local/vt
-+PATH_TO_WISH=/usr/local/bin/wish8.0
++PATH_TO_WISH=/usr/local/bin/wish8.2
 +VTCL_HOME=/usr/local/lib/vtcl
  
  export PATH_TO_WISH