diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa
index 5a0d3242c62e..98007f988d92 100644
--- a/lang/tcl82/files/patch-aa
+++ b/lang/tcl82/files/patch-aa
@@ -1,4 +1,5 @@
-+++ Makefile.in	Wed Oct  1 09:51:59 1997
+--- Makefile.in.orig	Mon Feb 23 20:02:50 1998
++++ Makefile.in	Sun Aug 23 13:16:18 1998
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -10,6 +11,15 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+@@ -73,7 +75,7 @@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++CFLAGS?= -O
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
 @@ -138,7 +140,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
@@ -19,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -315,7 +317,7 @@
+@@ -334,7 +336,7 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
  
@@ -28,7 +38,7 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -324,6 +326,11 @@
+@@ -343,6 +345,11 @@
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
  
@@ -40,7 +50,7 @@
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -415,7 +422,7 @@
+@@ -434,7 +441,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -49,7 +59,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -429,18 +436,23 @@
+@@ -448,18 +455,23 @@
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -77,7 +87,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -454,8 +466,15 @@
+@@ -473,8 +485,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -95,7 +105,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -483,30 +502,37 @@
+@@ -506,30 +525,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 5a0d3242c62e..98007f988d92 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,4 +1,5 @@
-+++ Makefile.in	Wed Oct  1 09:51:59 1997
+--- Makefile.in.orig	Mon Feb 23 20:02:50 1998
++++ Makefile.in	Sun Aug 23 13:16:18 1998
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -10,6 +11,15 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+@@ -73,7 +75,7 @@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++CFLAGS?= -O
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
 @@ -138,7 +140,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
@@ -19,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -315,7 +317,7 @@
+@@ -334,7 +336,7 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
  
@@ -28,7 +38,7 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -324,6 +326,11 @@
+@@ -343,6 +345,11 @@
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
  
@@ -40,7 +50,7 @@
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -415,7 +422,7 @@
+@@ -434,7 +441,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -49,7 +59,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -429,18 +436,23 @@
+@@ -448,18 +455,23 @@
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -77,7 +87,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -454,8 +466,15 @@
+@@ -473,8 +485,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -95,7 +105,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -483,30 +502,37 @@
+@@ -506,30 +525,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 5a0d3242c62e..98007f988d92 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,4 +1,5 @@
-+++ Makefile.in	Wed Oct  1 09:51:59 1997
+--- Makefile.in.orig	Mon Feb 23 20:02:50 1998
++++ Makefile.in	Sun Aug 23 13:16:18 1998
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -10,6 +11,15 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+@@ -73,7 +75,7 @@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++CFLAGS?= -O
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
 @@ -138,7 +140,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
@@ -19,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -315,7 +317,7 @@
+@@ -334,7 +336,7 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
  
@@ -28,7 +38,7 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -324,6 +326,11 @@
+@@ -343,6 +345,11 @@
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
  
@@ -40,7 +50,7 @@
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -415,7 +422,7 @@
+@@ -434,7 +441,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -49,7 +59,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -429,18 +436,23 @@
+@@ -448,18 +455,23 @@
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -77,7 +87,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -454,8 +466,15 @@
+@@ -473,8 +485,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -95,7 +105,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -483,30 +502,37 @@
+@@ -506,30 +525,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \