From 8c82758f677fcad60c4ba0e8671eb30ea2d302f3 Mon Sep 17 00:00:00 2001
From: Thomas Gellekum <tg@FreeBSD.org>
Date: Tue, 17 Mar 1998 07:55:18 +0000
Subject: [PATCH] Back out last change, use tcl80.

---
 x11-toolkits/tix/Makefile       |  8 +++---
 x11-toolkits/tix/files/patch-aa |  4 +--
 x11-toolkits/tix/files/patch-ac | 48 ++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index d702a9d93b3c..465aae118271 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -8,18 +8,18 @@
 
 DISTNAME=	Tix4.1.0.006
 PKGNAME=	tix-4.1.0.006
-CATEGORIES=	x11 tk81
+CATEGORIES=	x11 tk80
 MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-LIB_DEPENDS=	tk81\\.1\\.:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/Tix4.1.0/unix/tk8.0
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
-		--with-tcl="${PREFIX}/include/tcl8.1" \
-		--with-tk="${PREFIX}/include/tk8.1"
+		--with-tcl="${PREFIX}/include/tcl8.0" \
+		--with-tk="${PREFIX}/include/tk8.0"
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 MAN1=		tixwish.1 
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 05268871410f..40baef032149 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -13,7 +13,7 @@
  echo "$ac_t""$TCL_SRC_DIR" 1>&6
  
 -TCL_BIN_DIR=$TCL_SRC_DIR/unix
-+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.1
++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.0
  
  #--------------------------------------------------------------------
  #	See if there was a command-line option for where Tk is;  if
@@ -30,7 +30,7 @@
  echo "$ac_t""$TK_SRC_DIR" 1>&6
  
 -TK_BIN_DIR=$TK_SRC_DIR/unix
-+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.1
++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.0
  
  #--------------------------------------------------------------------
  #	Find out the top level source directory of the Tix package.
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index fd861653c5d8..8590fb1890ad 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -26,9 +26,9 @@
 -RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/library \
 -		  TK_LIBRARY=$(TK_SRC_DIR)/library \
 -	          $(TCL_SRC_DIR)/unix/tclsh
-+RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.1 \
-+		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.1 \
-+	          $(TCL_SRC_DIR)/../../bin/tclsh8.1
++RUN_TCLSH	= TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.0 \
++		  TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.0 \
++	          $(TCL_SRC_DIR)/../../bin/tclsh8.0
  
  
  #----------------------------------------------------------------
@@ -37,7 +37,7 @@
  #----------------------------------------------------------------------
  
 -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
-+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.1/*.tcl
++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.0/*.tcl
  
  TK_SCRIPTS = \
 -    $(TK_SRC_DIR)/library/bgerror.tcl \
@@ -60,26 +60,26 @@
 -    $(TK_SRC_DIR)/library/scale.tcl \
 -    $(TK_SRC_DIR)/library/scrlbar.tcl \
 -    $(TK_SRC_DIR)/library/text.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/bgerror.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/dialog.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/focus.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/obsolete.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/optMenu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/palette.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/tearoff.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/clrpick.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/comdlg.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/msgbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/tkfbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/xmfbox.tcl \
-+    $(SRC_DIR)/generic/tk8.1/tk.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/button.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/entry.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/listbox.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/menu.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/scale.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/scrlbar.tcl \
-+    $(TK_SRC_DIR)/../../lib/tk8.1/text.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/bgerror.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/dialog.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/focus.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/obsolete.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/optMenu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/palette.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/tearoff.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/clrpick.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/comdlg.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/msgbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/tkfbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/xmfbox.tcl \
++    $(SRC_DIR)/generic/tk8.0/tk.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/button.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/entry.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/listbox.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/menu.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/scale.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/scrlbar.tcl \
++    $(TK_SRC_DIR)/../../lib/tk8.0/text.tcl \
      $(SRC_DIR)/generic/tk8.0/console.tcl
  
  TIX_SCRIPTS = \