[pkgsrc/trunk]: pkgsrc/devel/tcl-tclcl Fix build with latest lang/tcl package.

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b45f7656c469
branches:  trunk
changeset: 485001:b45f7656c469
user:      seb <seb%pkgsrc.org@localhost>
date:      Thu Dec 02 17:25:05 2004 +0000

description:
Fix build with latest lang/tcl package.

Approved by maintainer.

diffstat:

 devel/tcl-tclcl/distinfo         |   4 ++--
 devel/tcl-tclcl/patches/patch-aa |  20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r fbf802c61432 -r b45f7656c469 devel/tcl-tclcl/distinfo
--- a/devel/tcl-tclcl/distinfo  Thu Dec 02 16:57:23 2004 +0000
+++ b/devel/tcl-tclcl/distinfo  Thu Dec 02 17:25:05 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/03/08 23:49:41 minskim Exp $
+$NetBSD: distinfo,v 1.4 2004/12/02 17:25:05 seb Exp $
 
 SHA1 (tclcl-src-1.15.tar.gz) = 5b927893d4d3b3f49e86f4ee43266668595d34e3
 Size (tclcl-src-1.15.tar.gz) = 143000 bytes
-SHA1 (patch-aa) = b86e9d208e131b142a5ee81ebd2247718c2e1773
+SHA1 (patch-aa) = 4b9b5dfd52c039ba2fdae36bd9f455111fc4e643
diff -r fbf802c61432 -r b45f7656c469 devel/tcl-tclcl/patches/patch-aa
--- a/devel/tcl-tclcl/patches/patch-aa  Thu Dec 02 16:57:23 2004 +0000
+++ b/devel/tcl-tclcl/patches/patch-aa  Thu Dec 02 17:25:05 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/03/08 23:49:41 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2004/12/02 17:25:05 seb Exp $
 
---- Makefile.in.orig   Fri Jan  9 16:38:18 2004
+--- Makefile.in.orig   2004-01-09 22:38:18.000000000 +0000
 +++ Makefile.in
 @@ -52,6 +52,9 @@ TEST = test
  RM    = rm -f
@@ -26,16 +26,22 @@
  
  
  GEN_DIR       = gen/
-@@ -106,7 +109,7 @@ TCL_83_LIBRARY_FILES = \
+@@ -105,8 +108,12 @@ TCL_83_LIBRARY_FILES = \
+       $(TCL_BASE_LIBRARY_FILES) \
        $(LIBRARY_TCL)/http2.3/http.tcl
  TCL_84_LIBRARY_FILES = \
-         $(TCL_BASE_LIBRARY_FILES) \
+-        $(TCL_BASE_LIBRARY_FILES) \
 -      $(LIBRARY_TCL)/http/http.tcl
-+      $(LIBRARY_TCL)/http2.4/http.tcl
++        $(TCL_BASE_LIBRARY_FILES)
++.if exists($(LIBRARY_TCL)/http2.5/http.tcl)
++TCL_84_LIBRARY_FILES+=        $(LIBRARY_TCL)/http2.5/http.tcl
++.else
++TCL_84_LIBRARY_FILES+=        $(LIBRARY_TCL)/http2.4/http.tcl
++.endif
  
  TCL_LIBRARY_FILES = \
        @V_TCL_LIBRARY_FILES@
-@@ -152,13 +155,12 @@ all:     $(TCL2C) $(LIB_TCLCL)
+@@ -152,13 +159,12 @@ all:     $(TCL2C) $(LIB_TCLCL)
  
  $(TCL2C): tcl2c++.o
        $(RM) $@
@@ -51,7 +57,7 @@
  
  #
  # pass-1 embedded tcl files
-@@ -183,9 +185,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
+@@ -183,9 +189,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
        $(TCL2C) et_console $(CONSOLE_FILES) > embedded-console.cc
  
  install: force