Update to use Tcl/Tk version 8.2.

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

14 files changed, 49 insertions, 36 deletions

diff --git a/net/imm/Makefile b/net/imm/Makefile
index 618e626d7331..9506e8bb2ea1 100644
--- a/net/imm/Makefile
+++ b/net/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
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
index 51724b551d01..ae7ce6434e6f 100644
--- a/net/imm/files/Makefile.freebsd
+++ b/net/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
 
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 9786f2395d40..849d511a1008 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/vint/
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
 BUILD_DEPENDS=	${PREFIX}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS=	${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 MAN1=		ns.1
 MANCOMPRESSED=	no
@@ -22,6 +22,7 @@ MANCOMPRESSED=	no
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
 
 ALL_TARGET=
 
diff --git a/net/ns/files/patch-aa b/net/ns/files/patch-aa
index 74f6728fd3c9..d95a0b774e29 100644
--- a/net/ns/files/patch-aa
+++ b/net/ns/files/patch-aa
@@ -5,7 +5,7 @@
  # $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
  PATH=$PATH:$d/unix:$d/bin
 -for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.0 tclsh$TCL_OLD_VERS
++for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 9786f2395d40..849d511a1008 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/vint/
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
 BUILD_DEPENDS=	${PREFIX}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS=	${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	${PREFIX}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 MAN1=		ns.1
 MANCOMPRESSED=	no
@@ -22,6 +22,7 @@ MANCOMPRESSED=	no
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
 
 ALL_TARGET=
 
diff --git a/net/ns2/files/patch-aa b/net/ns2/files/patch-aa
index 74f6728fd3c9..d95a0b774e29 100644
--- a/net/ns2/files/patch-aa
+++ b/net/ns2/files/patch-aa
@@ -5,7 +5,7 @@
  # $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
  PATH=$PATH:$d/unix:$d/bin
 -for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.0 tclsh$TCL_OLD_VERS
++for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index 97dff64d0e89..d1d1e131821c 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -9,7 +9,7 @@
 #
 
 DISTNAME=	ppxp-0.99072807
-CATEGORIES=	net tk80
+CATEGORIES=	net tk82
 .if defined(USE_TCLJP)
 CATEGORIES+=	japanese
 .endif
@@ -28,11 +28,11 @@ LIB_DEPENDS+=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80 \
 		tclsh8.0jp:${PORTSDIR}/japanese/tcl80
 .else
-BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
-		tclsh8.0:${PORTSDIR}/lang/tcl80
-LIB_DEPENDS+=	tcl80.1:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80 \
-		tclsh8.0:${PORTSDIR}/lang/tcl80
+BUILD_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
+		tclsh8.2:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS+=	tcl82.1:${PORTSDIR}/lang/tcl82
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
+		tclsh8.2:${PORTSDIR}/lang/tcl82
 .endif
 
 WRKSRC=		${WRKDIR}/ppxp
@@ -46,11 +46,11 @@ CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \
 		--with-tcl-config=${PREFIX}/lib/tcl8.0jp/tclConfig.sh \
 		--with-tk-config=${PREFIX}/lib/tk8.0jp/tkConfig.sh
 .else
-CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0 \
-		--with-wish=${PREFIX}/bin/wish8.0 \
-		--with-tcl-includes=${PREFIX}/include/tcl8.0 \
-		--with-tcl-config=${PREFIX}/lib/tcl8.0/tclConfig.sh \
-		--with-tk-config=${PREFIX}/lib/tk8.0/tkConfig.sh
+CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.2 \
+		--with-wish=${PREFIX}/bin/wish8.2 \
+		--with-tcl-includes=${PREFIX}/include/tcl8.2 \
+		--with-tcl-config=${PREFIX}/lib/tcl8.2/tclConfig.sh \
+		--with-tk-config=${PREFIX}/lib/tk8.2/tkConfig.sh
 .endif
 MAN1=		PPxP.1 plast.1
 MAN5=		ppxp-files.5
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index bb31ba598f61..1b24aa63aa23 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -7,16 +7,16 @@
 #
 
 DISTNAME=	scotty-2.1.9
-CATEGORIES=	net tk80
+CATEGORIES=	net tk82
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
 MAINTAINER=	phk@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-config=/usr/local/lib/tcl8.0 \
-		--with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS=	--with-tcl-config=/usr/local/lib/tcl8.2 \
+		--with-tk-config=/usr/local/lib/tk8.2
 
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index bb31ba598f61..1b24aa63aa23 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -7,16 +7,16 @@
 #
 
 DISTNAME=	scotty-2.1.9
-CATEGORIES=	net tk80
+CATEGORIES=	net tk82
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
 MAINTAINER=	phk@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-config=/usr/local/lib/tcl8.0 \
-		--with-tk-config=/usr/local/lib/tk8.0
+CONFIGURE_ARGS=	--with-tcl-config=/usr/local/lib/tcl8.2 \
+		--with-tk-config=/usr/local/lib/tk8.2
 
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index fec63590f30b..4c2d3d686b27 100644
--- a/net/sdr/Makefile
+++ b/net/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
diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab
new file mode 100644
index 000000000000..c894da39c0cc
--- /dev/null
+++ b/net/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)
diff --git a/net/tik/Makefile b/net/tik/Makefile
index 39c00acae2ae..0ec799cf9c63 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	tik-0.59
-CATEGORIES=	net tk80
+CATEGORIES=	net tk82
 MASTER_SITES=	http://www.aim.aol.com/tik/ \
 		http://www.nectar.com/distfiles/
 
 MAINTAINER=	astralblue@usa.net
 
-RUN_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
-		wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	tclsh8.2:${PORTSDIR}/lang/tcl82 \
+		wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/tik
diff --git a/net/tik/files/tik b/net/tik/files/tik
index cb9d056c7af3..a17f2b8bbb63 100644
--- a/net/tik/files/tik
+++ b/net/tik/files/tik
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec wish8.0 @PREFIX@/share/tik/tik.tcl
+exec wish8.2 @PREFIX@/share/tik/tik.tcl
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 15131c99b0e5..9e5c21dc45a8 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -7,15 +7,15 @@
 #
 
 DISTNAME=       ttt-1.4
-CATEGORIES=	net tk80
+CATEGORIES=	net tk82
 MASTER_SITES=   ftp://ftp.csl.sony.co.jp/pub/kjc/
 
 MAINTAINER=     kjc@csl.sony.co.jp
 
 # the tcl/tk LIB_DEPENDS has to match that of ports/x11-toolkits/blt.
 LIB_DEPENDS=	BLT24.2:${PORTSDIR}/x11-toolkits/blt \
-		tcl80.1:${PORTSDIR}/lang/tcl80 \
-		tk80.1:${PORTSDIR}/x11-toolkits/tk80
+		tcl82.1:${PORTSDIR}/lang/tcl82 \
+		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install install-man