4 files changed, 42 insertions, 32 deletions

diff --git a/lang/tclX80/files/patch-aa b/lang/tclX80/files/patch-aa
index 5f3999ce37f6..98cfc4fd49ef 100644
--- a/lang/tclX80/files/patch-aa
+++ b/lang/tclX80/files/patch-aa
@@ -1,31 +1,31 @@
---- Config.mk.orig	Sun Jun 16 07:39:18 1996
-+++ Config.mk	Thu Oct  9 08:55:04 1997
-@@ -57,10 +57,10 @@
+--- Config.mk.ORIG	Sun May  3 18:41:27 1998
++++ Config.mk	Sun May  3 18:43:35 1998
+@@ -56,10 +56,10 @@
  # to ${TCL_LIB_SPEC}.
  # 
  
--TCL_SRC=${srcbasedir}/../tcl7.5
--TCL_BUILD=${bldbasedir}/../tcl7.5
+-TCL_SRC=${srcbasedir}/../tcl8.0
+-TCL_BUILD=${bldbasedir}/../tcl8.0
 -TCL_CONFIG=${TCL_BUILD}/unix/tclConfig.sh
 -TCL_LIB=${TCL_BUILD_LIB_SPEC}
-+TCL_SRC=${PREFIX}/include/tcl7.5
++TCL_SRC=${prefix}/include/tcl8.0
 +TCL_BUILD=
-+TCL_CONFIG=${PREFIX}/lib/tcl7.5/tclConfig.sh
++TCL_CONFIG=${prefix}/lib/tcl8.0/tclConfig.sh
 +TCL_LIB=${TCL_LIB_SPEC}
  
  #------------------------------------------------------------------------------
  # Unless configure is going to be run with --with-tk=NO, these defines must be
-@@ -69,10 +69,10 @@
- # neccessary to link with the Tk shared library (libtk4.1.so).  If you want to
+@@ -68,10 +68,10 @@
+ # neccessary to link with the Tk shared library (libtk8.0.so).  If you want to
  # use the installed Tk library, set TK_LIB to ${TK_LIB_SPEC}.
  
--TK_SRC=${srcbasedir}/../tk4.1
--TK_BUILD=${bldbasedir}/../tk4.1
+-TK_SRC=${srcbasedir}/../tk8.0
+-TK_BUILD=${bldbasedir}/../tk8.0
 -TK_CONFIG=${TK_BUILD}/unix/tkConfig.sh
 -TK_LIB=${TK_BUILD_LIB_SPEC}
-+TK_SRC=${PREFIX}/include/tk4.1
++TK_SRC=${prefix}/include/tk8.0
 +TK_BUILD=
-+TK_CONFIG=${PREFIX}/lib/tk4.1/tkConfig.sh
++TK_CONFIG=${prefix}/lib/tk8.0/tkConfig.sh
 +TK_LIB=${TK_LIB_SPEC}
  
  #------------------------------------------------------------------------------
diff --git a/lang/tclX80/files/patch-ab b/lang/tclX80/files/patch-ab
index 5a621b554637..64587cd18d07 100644
--- a/lang/tclX80/files/patch-ab
+++ b/lang/tclX80/files/patch-ab
@@ -1,20 +1,20 @@
---- ../tcl/unix/Makefile.in.orig	Sun Jun 16 07:39:09 1996
-+++ ../tcl/unix/Makefile.in	Thu Oct  9 09:49:19 1997
-@@ -85,7 +85,7 @@
+--- ../tcl/unix/Makefile.in.ORIG	Sun May  3 18:52:36 1998
++++ ../tcl/unix/Makefile.in	Sun May  3 18:53:16 1998
+@@ -124,7 +124,7 @@
  # If a link fails, purge the executable, as some systems leave invalid
  # executables around.
  #
--all: libtclx.a SHLIB_@BUILD_SHARED@ tcl checkup RUNTIME tclXtest runtest
-+all: libtclx.a SHLIB_@BUILD_SHARED@ tcl checkup RUNTIME
+-all: tcl checkup RUNTIME tclXtest
++all: tcl checkup RUNTIME
  
- tcl: tclXAppInit.o libtclx.a SHLIB_@BUILD_SHARED@
- 	${CC} ${LD_SWITCHES} tclXAppInit.o ${LDLIBS} -o tcl || \
-@@ -237,7 +237,7 @@
+ static:	tcl.static tclXtest.static
+ 
+@@ -173,7 +173,7 @@
  # unless we don't have them.
  #
- RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl loadouster.tcl help.tmp \
+ RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl autoload.tcl help.tmp \
 -         dltest.tmp checkup
 +         checkup
- 
- tcl.tlib: ${TLIB_SRCS}
+  
+ tcl.tlib: ${TLIB_SRCS} autoload.tcl
  	-rm -f tcl.tlib tcl.tndx
diff --git a/lang/tclX80/files/patch-ac b/lang/tclX80/files/patch-ac
index b8b932364be2..1486eb003eff 100644
--- a/lang/tclX80/files/patch-ac
+++ b/lang/tclX80/files/patch-ac
@@ -1,12 +1,11 @@
---- ../tk/unix/Makefile.in.orig	Sun Jun 16 07:39:17 1996
-+++ ../tk/unix/Makefile.in	Thu Oct  9 09:57:43 1997
-@@ -67,8 +67,7 @@
+--- ../tk/unix/Makefile.in.ORIG	Sun May  3 18:54:47 1998
++++ ../tk/unix/Makefile.in	Sun May  3 18:55:31 1998
+@@ -85,7 +85,7 @@
  # If a link fails, purge the executable, as some systems leave invalid
  # executables around.
  #
--all: libtkx.a SHLIB_@BUILD_SHARED@ wishx RUNTIME tktest runtest \
--     ${bldbasedir}/tk/tests
-+all: libtkx.a SHLIB_@BUILD_SHARED@ wishx RUNTIME
+-all: wishx RUNTIME tktest
++all: wishx RUNTIME
+ 
+ static: wishx.static tktest.static
  
- wishx: tkXAppInit.o libtkx.a ${LIBTK} ${LIBTCLX}
- 	${CC} ${LD_SWITCHES} tkXAppInit.o ${LDLIBS} -o wishx || \
diff --git a/lang/tclX80/files/patch-ad b/lang/tclX80/files/patch-ad
new file mode 100644
index 000000000000..598bb87e8aaf
--- /dev/null
+++ b/lang/tclX80/files/patch-ad
@@ -0,0 +1,11 @@
+--- Common.mk.in	Tue May  5 20:38:21 1998
++++ Common.mk.in.ORIG	Tue May  5 20:38:02 1998
+@@ -102,7 +102,7 @@
+ TCL_DL_LIBS          = @TCL_DL_LIBS@
+ TCL_SHLIB_LD         = @TCL_SHLIB_LD@
+ TCL_SHLIB_LD_LIBS    = @TCL_SHLIB_LD_LIBS@
+-TCL_BUILD_LIB_SPEC   = @TCL_BUILD_LIB_SPEC@
++TCL_BUILD_LIB_SPEC   = @TCL_LIB_SPEC@
+ TCL_LIB_SPEC         = @TCL_LIB_SPEC@
+ TCL_LD_SEARCH_FLAGS  = @TCL_LD_SEARCH_FLAGS@
+