Update lang/otcl from 1.8 to 1.9 and devel/tclcl from 1.15 to 1.16.

Add a patch to the latter to use Tcl-8.4.10's http2.5 instead of
http2.4, which came with earlier Tcl; correct the patch-aa to use
Tcl-8.4 (like the rest of the port) instead 8.3 in otcldoc.

Submitted by:	pointyhat (the http2.4 vs. http2.5 discrepancy)

6 files changed, 15 insertions, 43 deletions

diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 767007c..a8ca2e9 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tclcl
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	otcl-tclcl
@@ -15,8 +15,8 @@ DISTFILES=	tclcl-src-${PORTVERSION}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/C++ interface used by ns and nam
 
-LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
-		otcl.1:${PORTSDIR}/lang/otcl
+LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84 \
+		otcl:${PORTSDIR}/lang/otcl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
diff --git a/devel/tclcl/distinfo b/devel/tclcl/distinfo
index 08a1654..145ac58 100644
--- a/devel/tclcl/distinfo
+++ b/devel/tclcl/distinfo
@@ -1,2 +1,2 @@
-MD5 (tclcl-src-1.15.tar.gz) = 0b6403ea9303d776717855eb0828a408
-SIZE (tclcl-src-1.15.tar.gz) = 143000
+MD5 (tclcl-src-1.16.tar.gz) = 2a25a4736c1bf4ec7f4e6343aa533bc6
+SIZE (tclcl-src-1.16.tar.gz) = 203269
diff --git a/devel/tclcl/files/patch-Makefile.in b/devel/tclcl/files/patch-Makefile.in
new file mode 100644
index 0000000..e388e9b
--- /dev/null
+++ b/devel/tclcl/files/patch-Makefile.in
@@ -0,0 +1,9 @@
+--- Makefile.in	Wed Jan 19 14:21:21 2005
++++ Makefile.in	Sat Jul  2 20:33:28 2005
+@@ -110,5 +110,5 @@
+ TCL_84_LIBRARY_FILES = \
+         $(TCL_BASE_LIBRARY_FILES) \
+-	$(LIBRARY_TCL)/http2.4/http.tcl
++	$(LIBRARY_TCL)/http2.5/http.tcl
+ 
+ TCL_LIBRARY_FILES = \
diff --git a/devel/tclcl/files/patch-aa b/devel/tclcl/files/patch-aa
index 16d9b77..3b1426c 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.3 "$0" "$@"
++exec tclsh8.4 "$0" "$@"
  
  #
  # otcldoc - a simple script for translating otcl classes into
diff --git a/devel/tclcl/files/patch-ab b/devel/tclcl/files/patch-ab
deleted file mode 100644
index c387d4c..0000000
--- a/devel/tclcl/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.orig	Wed Mar 10 22:31:11 2004
-+++ Makefile.in	Wed Mar 10 22:34:54 2004
-@@ -103,10 +103,10 @@
- 	$(LIBRARY_TCL)/http2.1/http.tcl
- TCL_83_LIBRARY_FILES = \
- 	$(TCL_BASE_LIBRARY_FILES) \
--	$(LIBRARY_TCL)/http2.3/http.tcl
-+	$(LIBRARY_TCL)/http2.4/http.tcl
- TCL_84_LIBRARY_FILES = \
-         $(TCL_BASE_LIBRARY_FILES) \
--	$(LIBRARY_TCL)/http/http.tcl
-+	$(LIBRARY_TCL)/http2.4/http.tcl
- 
- TCL_LIBRARY_FILES = \
- 	@V_TCL_LIBRARY_FILES@
diff --git a/devel/tclcl/files/patch-tclcl.h b/devel/tclcl/files/patch-tclcl.h
deleted file mode 100644
index e5bdef4..0000000
--- a/devel/tclcl/files/patch-tclcl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- tclcl.h.orig
-+++ tclcl.h
-@@ -45,7 +45,6 @@
- }
- 
- #include "tclcl-config.h"
--#include "tclcl-mappings.h"
- #include "tracedvar.h"
- 
- struct Tk_Window_;
-@@ -253,6 +252,8 @@
- 	InstVar* instvar_;
- 	TracedVar* tracedvar_;
- };
-+
-+#include "tclcl-mappings.h"
- 
- /*
-  * johnh xxx: delete this