Update to use Tcl/Tk version 8.2.

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

10 files changed, 35 insertions, 17 deletions

diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 441262072731..f97d3be040ad 100644
--- 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
 
diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib
index 31ec14d6f3b6..0cdabb9d2199 100644
--- 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\
diff --git a/lang/itcl/files/patch-ah b/lang/itcl/files/patch-ah
new file mode 100644
index 000000000000..aaea8c0f53cb
--- /dev/null
+++ 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) {
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index 41b7956fb369..18bf49fe247d 100644
--- 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
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 2587aa845095..8d1cbf7fd5a1 100644
--- 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>
diff --git a/lang/otcl/pkg-plist b/lang/otcl/pkg-plist
index f0f24c23686e..00574abc8478 100644
--- 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
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index 431fc884cc7a..7eed48144a64 100644
--- 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
 
diff --git a/lang/p5-Tcl/files/patch-aa b/lang/p5-Tcl/files/patch-aa
index d79a7ddd4d64..f2bc4835e595 100644
--- 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"
  );
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- 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
diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile
index 728ad15994f0..062ab1af3eb3 100644
--- 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