2 files changed, 12 insertions, 34 deletions

diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 40baef032149..5c378ca5a859 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -1,5 +1,5 @@
 --- configure.orig	Thu Sep 25 20:32:47 1997
-+++ configure	Tue Dec  2 11:39:39 1997
++++ configure	Sun Oct  4 20:21:17 1998
 @@ -1060,6 +1060,7 @@
  
  if test "$val" != ""; then
@@ -34,36 +34,6 @@
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
-@@ -1227,25 +1229,25 @@
- 
-     # The main Tix library
-     #
--    eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
-+    eval "TIX_LIB_FILE=libtix`echo ${VERSION} | tr -d .`.so.1.2"
-     TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
- 
-     # The Tcl SAM library
-     #
-     VERSION=8.0
--    eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}"
-+    eval "TCL_SAM_FILE=libtclsam`echo ${VERSION} | tr -d .`.so.1.2"
-     TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}"
-     
-     # The Tk SAM library
-     #
-     VERSION=8.0
--    eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}"
-+    eval "TK_SAM_FILE=libtksam`echo ${VERSION} | tr -d .`.so.1.2"
-     TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}"
-     
-     # The Tix SAM library
-     #
-     VERSION=${BIN_VERSION}
--    eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}"
-+    eval "TIX_SAM_FILE=libtixsam`echo ${VERSION} | tr -d .`.so.1.2"
-     TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}"
- 
- else
 @@ -1707,15 +1709,15 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@DL_LIBS@%$DL_LIBS%g
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 8590fb1890ad..e1b8f63706bf 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Sep 24 01:57:18 1997
-+++ Makefile.in	Wed Oct  1 13:23:24 1997
+--- Makefile.in.orig	Thu Sep 25 20:32:45 1997
++++ Makefile.in	Sun Oct  4 20:47:11 1998
 @@ -29,7 +29,7 @@
  # Directory in which to install the library of Tix scripts and demos
  # (note: you can set the TIX_LIBRARY environment variable at run-time to
@@ -32,7 +32,7 @@
  
  
  #----------------------------------------------------------------
-@@ -210,29 +212,29 @@
+@@ -211,29 +211,29 @@
  # scripts of TK must be included in the fixed order.
  #----------------------------------------------------------------------
  
@@ -83,3 +83,11 @@
      $(SRC_DIR)/generic/tk8.0/console.tcl
  
  TIX_SCRIPTS = \
+@@ -247,6 +247,7 @@
+ 	rm -f $(TIX_LIB_FILE)
+ 	@TIX_MAKE_LIB@
+ 	$(RANLIB) $(TIX_LIB_FILE)
++	ln -fs $(TIX_LIB_FILE) `echo $(TIX_LIB_FILE) | sed -e 's/[\.0-9]*$$//'`
+ 
+ $(TCL_SAM_FILE): $(TCL_SAM_OBJS)
+ 	rm -f $(TCL_SAM_FILE)