Unbreak and upgrade tclX80 to 8.0.4

PR:		ports/13544
Submitted by:	Ade Lovett <ade@lovett.com>

5 files changed, 62 insertions, 18 deletions

diff --git a/lang/tclX80/files/patch-aa b/lang/tclX80/files/patch-aa
index 98cfc4f..5250355 100644
--- a/lang/tclX80/files/patch-aa
+++ b/lang/tclX80/files/patch-aa
@@ -1,11 +1,11 @@
---- Config.mk.ORIG	Sun May  3 18:41:27 1998
-+++ Config.mk	Sun May  3 18:43:35 1998
+--- Config.mk.orig	Sun Dec  6 21:47:30 1998
++++ Config.mk	Fri Aug 27 09:38:06 1999
 @@ -56,10 +56,10 @@
  # to ${TCL_LIB_SPEC}.
  # 
  
--TCL_SRC=${srcbasedir}/../tcl8.0
--TCL_BUILD=${bldbasedir}/../tcl8.0
+-TCL_SRC=${srcbasedir}/../tcl8.0.4
+-TCL_BUILD=${bldbasedir}/../tcl8.0.4
 -TCL_CONFIG=${TCL_BUILD}/unix/tclConfig.sh
 -TCL_LIB=${TCL_BUILD_LIB_SPEC}
 +TCL_SRC=${prefix}/include/tcl8.0
@@ -14,13 +14,13 @@
 +TCL_LIB=${TCL_LIB_SPEC}
  
  #------------------------------------------------------------------------------
- # Unless configure is going to be run with --with-tk=NO, these defines must be
+ # Unless configure is going to be run with --enable-tk=NO, these defines must
 @@ -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}/../tk8.0
--TK_BUILD=${bldbasedir}/../tk8.0
+-TK_SRC=${srcbasedir}/../tk8.0.4
+-TK_BUILD=${bldbasedir}/../tk8.0.4
 -TK_CONFIG=${TK_BUILD}/unix/tkConfig.sh
 -TK_LIB=${TK_BUILD_LIB_SPEC}
 +TK_SRC=${prefix}/include/tk8.0
diff --git a/lang/tclX80/files/patch-ab b/lang/tclX80/files/patch-ab
index 994ef31..8106565 100644
--- a/lang/tclX80/files/patch-ab
+++ b/lang/tclX80/files/patch-ab
@@ -1,5 +1,5 @@
---- ../tcl/unix/Makefile.in.orig	Sat Nov 29 17:19:02 1997
-+++ ../tcl/unix/Makefile.in	Mon Sep 28 14:13:29 1998
+--- ../tcl/unix/Makefile.in.orig	Sun Dec  6 21:47:24 1998
++++ ../tcl/unix/Makefile.in	Fri Aug 27 10:34:27 1999
 @@ -124,7 +124,7 @@
  # If a link fails, purge the executable, as some systems leave invalid
  # executables around.
@@ -22,11 +22,11 @@
  #
  RUNTIME: tcl.tlib tcl.tndx tclx.tcl buildidx.tcl autoload.tcl help.tmp \
 -         dltest.tmp checkup
-+         checkup
-  
++	 checkup
+ 
  tcl.tlib: ${TLIB_SRCS} autoload.tcl
  	-rm -f tcl.tlib tcl.tndx
-@@ -316,9 +317,11 @@
+@@ -318,9 +319,11 @@
  	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
  	fi
diff --git a/lang/tclX80/files/patch-ac b/lang/tclX80/files/patch-ac
index 5d94210..629c9d5 100644
--- a/lang/tclX80/files/patch-ac
+++ b/lang/tclX80/files/patch-ac
@@ -1,5 +1,5 @@
---- ../tk/unix/Makefile.in.orig	Sat Nov 29 17:19:07 1997
-+++ ../tk/unix/Makefile.in	Mon Sep 28 14:14:16 1998
+--- ../tk/unix/Makefile.in.orig	Sun Dec  6 21:47:30 1998
++++ ../tk/unix/Makefile.in	Fri Aug 27 10:37:45 1999
 @@ -85,7 +85,7 @@
  # If a link fails, purge the executable, as some systems leave invalid
  # executables around.
diff --git a/lang/tclX80/files/patch-ad b/lang/tclX80/files/patch-ad
index 598bb87..c0374cd 100644
--- a/lang/tclX80/files/patch-ad
+++ b/lang/tclX80/files/patch-ad
@@ -1,11 +1,20 @@
---- 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@
+--- Common.mk.in.orig	Sun Dec  6 21:47:30 1998
++++ Common.mk.in	Fri Aug 27 09:29:10 1999
+@@ -97,7 +97,7 @@
  TCL_SHLIB_LD         = @TCL_SHLIB_LD@
  TCL_SHLIB_LD_LIBS    = @TCL_SHLIB_LD_LIBS@
+ TCL_DBGX             = @TCL_DBGX@
 -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@
  
+@@ -107,7 +107,7 @@
+ TK_XINCLUDES         = @TK_XINCLUDES@
+ TK_XLIBSW            = @TK_XLIBSW@
+ TK_DBGX              = @TK_DBGX@
+-TK_BUILD_LIB_SPEC    = @TK_BUILD_LIB_SPEC@
++TK_BUILD_LIB_SPEC    = @TK_LIB_SPEC@
+ TK_LIB_SPEC          = @TK_LIB_SPEC@
+ TK_LD_SEARCH_FLAGS   = @TK_LD_SEARCH_FLAGS@
+ 
diff --git a/lang/tclX80/files/patch-ae b/lang/tclX80/files/patch-ae
new file mode 100644
index 0000000..8ef4f26
--- /dev/null
+++ b/lang/tclX80/files/patch-ae
@@ -0,0 +1,35 @@
+--- configure.orig	Sun Dec  6 21:47:31 1998
++++ configure	Fri Aug 27 10:11:48 1999
+@@ -1097,21 +1097,19 @@
+ #
+ # Generate the library names using the Tcl macros.
+ #
+-SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
++TCL_STLIB_NAME=libtcl80.a
++TK_STLIB_NAME=libtk80.a
+ 
+-VERSION=$TCL_VERSION
+-eval "TCL_STLIB_NAME=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
++TCLX_STLIB_NAME=libtclx804.a
++TKX_STLIB_NAME=libtkx804.a
+ 
+-VERSION=$TK_VERSION
+-eval "TK_STLIB_NAME=libtk${TCL_UNSHARED_LIB_SUFFIX}"
+-
+-VERSION=$TCLX_VERSION$TCL_DBGX
+-eval "TCLX_STLIB_NAME=libtclx${TCL_UNSHARED_LIB_SUFFIX}"
+-eval "TCLX_SHLIB_NAME=libtclx${TCL_SHARED_LIB_SUFFIX}"
+-
+-VERSION=$TKX_VERSION$TCL_DBGX
+-eval "TKX_STLIB_NAME=libtkx${TCL_UNSHARED_LIB_SUFFIX}"
+-eval "TKX_SHLIB_NAME=libtkx${TCL_SHARED_LIB_SUFFIX}"
++if [ "$PORTOBJFORMAT" = "elf" ]; then
++    TCLX_SHLIB_NAME=libtclx804.so.1
++    TKX_SHLIB_NAME=libtkx804.so.1
++else
++    TCLX_SHLIB_NAME=libtclx804.so.1.4
++    TKX_SHLIB_NAME=libtkx804.so.1.4
++fi
+ 
+ #
+ # Determine suffix to use for the object files for the shared library.