2 files changed, 25 insertions, 29 deletions

diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index c916b97983d6..2fb3a6ae2081 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Feb 23 20:02:50 1998
-+++ Makefile.in	Sat Oct  3 15:49:29 1998
+--- Makefile.in.orig	Fri Dec 11 18:36:13 1998
++++ Makefile.in	Sat Jan  2 14:47:02 1999
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -11,16 +11,16 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -73,7 +75,7 @@
+@@ -86,7 +88,7 @@
+ #CFLAGS = 		$(CFLAGS_DEBUG)
+ #CFLAGS = 		$(CFLAGS_OPTIMIZE)
+ #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = 		@CFLAGS@
++CFLAGS? = 		@CFLAGS@
  
- # 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 @@
+@@ -152,7 +154,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -29,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -334,15 +336,21 @@
+@@ -357,15 +359,21 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
  
@@ -52,7 +52,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
-@@ -434,7 +442,7 @@
+@@ -459,7 +467,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -61,7 +61,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -446,20 +454,26 @@
+@@ -471,16 +479,22 @@
  	    done;
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -87,12 +87,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
--		mkdir $$i; \
-+		mkdir -p $$i; \
- 		chmod 755 $$i; \
- 		else true; \
- 		fi; \
-@@ -473,8 +487,15 @@
+@@ -498,8 +512,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -110,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"; \
-@@ -506,30 +527,37 @@
+@@ -531,30 +552,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 09c7d883dccd..76921d7569df 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Mon Feb 23 20:02:51 1998
-+++ configure	Sat Oct  3 15:46:42 1998
-@@ -4528,14 +4528,19 @@
+--- configure.orig	Fri Dec 11 18:36:14 1998
++++ configure	Sat Jan  2 15:04:24 1999
+@@ -4330,14 +4330,19 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -11,13 +11,14 @@
  	    DL_LIBS=""
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
-+  if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
-+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
-+	    SHLIB_LD="ld -shared -x -soname \$@"
-+  else
- 	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
-+	    SHLIB_LD="ld -Bshareable -x"
-+  fi
+-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++        if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
++            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
++            SHLIB_LD="ld -shared -x -soname \$@"
++        else
++            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++            SHLIB_LD="ld -Bshareable -x"
++        fi
  	
  else
    echo "$ac_t""no" 1>&6