Update tcl to 8.4.5. Too many changes since 8.3.4. Please see

ChangeLog in the distfile.

1 files changed, 25 insertions, 38 deletions

diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 6ea7ae8e39f..3db196b92b4 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
+$NetBSD: patch-aa,v 1.9 2004/03/08 19:55:35 minskim Exp $
 
---- Makefile.in.orig	Fri Oct 19 20:24:15 2001
-+++ Makefile.in	Tue Oct  7 21:57:52 2003
-@@ -87,7 +87,7 @@
+--- Makefile.in.orig	2003-11-21 14:17:14.000000000 -0600
++++ Makefile.in
+@@ -90,7 +90,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
--CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
-+CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@
+-CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
++CFLAGS			+= @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX)
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -169,8 +169,8 @@
+@@ -172,8 +172,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY  = -S -S
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -187,8 +187,8 @@
+@@ -190,8 +190,8 @@ TCL_EXE			= tclsh
  # configure script.  You shouldn't normally need to modify any of
  # these definitions by hand.
  
@@ -31,56 +31,43 @@ $NetBSD: patch-aa,v 1.8 2003/10/08 03:13:21 jschauma Exp $
 +STLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 +SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
- 
- SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-@@ -235,8 +235,9 @@
+ SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
+@@ -254,8 +254,9 @@ DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
  
 -CC			= @CC@
  #CC			= purify -best-effort @CC@ -DPURIFY
-+CC                      = ${LIBTOOL} --mode=compile @CC@
-+LD                      = ${LIBTOOL} --mode=link @CC@ ${LDFLAGS}
- 
- #----------------------------------------------------------------
- # The information below should be usable as is.  The configure
-@@ -420,6 +421,7 @@
- 	@MAKE_LIB@
- 	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- 		$(RANLIB) ${TCL_LIB_FILE}; \
-+		$(TOUCH) ${TCL_LIB_FILE}; \
- 	fi
++CC			= ${LIBTOOL} --mode=compile @CC@
++LD			= ${LIBTOOL} --mode=link @CC@
  
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-@@ -440,11 +442,11 @@
+ # Flags to be passed to mkLinks to control whether the manpages
+ # should be compressed and linked with softlinks
+@@ -474,7 +475,7 @@ objs: ${OBJS}
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
 -	${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tclsh
+ 		${CC_SEARCH_FLAGS} -o tclsh
+ 
+ # Resetting the LIB_RUNTIME_DIR below is required so that
+@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+ 	$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
  
- tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
+ tcltest-real:
 -	${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
 +	${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -o tcltest
+ 		${CC_SEARCH_FLAGS} -o tcltest
  
  # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -538,7 +540,7 @@
- 	    chmod +x $(SRC_DIR)/install-sh; \
- 	    fi
- 	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
--	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- 	@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- 	    (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
- 	    fi
-@@ -989,7 +991,7 @@
+@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
 -	${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
 +	${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  		@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
- 		@TCL_LD_SEARCH_FLAGS@ -L/usr/openwin/lib -lXt -o xttest
+ 		${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest