Update tk81 to beta 1

12 files changed, 108 insertions, 96 deletions

diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 459a9f9f1509..94333ee663c1 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $
+# $Id: Makefile,v 1.20 1998/12/13 08:49:14 asami Exp $
 #
 
-DISTNAME=	tk8.1a2
-PKGNAME=	tk-8.1.a2
+DISTNAME=	tk8.1b1
+PKGNAME=	tk-8.1.b1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
index eda0f4eb09ff..c57202986b5e 100644
--- a/x11-toolkits/tk82/distinfo
+++ b/x11-toolkits/tk82/distinfo
@@ -1 +1 @@
-MD5 (tk8.1a2.tar.gz) = eb6fd94eabb8d2f3a2bd64c40a75bf6f
+MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index 920a23fade54..236821a86312 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,10 +1,10 @@
---- configure.orig	Mon Feb 23 21:11:35 1998
-+++ configure	Sun Mar  1 19:43:04 1998
-@@ -871,14 +871,14 @@
+--- configure.orig	Fri Dec 11 18:38:40 1998
++++ configure	Sat Jan  2 16:03:14 1999
+@@ -854,14 +854,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
--  TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`
+-  TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`
 +  TCL_BIN_DIR=${prefix}/lib/tcl8.1
  fi
  
@@ -13,25 +13,25 @@
  fi
 -if test ! -f $TCL_BIN_DIR/Makefile; then
 -    { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
++if test ! -f $TCL_BIN_DIR/tclConfig.sh; then 
 +    { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
  fi
  
  #--------------------------------------------------------------------
-@@ -897,6 +897,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
+@@ -902,6 +902,8 @@
+ CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 +
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2571,6 +2573,7 @@
+@@ -2513,6 +2515,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TCL_DBGX@%$TCL_DBGX%g
+ s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
  s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
- s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
index ba78e41119ef..8cd4ef5de29e 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Feb 23 20:11:34 1998
-+++ Makefile.in	Sat Oct  3 16:48:40 1998
+--- Makefile.in.orig	Fri Dec 11 18:38:40 1998
++++ Makefile.in	Sat Jan  2 16:11:27 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -11,21 +11,25 @@
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -95,11 +97,11 @@
+@@ -98,7 +100,7 @@
+ #CFLAGS = 		$(CFLAGS_DEBUG)
+ #CFLAGS = 		$(CFLAGS_OPTIMIZE)
+ #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = 		$(@CFLAGS_DEFAULT@)
++CFLAGS = 		@CFLAGS@
+ 
+ # A "-I" switch that can be used when compiling to make all of the
+ # X11 include files accessible (the configure script will try to
+@@ -113,7 +115,7 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
 -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 +LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
- 
  # To turn off the security checks that disallow incoming sends when
  # the X server appears to be insecure, reverse the comments on the
-@@ -141,7 +143,7 @@
+@@ -155,7 +157,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -34,12 +38,12 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -299,8 +301,14 @@
- @TK_LIB_FILE@: ${OBJS}
- 	rm -f @TK_LIB_FILE@
+@@ -320,8 +322,14 @@
+ ${TK_LIB_FILE}: ${OBJS}
+ 	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk81.so
- 	$(RANLIB) @TK_LIB_FILE@
+ 	$(RANLIB) ${TK_LIB_FILE}
  
 +libtk81.a: ${OBJS}
 +	rm -f libtk81.a
@@ -49,7 +53,7 @@
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -355,7 +363,7 @@
+@@ -376,7 +384,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -58,7 +62,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -367,15 +375,22 @@
+@@ -388,15 +396,22 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -82,7 +86,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -385,8 +400,18 @@
+@@ -406,8 +421,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -103,7 +107,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -445,28 +470,28 @@
+@@ -466,28 +491,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 459a9f9f1509..94333ee663c1 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $
+# $Id: Makefile,v 1.20 1998/12/13 08:49:14 asami Exp $
 #
 
-DISTNAME=	tk8.1a2
-PKGNAME=	tk-8.1.a2
+DISTNAME=	tk8.1b1
+PKGNAME=	tk-8.1.b1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index eda0f4eb09ff..c57202986b5e 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.1a2.tar.gz) = eb6fd94eabb8d2f3a2bd64c40a75bf6f
+MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa
index 920a23fade54..236821a86312 100644
--- a/x11-toolkits/tk83/files/patch-aa
+++ b/x11-toolkits/tk83/files/patch-aa
@@ -1,10 +1,10 @@
---- configure.orig	Mon Feb 23 21:11:35 1998
-+++ configure	Sun Mar  1 19:43:04 1998
-@@ -871,14 +871,14 @@
+--- configure.orig	Fri Dec 11 18:38:40 1998
++++ configure	Sat Jan  2 16:03:14 1999
+@@ -854,14 +854,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
--  TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`
+-  TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`
 +  TCL_BIN_DIR=${prefix}/lib/tcl8.1
  fi
  
@@ -13,25 +13,25 @@
  fi
 -if test ! -f $TCL_BIN_DIR/Makefile; then
 -    { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
++if test ! -f $TCL_BIN_DIR/tclConfig.sh; then 
 +    { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
  fi
  
  #--------------------------------------------------------------------
-@@ -897,6 +897,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
+@@ -902,6 +902,8 @@
+ CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 +
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2571,6 +2573,7 @@
+@@ -2513,6 +2515,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TCL_DBGX@%$TCL_DBGX%g
+ s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
  s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
- s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index ba78e41119ef..8cd4ef5de29e 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Feb 23 20:11:34 1998
-+++ Makefile.in	Sat Oct  3 16:48:40 1998
+--- Makefile.in.orig	Fri Dec 11 18:38:40 1998
++++ Makefile.in	Sat Jan  2 16:11:27 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -11,21 +11,25 @@
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -95,11 +97,11 @@
+@@ -98,7 +100,7 @@
+ #CFLAGS = 		$(CFLAGS_DEBUG)
+ #CFLAGS = 		$(CFLAGS_OPTIMIZE)
+ #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = 		$(@CFLAGS_DEFAULT@)
++CFLAGS = 		@CFLAGS@
+ 
+ # A "-I" switch that can be used when compiling to make all of the
+ # X11 include files accessible (the configure script will try to
+@@ -113,7 +115,7 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
 -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 +LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
- 
  # To turn off the security checks that disallow incoming sends when
  # the X server appears to be insecure, reverse the comments on the
-@@ -141,7 +143,7 @@
+@@ -155,7 +157,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -34,12 +38,12 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -299,8 +301,14 @@
- @TK_LIB_FILE@: ${OBJS}
- 	rm -f @TK_LIB_FILE@
+@@ -320,8 +322,14 @@
+ ${TK_LIB_FILE}: ${OBJS}
+ 	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk81.so
- 	$(RANLIB) @TK_LIB_FILE@
+ 	$(RANLIB) ${TK_LIB_FILE}
  
 +libtk81.a: ${OBJS}
 +	rm -f libtk81.a
@@ -49,7 +53,7 @@
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -355,7 +363,7 @@
+@@ -376,7 +384,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -58,7 +62,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -367,15 +375,22 @@
+@@ -388,15 +396,22 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -82,7 +86,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -385,8 +400,18 @@
+@@ -406,8 +421,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -103,7 +107,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -445,28 +470,28 @@
+@@ -466,28 +491,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 459a9f9f1509..94333ee663c1 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $
+# $Id: Makefile,v 1.20 1998/12/13 08:49:14 asami Exp $
 #
 
-DISTNAME=	tk8.1a2
-PKGNAME=	tk-8.1.a2
+DISTNAME=	tk8.1b1
+PKGNAME=	tk-8.1.b1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index eda0f4eb09ff..c57202986b5e 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.1a2.tar.gz) = eb6fd94eabb8d2f3a2bd64c40a75bf6f
+MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index 920a23fade54..236821a86312 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,10 +1,10 @@
---- configure.orig	Mon Feb 23 21:11:35 1998
-+++ configure	Sun Mar  1 19:43:04 1998
-@@ -871,14 +871,14 @@
+--- configure.orig	Fri Dec 11 18:38:40 1998
++++ configure	Sat Jan  2 16:03:14 1999
+@@ -854,14 +854,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
--  TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`
+-  TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`
 +  TCL_BIN_DIR=${prefix}/lib/tcl8.1
  fi
  
@@ -13,25 +13,25 @@
  fi
 -if test ! -f $TCL_BIN_DIR/Makefile; then
 -    { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
++if test ! -f $TCL_BIN_DIR/tclConfig.sh; then 
 +    { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
  fi
  
  #--------------------------------------------------------------------
-@@ -897,6 +897,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
+@@ -902,6 +902,8 @@
+ CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 +
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2571,6 +2573,7 @@
+@@ -2513,6 +2515,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TCL_DBGX@%$TCL_DBGX%g
+ s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
  s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
- s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index ba78e41119ef..8cd4ef5de29e 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Feb 23 20:11:34 1998
-+++ Makefile.in	Sat Oct  3 16:48:40 1998
+--- Makefile.in.orig	Fri Dec 11 18:38:40 1998
++++ Makefile.in	Sat Jan  2 16:11:27 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -11,21 +11,25 @@
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -95,11 +97,11 @@
+@@ -98,7 +100,7 @@
+ #CFLAGS = 		$(CFLAGS_DEBUG)
+ #CFLAGS = 		$(CFLAGS_OPTIMIZE)
+ #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = 		$(@CFLAGS_DEFAULT@)
++CFLAGS = 		@CFLAGS@
+ 
+ # A "-I" switch that can be used when compiling to make all of the
+ # X11 include files accessible (the configure script will try to
+@@ -113,7 +115,7 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
 -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
 +LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
  
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
- 
  # To turn off the security checks that disallow incoming sends when
  # the X server appears to be insecure, reverse the comments on the
-@@ -141,7 +143,7 @@
+@@ -155,7 +157,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -34,12 +38,12 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -299,8 +301,14 @@
- @TK_LIB_FILE@: ${OBJS}
- 	rm -f @TK_LIB_FILE@
+@@ -320,8 +322,14 @@
+ ${TK_LIB_FILE}: ${OBJS}
+ 	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk81.so
- 	$(RANLIB) @TK_LIB_FILE@
+ 	$(RANLIB) ${TK_LIB_FILE}
  
 +libtk81.a: ${OBJS}
 +	rm -f libtk81.a
@@ -49,7 +53,7 @@
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -355,7 +363,7 @@
+@@ -376,7 +384,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -58,7 +62,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -367,15 +375,22 @@
+@@ -388,15 +396,22 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -82,7 +86,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -385,8 +400,18 @@
+@@ -406,8 +421,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -103,7 +107,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -445,28 +470,28 @@
+@@ -466,28 +491,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \