Update to use Tcl/Tk version 8.2.

Submitted by: Ade Lovett <ade@lovett.com>
svn path=/head/; revision=23474
1999-11-28 18:32:45 +00:00 · 1999-11-28 18:32:45 +00:00 · bc087374d3 · 2021-03-31 03:12:20 +00:00
commit bc087374d3
parent 3689fb2140
133 changed files with 516 additions and 269 deletions
--- a/astro/tkseti/Makefile
+++ b/astro/tkseti/Makefile
@ -1,5 +1,5 @@
 # Ports collection makefile for:	tkseti
-# Version required:	1.36
+# Version required:	1.42
 # Date created:		30 Jun 1999
 # Whom:			Brett Taylor <brett@peloton.physics.montana.edu>
 #
@ -7,12 +7,12 @@
 #

 DISTNAME=	tkseti-1.46
-CATEGORIES=	astro tk80
+CATEGORIES=	astro tk82
 MASTER_SITES=	http://www.cuug.ab.ca/~macdonal/tkseti/

 MAINTAINER=	brett@peloton.runet.edu

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
 		setiathome:${PORTSDIR}/astro/setiathome

 NO_BUILD=	yes
--- a/astro/tkseti/files/patch-aa
+++ b/astro/tkseti/files/patch-aa
@ -4,7 +4,7 @@
 #!/bin/sh
 # the next line restarts using wish \
 -exec wish "$0" ${1+"$@"}
-+exec wish8.0 "$0" ${1+"$@"}
+exec wish8.2 "$0" ${1+"$@"}
 #############################################################################
 # Visual Tcl v1.20 Project
 #
--- a/astro/x3arth/Makefile
+++ b/astro/x3arth/Makefile
@ -7,13 +7,13 @@
 #

 DISTNAME=	x3arth-1.1
-CATEGORIES=	astro
+CATEGORIES=	astro tcl82
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop

 MAINTAINER=	cpiazza@FreeBSD.org

-RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 \
+RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82 \
 		${X11BASE}/bin/xv:${PORTSDIR}/graphics/xv

 USE_X_PREFIX=	yes
--- a/astro/x3arth/files/patch-ab
+++ b/astro/x3arth/files/patch-ab
@ -4,8 +4,8 @@
 #!/bin/sh
 -# the next line restarts using tclsh \
 -exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
+# the next line restarts using tclsh8.2 \
+exec tclsh8.2 "$0" "$@"
 
 set usage "x3arth \[<satellite> \[-c \[file\] | -b\]\] \n\
 <satellite> : GMS-5, FY-2, GOES-8, GOES-9, GOES-10 or METEOSAT-7\n\
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/tclmidi/tclmidi31.so:$(PORTSDIR)/audio/tclmidi
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 USE_X_PREFIX=	yes
-CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.0/
+CONFIGURE_ARGS=	--with-tclincl=${LOCALBASE}/include/tcl8.2/
 CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib"

 do-install:
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@ -25,7 +25,7 @@
 if test $TCL_CHECK -eq 1
 then
 -     AC_PATH_PROG(TCLSH, tclsh)
-+     AC_PATH_PROG(TCLSH, tclsh8.0)
+     AC_PATH_PROG(TCLSH, tclsh8.2)
      if test -n "$TCLSH"
      then
 	# Check Tcl version:
--- a/audio/rosegarden/files/patch-ab
+++ b/audio/rosegarden/files/patch-ab
@ -5,7 +5,7 @@
 pkgIndex.tcl : Petal.so Petal.tcl
 	@echo "The error message for Petal.tcl is normal"
 -	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh
-+	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.0
+	echo "pkg_mkIndex . Petal.so Petal.tcl" | tclsh8.2
 
 petaleditor/pkgIndex.tcl : petaleditor/PetalEditor.tcl
 	cd petaleditor; make
--- a/audio/rosegarden/files/patch-ac
+++ b/audio/rosegarden/files/patch-ac
@ -5,5 +5,5 @@
 pkgIndex.tcl : PetalEditor.tcl
 	@echo "The error message for PetalEditor.tcl is normal"
 -	echo "pkg_mkIndex . PetalEditor.tcl" | tclsh
-+	echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.0
+	echo "pkg_mkIndex . PetalEditor.tcl" | tclsh8.2
 
--- a/audio/rosegarden/files/patch-ad
+++ b/audio/rosegarden/files/patch-ad
@ -51,7 +51,7 @@ Index: do-install
 $install -c ./petal/petalmidi/PetalMidi.tcl $ROSELIBDIR/petal
 
 -( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh )
-+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.0 )
+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.2 )
 
 $install -d $ROSELIBDIR/rosepetal-filters
 $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
--- a/audio/rosegarden/files/patch-ae
+++ b/audio/rosegarden/files/patch-ae
@ -5,7 +5,7 @@
 -# the next line restarts using tclsh \
 -exec tclsh "$0" "$@"
 +# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
+exec tclsh8.2 "$0" "$@"
 
 package require "Petal"
 PetalInit
--- a/audio/rosegarden/files/patch-af
+++ b/audio/rosegarden/files/patch-af
@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <string.h>
 -#include <tcl.h>
-+#include <tcl8.0/tcl.h>
+#include <tcl8.2/tcl.h>
 
 #define NB_MODES 7
 #define NB_TONALITIES 17 /* names, actually */
--- a/audio/rosegarden/files/patch-ag
+++ b/audio/rosegarden/files/patch-ag
@ -5,8 +5,8 @@
 # FilterName: Harmonize
 -# the next line restarts using tclsh \
 -exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
+# the next line restarts using tclsh8.2 \
+exec tclsh8.2 "$0" "$@"
 
 # Trivial harmonizer
 
--- a/audio/rosegarden/files/patch-ah
+++ b/audio/rosegarden/files/patch-ah
@ -5,8 +5,8 @@
 # FilterName: Instantiate Pattern
 -# the next line restarts using tclsh \
 -exec tclsh "$0" "$@"
-+# the next line restarts using tclsh8.0 \
-+exec tclsh8.0 "$0" "$@"
+# the next line restarts using tclsh8.2 \
+exec tclsh8.2 "$0" "$@"
 
 # Pattern instantiator (very dumb)
 # Main staff is the pattern,
--- a/audio/rosegarden/files/patch-aj
+++ b/audio/rosegarden/files/patch-aj
@ -5,5 +5,5 @@
 pkgIndex.tcl : PetalMidi.tcl
 	@echo "The error message for PetalMidi.tcl is normal"
 -	echo "pkg_mkIndex . PetalMidi.tcl" | tclsh
-+	echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.0
+	echo "pkg_mkIndex . PetalMidi.tcl" | tclsh8.2
 
--- a/audio/snowstar/Makefile
+++ b/audio/snowstar/Makefile
@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	fenner@FreeBSD.Org

 RUN_DEPENDS=	rio:${PORTSDIR}/audio/rio \
-		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+		wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=	true
 NO_WRKSUBDIR=	true
--- a/audio/snowstar/files/patch-aa
+++ b/audio/snowstar/files/patch-aa
@ -0,0 +1,8 @@
+--- snowstar.tcl.orig	Thu Nov  4 12:23:29 1999
+++ snowstar.tcl	Thu Nov  4 12:24:19 1999
+@@ -1,4 +1,4 @@
+-#!/usr/bin/wish
+#!/usr/local/bin/wish8.2
+ wm title . "Snowstar 0.75.5"
+ wm minsize . 320 240 
+ wm resizable . 1 1
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/sound/players
 MAINTAINER=		brett@peloton.runet.edu

 RUN_DEPENDS=	splay:${PORTSDIR}/audio/splay \
-		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+		wish8.2:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC= ${WRKDIR}/splay-tk-2.0

--- a/audio/splaytk/files/patch-aa
+++ b/audio/splaytk/files/patch-aa
@ -5,7 +5,7 @@
 --- 1,9 ----
 + #!/bin/sh
 + # start up wish \
-+ exec wish8.0 "$0" "$@"
+ exec wish8.2 "$0" "$@"
 + 
 + set libdir /usr/local/lib/splay-tk
 + set images ${libdir}
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@ -14,11 +14,11 @@ MASTER_SITES=   ftp://ftp.unina.it/pub/Other/music/midi/PROGRAMS/ \

 MAINTAINER=     shanee@augusta.de

-LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82

-MAKE_ENV=	TCL_GENERIC_DIR=${LOCALBASE}/include/tcl8.0
+MAKE_ENV=	TCL_GENERIC_DIR=${LOCALBASE}/include/tcl8.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tclsh=${LOCALBASE}/bin/tclsh8.0
+CONFIGURE_ARGS=	--with-tclsh=${LOCALBASE}/bin/tclsh8.2

 MAN1=		mplay.1 mrec.1 tclmidi.1 minfo.1 midtotcl.1
 MANN=		midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
--- a/audio/tclmidi/files/patch-aa
+++ b/audio/tclmidi/files/patch-aa
@ -5,7 +5,7 @@
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
 -TCL_BIN_DIR = @TCL_BIN_DIR@
-+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.0
+TCL_BIN_DIR = ${LOCALBASE}/lib/tcl8.2
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@ -8,14 +8,14 @@

 DISTNAME=	xmp3_1.0.0
 PKGNAME=	xmpeg3-1.0
-CATEGORIES=	audio tk80
+CATEGORIES=	audio tk82
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/audio/mpeg/amp/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@FreeBSD.org

 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
-		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+		wish8.2:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC=		${WRKDIR}/xmpeg3
 NO_BUILD=	yes
--- a/audio/xmpeg3/files/patch-aa
+++ b/audio/xmpeg3/files/patch-aa
@ -1,7 +1,7 @@
 --- xmpeg3.orig	Tue Mar 25 13:21:26 1997
 +++ xmpeg3	Thu Oct 30 16:00:48 1997
@@ -1,3 +1,4 @@
-+#!@@PREFIX@@/bin/wish8.0
+#!@@PREFIX@@/bin/wish8.2
 #############################################################################
 # Visual Tcl v1.07 Project
 #
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@ -13,12 +13,15 @@ EXTRACT_SUFX=		.tgz

 MAINTAINER=		hansen@cmu.edu

-LIB_DEPENDS=		tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=		tk82.1:${PORTSDIR}/x11-toolkits/tk82

 VERSION=		0.9
 PLIST_SUB+=		VERSION=${VERSION}
 USE_IMAKE=		yes

+post-extract:
+	@(cd ${WRKSRC}; find . -name .depend -delete)
+
 post-patch:
 	@${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/config.h
 	@${PERL} -pi -e 's:__LOCALBASE__:${LOCALBASE}:g' ${WRKSRC}/config.h
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@ -8,19 +8,19 @@

 DISTNAME=	uudeview-0.5.13
 PKGNAME=	xdeview-0.5.13
-CATEGORIES=	converters tk80
+CATEGORIES=	converters tk82
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
 		http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/

 MAINTAINER=	hoek@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		uu.1:${PORTSDIR}/converters/uulib

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tcl="${PREFIX}" --enable-tk="${PREFIX}"
 # Season to taste --- anything over tcl7.5
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0"
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2"

 ALL_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
--- a/converters/xdeview/files/patch-aa
+++ b/converters/xdeview/files/patch-aa
@ -1,5 +1,74 @@
--- ./configure.org	Thu Jan  9 06:22:00 1997
-+++ ./configure	Sun Mar 30 04:25:11 1997
+--- configure.orig	Thu Jan  9 08:22:00 1997
+++ configure	Thu Nov  4 11:29:23 1999
+@@ -2193,7 +2193,7 @@
+ 
+ if test "$have_tk" = "yes" ; then
+ echo $ac_n "checking for -ltk$tk_major.$tk_minor""... $ac_c" 1>&6
+-ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_Main | tr './+\055' '__p_'`
+ac_lib_var=`echo tk$tk_major.$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2205,11 +2205,11 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
+char Tk_MainEx();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
+Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2233,7 +2233,7 @@
+ 
+ if test "$have_tk_lib" = "no" ; then
+ echo $ac_n "checking for -ltk$tk_major$tk_minor""... $ac_c" 1>&6
+-ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_Main | tr './+\055' '__p_'`
+ac_lib_var=`echo tk$tk_major$tk_minor'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2245,11 +2245,11 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
+char Tk_MainEx();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
+Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2274,7 +2274,7 @@
+ fi
+ if test "$have_tk_lib" = "no" ; then
+ echo $ac_n "checking for -ltk""... $ac_c" 1>&6
+-ac_lib_var=`echo tk'_'Tk_Main | tr './+\055' '__p_'`
+ac_lib_var=`echo tk'_'Tk_MainEx | tr './+\055' '__p_'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2286,11 +2286,11 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
+char Tk_MainEx();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
+Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
@@ -3148,7 +3148,7 @@
 
 fi
--- a/converters/xdeview/files/patch-ac
+++ b/converters/xdeview/files/patch-ac
@ -0,0 +1,23 @@
+--- tcl/uuwish.c.orig	Thu Jun  6 14:41:11 1996
+++ tcl/uuwish.c	Thu Nov  4 11:34:43 1999
+@@ -78,19 +78,7 @@
+ int
+ main (int argc, char *argv[])
+ {
+-#ifdef HAVE_TK
+-  Tk_Main
+-#else
+-#ifdef HAVE_TCL
+-  Tcl_Main
+-#endif
+-#endif
+-    (argc, argv
+-#ifdef TMAIN_THREE
+-     , Tcl_AppInit
+-#endif
+-     );
+-
+  Tk_MainEx( argc, argv, Tcl_AppInit, Tcl_CreateInterp() );
+   return 0;
+ }
+ 
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.me.umn.edu/pub/finance/ \

 MAINTAINER=	kline@thought.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=       yes
 USE_PERL5=	yes
--- a/deskutils/cbb/files/patch-01
+++ b/deskutils/cbb/files/patch-01
@ -14,7 +14,7 @@
 install:
 -	$(PERL) install.pl
 +	$(PERL) install.pl --prefix ${PREFIX} --libdir ${PREFIX}/lib/cbb  \
-+		--perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.0
+		--perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.2
 
 docs/cbb-man.dvi: docs/cbb-man.tex
 	(cd docs; \
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@ -8,12 +8,12 @@

 DISTNAME=	zorro-1.1p8
 PKGNAME=	zorro-1.1.8
-CATEGORIES=	deskutils tk80
+CATEGORIES=	deskutils tk82
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/

 MAINTAINER=	shanee@augusta.de

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=	yes

--- a/deskutils/zorro/files/patch-aa
+++ b/deskutils/zorro/files/patch-aa
@ -9,7 +9,7 @@
  # ----------------------------------------------------------------------
  #   AUTHOR:  Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
 --- 1,6 ----
-! #!/usr/local/bin/wish8.0
+! #!/usr/local/bin/wish8.2
  #
 ! # Version 1.1 Patch 8
  #
--- 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

--- 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"
--- 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"
--- 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:
--- 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}:' \
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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
 
--- 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:
--- 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

--- 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 $
 
 ##############################################################################
--- 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
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:	e93
-# Version required:	1.2r6X
+# Version required:	1.2r7X
 # Date created:		21 June 1995
 # Whom:			Satoshi Asami (asami)
 #
@ -8,13 +8,13 @@

 DISTNAME=	e93-1.2r7X
 PKGNAME=	e93-1.2.7
-CATEGORIES=	editors tcl80
+CATEGORIES=	editors tcl82
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82

 MAKEFILE=	makefile
 USE_X_PREFIX=	yes
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@ -4,15 +4,16 @@
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
+#

 DISTNAME=	FrodoV4_1a.Src
 PKGNAME=	frodo-4.1
-CATEGORIES=	emulators tk80
+CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/

 MAINTAINER=	dirk.meyer@dinoex.sub.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 USE_X_PREFIX=	YES
 ALL_TARGET=	Frodo
--- a/emulators/frodo/files/patch-C64_x.i
+++ b/emulators/frodo/files/patch-C64_x.i
@ -5,7 +5,7 @@
 #else
 	// try to start up Tk gui.
 -	gui = new CmdPipe("wish", "TkGui.tcl");
-+	gui = new CmdPipe("wish8.0", "TkGui.tcl");
+	gui = new CmdPipe("wish8.2", "TkGui.tcl");
 	if (gui) {
 		if (gui->fail) {
 			delete gui; gui = 0;
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@ -7,12 +7,12 @@
 #

 DISTNAME=	hfsutils-3.2.6
-CATEGORIES=	emulators tk80
+CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/

 MAINTAINER=	vanilla@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl --with-tk
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.me.umn.edu/pub/finance/ \

 MAINTAINER=	kline@thought.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=       yes
 USE_PERL5=	yes
--- a/finance/cbb/files/patch-01
+++ b/finance/cbb/files/patch-01
@ -14,7 +14,7 @@
 install:
 -	$(PERL) install.pl
 +	$(PERL) install.pl --prefix ${PREFIX} --libdir ${PREFIX}/lib/cbb  \
-+		--perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.0
+		--perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.2
 
 docs/cbb-man.dvi: docs/cbb-man.tex
 	(cd docs; \
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@ -8,13 +8,13 @@

 DISTNAME=	awele
 PKGNAME=	awele-1.0
-CATEGORIES=	games tk80
-MASTER_SITES=	http://www-rocq.inria.fr/air/ftp/Jean-Paul/
+CATEGORIES=	games tk82
+MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/
 EXTRACT_SUFX=	1.0.tgz

 MAINTAINER=	tg@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
--- a/games/awele/files/patch-aa
+++ b/games/awele/files/patch-aa
@ -11,10 +11,10 @@
 XCOMM libs, includes
 XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl
 -    TK_LIB		= -L/usr/local/lib -ltk -ltcl
-+    TK_LIB		= -L@@LOCALBASE@@/lib -ltk80 -ltcl80
+    TK_LIB		= -L@@LOCALBASE@@/lib -ltk82 -ltcl82
 XCOMM    TK_LIB		= -L/usr/local/lib -ltk4.0 -ltcl7.4
 -    TK_INCLUDE 		= -I/usr/local/include
-+    TK_INCLUDE 		= -I@@LOCALBASE@@/include/tcl8.0 -I@@LOCALBASE@@/include/tk8.0
+    TK_INCLUDE 		= -I@@LOCALBASE@@/include/tcl8.2 -I@@LOCALBASE@@/include/tk8.2
     DEFINES = $(TK_INCLUDE) 
     LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm
 XCOMM ANSI-C compiler
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@ -14,7 +14,7 @@ EXTRACT_SUFX=		.gz

 MAINTAINER=		andy@icc.surw.chel.su

-RUN_DEPENDS=		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=		wish8.2:${PORTSDIR}/x11-toolkits/tk82

 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=
--- a/games/bogged/files/patch-aa
+++ b/games/bogged/files/patch-aa
@ -4,7 +4,7 @@
 #!/bin/sh
 # the next line restarts using wish \
 -exec wish "$0" "$@"
-+exec wish8.0 "$0" "$@"
+exec wish8.2 "$0" "$@"
 
 #
 # Bogged is Copyright 1998 Todd David Rudick
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@ -7,17 +7,17 @@
 #

 DISTNAME=       dontspace-1.2
-CATEGORIES=     games tk80
+CATEGORIES=     games tk82
 MASTER_SITES=   http://www.isi.edu/~johnh/SOFTWARE/JACOBY/

 MAINTAINER=     johnh@isi.edu

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 GNU_CONFIGURE=  Yes
 CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
 		--mandir=${PREFIX}/man
-CONFIGURE_ENV=  WISHX=${PREFIX}/bin/wish8.0
+CONFIGURE_ENV=  WISHX=${PREFIX}/bin/wish8.2
 MAN6=           dontspace.6

 .include <bsd.port.mk>
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@ -20,11 +20,12 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	dchapes@ddm.on.ca

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.2

 post-install:
 	install-info ${PREFIX}/info/ifm.info ${PREFIX}/info/dir
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://outoften.doc.ic.ac.uk/~np2/software/download/

 MAINTAINER=	andy@icc.surw.chel.su

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=	yes
 USE_X_PREFIX=	yes
--- a/games/merlin/files/patch-aa
+++ b/games/merlin/files/patch-aa
@ -2,7 +2,7 @@
 +++ merlin	Sun Aug 23 18:09:17 1998
@@ -1,4 +1,4 @@
 -#!/usr/local/bin/wish4.1
-+#!/usr/local/bin/wish8.0
+#!/usr/local/bin/wish8.2
 # 
 # Merlin - a pointless puzzle game
 #
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@ -7,13 +7,13 @@
 #

 DISTNAME=       tksol-1.0
-CATEGORIES=	games tk80
+CATEGORIES=	games tk82
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
 EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	tg@FreeBSD.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/release
--- a/games/tksol/files/patch-a
+++ b/games/tksol/files/patch-a
@ -14,7 +14,7 @@
 # Absolute pathname of the wish executable #
 ############################################
 -WISH = /usr/imports/bin/wish
-+WISH = ${PREFIX}/bin/wish8.0
+WISH = ${PREFIX}/bin/wish8.2
 
 ####################################################
 # Directory where the script tksol will be located #
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@ -7,19 +7,22 @@
 #

 DISTNAME=	tvp-0.9.7.1
-CATEGORIES=	games tk80
+CATEGORIES=	games tk82
 MASTER_SITES=	http://www3.sympatico.ca/john.vanderhoek/tim/src/president/

 MAINTAINER=	hoek@FreeBSD.org

 # Comment-out this (and CFLAGS) to compile only the CLI and ansi interfaces
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-carddir=${PREFIX}/share/games/tvp
-# Comment-out this (and LIB_DEPENDS) to compile only the CLI and ansi interfaces
-CFLAGS+=		-lX11 -lm -ltcl80 -ltk80 \
-			-L ${LOCALBASE}/lib -L ${X11BASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-carddir=${PREFIX}/share/games/tvp
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/tcl8.2 \
+			  -I${LOCALBASE}/include/tk8.2" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
+		      -ltcl82 -ltk82 -lX11 -lm"
+#CFLAGS+=		-lX11 -lm -ltcl82 -ltk82 \
+#			-L${LOCALBASE}/lib -L${X11BASE}/lib

 MAN6=	tvp.6
 MLINKS=	tvp.6 xprez.6 - aprez.6 - prez.6
--- a/games/tvp/files/patch-aa
+++ b/games/tvp/files/patch-aa
@ -1,20 +1,38 @@
--- configure.orig	Thu Oct 23 08:34:26 1997
-+++ configure	Thu Oct 23 08:36:34 1997
-@@ -1306,7 +1306,7 @@
+--- configure.orig	Tue Aug 19 20:57:12 1997
+++ configure	Wed Nov  3 17:33:31 1999
+@@ -1306,10 +1306,10 @@
 
 WINDLL=true
 TCLTK=""
 -for tkver in 42 4.2 41 4.1 80 8.0
-+for tkver in 80 8.0 42 4.2 41 4.1
+for tkver in 82
 do
- 	echo $ac_n "checking for Tk_Main in -ltk${tkver}""... $ac_c" 1>&6
- echo "configure:1313: checking for Tk_Main in -ltk${tkver}" >&5
+-	echo $ac_n "checking for Tk_Main in -ltk${tkver}""... $ac_c" 1>&6
+-echo "configure:1313: checking for Tk_Main in -ltk${tkver}" >&5
+	echo $ac_n "checking for Tk_MainEx in -ltk${tkver}""... $ac_c" 1>&6
+echo "configure:1313: checking for Tk_MainEx in -ltk${tkver}" >&5
+ ac_lib_var=`echo tk${tkver}'_'Tk_Main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1322,10 +1322,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
+char Tx_MainEx();
+ 
+ int main() {
+-Tk_Main()
+Tk_MainEx()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
@@ -1345,7 +1345,7 @@
   echo "$ac_t""yes" 1>&6
   
 		WINDLL=false
 -		for tclver in 76 7.6 75 7.5 80 8.0
-+		for tclver in 80 8.0 76 7.6 75 7.5
+		for tclver in 82
 		do
 			echo $ac_n "checking for Tcl_Main in -ltcl${tclver}""... $ac_c" 1>&6
 echo "configure:1352: checking for Tcl_Main in -ltcl${tclver}" >&5
--- a/games/tvp/files/patch-ab
+++ b/games/tvp/files/patch-ab
@ -0,0 +1,11 @@
+--- xprez/xpwish.c.orig	Sat Jun 28 17:38:35 1997
+++ xprez/xpwish.c	Wed Nov  3 17:45:12 1999
+@@ -37,7 +37,7 @@
+ 
+ int
+ main (int argc, char **argv) {
+-	Tk_Main (argc, argv, Tcl_AppInit);
+	Tk_MainEx (argc, argv, Tcl_AppInit, Tcl_CreateInterp());
+ 
+ 	return 0;
+ }
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://thor.cam.ac.uk/~ac212/xchain/

 MAINTAINER=	andy@icc.surw.chel.su

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xchain-1.0
--- a/games/xchain/files/patch-aa
+++ b/games/xchain/files/patch-aa
@ -5,7 +5,7 @@
 #include <time.h>
 
 -#define DEF_WISH_PATH "/usr/bin/wish"
-+#define DEF_WISH_PATH "/usr/local/bin/wish8.0"
+#define DEF_WISH_PATH "/usr/local/bin/wish8.2"
 
 void wprintf(char *, ...);
 void draw_screen(void);
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@ -4,9 +4,10 @@
 # Whom:					fenner
 #
 # $FreeBSD$
+#

 DISTNAME=	geomview-1.6.1
-CATEGORIES=	graphics tk80
+CATEGORIES=	graphics tk82
 MASTER_SITES=	ftp://ftp.geom.umn.edu/pub/software/geomview/	\
 		ftp://ftp-sfb288.math.tu-berlin.de/pub/geomview/
 DISTFILES=	geomview-1.6.1-src.tar.gz
@ -15,7 +16,7 @@ MAINTAINER=	fenner@freebsd.org

 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
 		MesaGL.14:${PORTSDIR}/graphics/Mesa3 \
-		tk80.1:${PORTSDIR}/x11-toolkits/tk80
+		tk82.1:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC=		${WRKDIR}/Geomview
 REQUIRES_MOTIF=	yes
--- a/graphics/geomview/files/patch-aa
+++ b/graphics/geomview/files/patch-aa
@ -36,8 +36,8 @@
 # indicate cc options to find tk-related libraries and include-files.
 -# TKLIBS = -L/usr/local/lib -ltk -ltcl -L${SYSXLIBDIR} -lX11
 -# TKINC = -I/u/share/include
-+TKLIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 -L${SYSXLIBDIR} -lX11
-+TKINC = -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
+TKLIBS = -L${LOCALBASE}/lib -ltk82 -ltcl82 -L${SYSXLIBDIR} -lX11
+TKINC = -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
 
 
 # Choose or adapt one of the following sets of definitions.
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@ -8,13 +8,13 @@

 DISTNAME=       gviz15
 PKGNAME=	graphviz-1.5
-CATEGORIES=	graphics tk80
+CATEGORIES=	graphics tk82
 MASTER_SITES=	http://www.research.att.com/sw/tools/graphviz/
 EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 FETCH_ARGS=	-b
 WRKSRC=		${WRKDIR}/gv1.5
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@ -8,12 +8,12 @@

 DISTNAME=	img1.2.2
 PKGNAME=	libimg-1.2.2
-CATEGORIES=	graphics tk80
+CATEGORIES=	graphics tk82
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/

 MAINTAINER=	ports@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		png.3:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
@ -23,11 +23,11 @@ WRKSRC=		${WRKDIR}/img1.2.2
 ALL_TARGET=	default

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.0 --with-tk=${PREFIX}/lib/tk8.0 \
+CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.2 --with-tk=${PREFIX}/lib/tk8.2 \
 		--disable-stubs

 post-install:
-	${LN} -sf ${PREFIX}/lib/Img1.2/libimg1.2.so.1 ${PREFIX}/lib/libimg.so.1
+	${LN} -sf ${PREFIX}/lib/Img1.2/libimg82.so.1 ${PREFIX}/lib/libimg.so.1
 	${LN} -sf ${PREFIX}/lib/libimg.so.1 ${PREFIX}/lib/libimg.so

 .include <bsd.port.mk>
--- a/graphics/libimg/files/patch-aa
+++ b/graphics/libimg/files/patch-aa
@ -6,8 +6,8 @@
     TCL_INC_DIR=${TCL_EXEC_PREFIX}/include
 -elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl.h; then
 -    TCL_INC_DIR=${TCL_EXEC_PREFIX}/include
-+elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.0/tcl.h; then
-+    TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.0
+elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.2/tcl.h; then
+    TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.2
 else
     TCL_INC_DIR=$prefix/include
 fi
@ -17,8 +17,8 @@
     TK_INC_DIR=${TK_EXEC_PREFIX}/include
 -elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk.h; then
 -    TK_INC_DIR=${TK_EXEC_PREFIX}/include
-+elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.0/tk.h; then
-+    TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.0
+elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.2/tk.h; then
+    TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.2
 else
     TK_INC_DIR=$prefix/include
 fi
--- a/graphics/libimg/pkg-plist
+++ b/graphics/libimg/pkg-plist
@ -1,6 +1,7 @@
 lib/Img1.2/pkgIndex.tcl
-lib/Img1.2/libimg1.2.so.1
+lib/Img1.2/libimg82.so.1
 lib/libimg.so.1
 lib/libimg.so
-@dirrm lib/Img1.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@dirrm lib/Img1.2
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@ -43,7 +43,7 @@ SETUP_FILES=	${FILESDIR}/Setup.base
 WITH_TOGL?=	yes
 .if defined(WITH_TOGL) && $(WITH_TOGL) == yes
 SETUP_FILES+=	${FILESDIR}/Setup.add.togl
-LIB_DEPENDS+=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS+=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 .endif

 .include <bsd.port.pre.mk>
--- a/graphics/py-opengl/files/Setup.add.togl
+++ b/graphics/py-opengl/files/Setup.add.togl
@ -8,8 +8,8 @@ togl	\
 # This must match the name of the Togl source directory
 	-I./Togl-1.5 \
 # These must match the version you have installed
-	-ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \
-	-LLOCALBASE/lib -ltk80 -ltcl80 \
+	-ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
+	-LLOCALBASE/lib -ltk82 -ltcl82 \
 # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
 	-IX11BASE/include -LX11BASE/lib \
 	-lGLU -lGL \
--- a/graphics/py-opengl/files/Setup.base
+++ b/graphics/py-opengl/files/Setup.base
@ -57,8 +57,8 @@ _glutmodule.c  # putting this at the end for \ reasons
 ## # This must match the name of the Togl source directory
 ##         -I./Togl-1.5 \
 ## # These must match the version you have installed
-##         -ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \
-##         -LLOCALBASE/lib -ltk80 -ltcl80 \
+##         -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \
+##         -LLOCALBASE/lib -ltk82 -ltcl82 \
 ## # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU:
 ##         -IX11BASE/include -LX11BASE/lib \
 ##         -lGLU -lGL \
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@ -8,19 +8,19 @@

 DISTNAME=	Togl-1.5
 PKGNAME=	togl-1.5
-CATEGORIES=	graphics tk80
+CATEGORIES=	graphics tk82
 MASTER_SITES=	ftp://ftp.mesa3d.org/mesa/misc/ \
 		ftp://ftp.cs.umd.edu/pub/faculty/bederson/

 MAINTAINER=	aa8vb@ipass.net

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
-		tcl80.1:${PORTSDIR}/lang/tcl80 \
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
+		tcl82.1:${PORTSDIR}/lang/tcl82 \
 		MesaGL.14:${PORTSDIR}/graphics/Mesa3

 ALL_TARGET=	default

-TOGL_INSTDIR=	${PREFIX}/lib/tk8.0/${DISTNAME}
+TOGL_INSTDIR=	${PREFIX}/lib/tk8.2/${DISTNAME}

 .include <bsd.port.pre.mk>

@ -28,6 +28,6 @@ do-install:
 	${MKDIR} ${TOGL_INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/libtogl.so.1.3 ${TOGL_INSTDIR}/Togl.so
 	${ECHO} 'package ifneeded Togl 1.5 [list load [file join $$dir Togl.so]]'\
-	  > ${PREFIX}/lib/tk8.0/${DISTNAME}/pkgIndex.tcl
+	  > ${PREFIX}/lib/tk8.2/${DISTNAME}/pkgIndex.tcl

 .include <bsd.port.post.mk>
--- a/graphics/togl/files/patch-aa
+++ b/graphics/togl/files/patch-aa
@ -20,9 +20,9 @@
 -# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
 -INCLUDES = -I/usr/local/include -I/usr/include/tcl
 +# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc:
-+INCLUDES = -I/usr/local/include/tcl8.0 \
-+           -I/usr/local/include/tk8.0 \
-+           -I/usr/local/include/tk8.0/generic \
+INCLUDES = -I/usr/local/include/tcl8.2 \
+           -I/usr/local/include/tk8.2 \
+           -I/usr/local/include/tk8.2/generic \
 +           -I/usr/X11R6/include \
 +           -I/usr/include/tcl
 
@ -33,7 +33,7 @@
 
 # Libraries to link with (-ldl for Linux only?):
 -LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl
-+LIBS = -ltk80 -ltcl80 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm
+LIBS = -ltk82 -ltcl82 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm
 
 TK_FLAGS =
 
--- a/graphics/togl/pkg-plist
+++ b/graphics/togl/pkg-plist
@ -1,4 +1,4 @@
-lib/tk8.0/Togl-1.5/Togl.so
-lib/tk8.0/Togl-1.5/pkgIndex.tcl
-@dirrm lib/tk8.0/Togl-1.5
+lib/tk8.2/Togl-1.5/Togl.so
+lib/tk8.2/Togl-1.5/pkgIndex.tcl
+@dirrm lib/tk8.2/Togl-1.5

--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@ -7,13 +7,13 @@
 #

 DISTNAME=	quirc-0.9.79
-CATEGORIES=	irc tk80
+CATEGORIES=	irc tk82
 MASTER_SITES=	http://www.quirc.org/ \
 		http://patearl.powersurfr.com/quirc/

 MAINTAINER=	cpiazza@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@ -8,19 +8,19 @@

 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
-CATEGORIES=	irc tk80
+CATEGORIES=	irc tk82
 MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/

 MAINTAINER=	green@FreeBSD.org

 RUN_DEPENDS=	irc:${PORTSDIR}/irc/ircII \
-		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+		wish8.2:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC=		${WRKDIR}/tkirc
 NO_BUILD=	yes

 post-patch:
-	perl -pi.orig -e 's/wish/wish8.0/' ${WRKSRC}/tkirc
+	perl -pi.orig -e 's/wish/wish8.2/' ${WRKSRC}/tkirc

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkirc	  ${PREFIX}/bin
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@ -13,11 +13,11 @@ MASTER_SITES=	ftp://ftp.tcltk.com/pub/itcl/

 MAINTAINER=	dmlb@ragnet.demon.co.uk

-LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82

 WRKSRC=		${WRKDIR}/itcl3.0.1/itcl/unix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.0
+CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}

 SHLIB_MAJOR=	1
@ -32,11 +32,7 @@ MANN+=		itcl.n itcl_class.n itcl_info.n itclvars.n local.n scope.n

 .include <bsd.port.pre.mk>

-.if ${PORTOBJFORMAT} == "elf"
 ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}
-.else
-ITCL_LIB_FILE=	${ITCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif

 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@ -48,6 +44,7 @@ pre-build:
 	   TCL_PREFIX=${PREFIX}

 post-install:
+	${LN} -sf ${PREFIX}/bin/itclsh3.0 ${PREFIX}/bin/itclsh
 	${LN} -sf ${ITCL_LIB_FILE} ${PREFIX}/lib/${ITCL_LIB}
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib

--- a/lang/itcl/files/Makefile.lib
+++ b/lang/itcl/files/Makefile.lib
@ -2,7 +2,7 @@ NOPROFILE=	yes
 LIB=		itcl30
 ITCL_LIBRARY=	${PREFIX}/lib/itcl3.0
 CFLAGS+=	-I. -I./../generic \
-		-I${TCL_PREFIX}/include/tcl8.0/generic \
+		-I${TCL_PREFIX}/include/tcl8.2/generic \
 		-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
 		-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
 		-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
--- a/lang/itcl/files/patch-ah
+++ b/lang/itcl/files/patch-ah
@ -0,0 +1,11 @@
+--- ../generic/itcl_ensemble.c.orig	Sat Aug  8 16:38:24 1998
+++ ../generic/itcl_ensemble.c	Wed Nov  3 15:05:39 1999
+@@ -1626,7 +1626,7 @@
+      *  another "ensemble" command.  Use the current ensemble as
+      *  the parent, and find or create an ensemble part within it.
+      */
+-    ensName = TclGetStringFromObj(objv[1], (int*)NULL);
+    ensName = Tcl_GetStringFromObj(objv[1], (int*)NULL);
+ 
+     if (ensData) {
+         if (FindEnsemblePart(interp, ensData, ensName, &ensPart) != TCL_OK) {
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@ -1,8 +1,10 @@
 bin/itclsh3.0
+@exec /bin/ln -s %D/%F %B/itclsh
+@unexec rm %B/itclsh
 include/itcl3.0/generic/itcl.h
 include/itcl3.0/generic/itclInt.h
 include/itcl3.0/itcl.h
-lib/libitcl30.so.1.1
+lib/libitcl30.so.1
 lib/libitcl30.so
 lib/libitcl30.a
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@ -12,9 +12,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

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/tcl8.0/generic
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/tcl8.2/generic \
+		--with-tcl-ver=8.2
+
+post-install:
+	${LN} -sf libotcl.so.1 ${PREFIX}/lib/libotcl.so
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib

 .include <bsd.port.mk>
--- a/lang/otcl/pkg-plist
+++ b/lang/otcl/pkg-plist
@ -3,3 +3,6 @@ bin/owish
 include/otcl.h
 lib/libotcl.a
 lib/libotcl.so.1
+lib/libotcl.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	Tcl

 MAINTAINER=	jfitz@FreeBSD.org

-LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82

 USE_PERL5=	YES

--- a/lang/p5-Tcl/files/patch-aa
+++ b/lang/p5-Tcl/files/patch-aa
@ -6,6 +6,6 @@
     VERSION => "b2",
 -    LIBS => ["-ltcl -lm"],
 -    INC => "-I/usr/local/include -I/usr/include/tcl"
-+    LIBS => ["-L$ENV{PREFIX}/lib -ltcl80 -lm"],
-+    INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.0"
+    LIBS => ["-L$ENV{PREFIX}/lib -ltcl82 -lm"],
+    INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2"
 );
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@ -45,8 +45,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/ruby
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
 # e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?=	80
-TK_VERSION?=	80
+TCL_VERSION?=	82
+TK_VERSION?=	82
 .if defined(WITH_TCL_JP)
 TCL_CATEGORY=	japanese
 TK_CATEGORY=	japanese
--- a/lang/ruby14-tcltklib/Makefile
+++ b/lang/ruby14-tcltklib/Makefile
@ -45,8 +45,8 @@ EXAMPLESDIR=	${PREFIX}/share/examples/ruby
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
 # e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?=	80
-TK_VERSION?=	80
+TCL_VERSION?=	82
+TK_VERSION?=	82
 .if defined(WITH_TCL_JP)
 TCL_CATEGORY=	japanese
 TK_CATEGORY=	japanese
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@ -8,13 +8,13 @@

 DISTNAME=	imm.source
 PKGNAME=	imm-3.5a1
-CATEGORIES=	mbone tk80
+CATEGORIES=	mbone tk82
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 EXTRACT_SUFX=	.tar.Z

 MAINTAINER=	fenner@freebsd.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 WRKSRC=		${WRKDIR}/mnm
 USE_X_PREFIX=	yes
--- a/mbone/imm/files/Makefile.freebsd
+++ b/mbone/imm/files/Makefile.freebsd
@ -1,11 +1,11 @@
 # Some versions of make, like SGI's, use the following variable to
 # determine which shell to use for executing commands:
 SHELL = /bin/sh
-INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
+INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
 # Libraries to use when linking: 
 LIBS = -lm

-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11

 TARGET		= ../freebsd

--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@ -7,12 +7,12 @@
 #

 DISTNAME=	sdr-2.7
-CATEGORIES=	mbone tk80
+CATEGORIES=	mbone tk82
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/

 MAINTAINER=	fenner@FreeBSD.org

-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
--- a/mbone/sdr/files/patch-ab
+++ b/mbone/sdr/files/patch-ab
@ -0,0 +1,11 @@
+--- sdr/src/Makefile.template.orig	Tue May 25 16:27:44 1999
+++ sdr/src/Makefile.template	Thu Nov  4 11:05:39 1999
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
+ 
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+-	tclsh8.0 ../src/plugin2tcl.tcl
+	tclsh8.2 ../src/plugin2tcl.tcl
+ 
+ uweb: $(WWWOBJS)
+ 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
--- a/misc/tkcron/Makefile
+++ b/misc/tkcron/Makefile
@ -7,13 +7,13 @@
 #

 DISTNAME=	tkcron-2.12
-CATEGORIES=	misc tk80
+CATEGORIES=	misc tk82
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
 EXTRACT_SUFX=	.tcl.gz

 MAINTAINER=	sander@haldjas.folklore.ee

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS= -cd
--- a/misc/tkcron/files/Makefile
+++ b/misc/tkcron/files/Makefile
@ -1,10 +1,14 @@
+#
+# $FreeBSD$
+#
+
 BINDIR=		${PREFIX}/bin
 WISHDIR?=	${BINDIR}

 all:		tkcron

 tkcron:	
-	sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.0;g" tkcron.tcl > tkcron
+	sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.2;g" tkcron.tcl > tkcron

 install:	all
 	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} tkcron ${BINDIR}
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@ -7,12 +7,12 @@
 #

 DISTNAME=	tkinfo-2.4
-CATEGORIES=	misc tk80
+CATEGORIES=	misc tk82
 MASTER_SITES=	http://math-www.uni-paderborn.de/~axel/tkinfo/

 MAINTAINER=	tg@FreeBSD.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=	yes
 MAN1=		tkinfo.1
--- a/misc/tkinfo/files/patch-aa
+++ b/misc/tkinfo/files/patch-aa
@ -4,7 +4,7 @@
 #!/bin/sh
 # This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \
 -exec wish "$0" "$@"
-+exec wish8.0 "$0" "$@"
+exec wish8.2 "$0" "$@"
 
 ##########################################################################
 # Version of TkInfo:
--- a/misc/tkrunit/Makefile
+++ b/misc/tkrunit/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=   http://www.cs.columbia.edu/~etgold/software/tkRunIt/

 MAINTAINER=	steve@farrell.org

-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82

 NO_BUILD=	yes

--- a/misc/tkrunit/files/patch-aa
+++ b/misc/tkrunit/files/patch-aa
@ -4,7 +4,7 @@
 #!/bin/sh
 # the next line restarts using wish \
 -		exec wish "$0" "$@"
-+		exec wish8.0 "$0" "$@"
+		exec wish8.2 "$0" "$@"
 
 #!/usr/local/bin/wish
 ## runit (tkRunIt) 12/4/98
--- a/Show More
+++ b/Show More