Back out changes to use tcl81.

I have left out zircon, which seems to have provisions for tcl81, and
hfsutils and filerunner, which have been upgraded and probably checked
in the meantime.

27 files changed, 46 insertions, 47 deletions

diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 16829da9d247..3549489c47f8 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -7,12 +7,12 @@
 #
 
 DISTNAME=	xcd-1.6
-CATEGORIES=	audio tk81
+CATEGORIES=	audio tk80
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-RUN_DEPENDS=    wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/xcd
 MAN1=		cdplayer.1 xcd.1
diff --git a/audio/xcd/scripts/configure b/audio/xcd/scripts/configure
index 15f1c6b4e8a8..d2d74e8a2f9c 100644
--- a/audio/xcd/scripts/configure
+++ b/audio/xcd/scripts/configure
@@ -11,5 +11,5 @@ MANDIR = $PREFIX/man/man1
 END
 
 mv xcd.in xcd.in~
-sed -e 's/wish4\.1/wish8.1/' <  xcd.in~ > xcd.in
+sed -e 's/wish4\.1/wish8.0/' <  xcd.in~ > xcd.in
 exit 0;
diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index adbd91668c95..b984ff4dd896 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -8,14 +8,14 @@
 
 DISTNAME=	xmp3_1.0.0
 PKGNAME=	xmpeg3-1.0
-CATEGORIES=	audio tk81
+CATEGORIES=	audio tk80
 MASTER_SITES=	ftp://ftp.rasip.fer.hr/pub/mpeg/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.ORG
 
 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
-		wish8.1:${PORTSDIR}/x11/tk81
+		wish8.0:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/xmpeg3
 NO_BUILD=	yes
diff --git a/audio/xmpeg3/files/patch-aa b/audio/xmpeg3/files/patch-aa
index 9e91120829d8..1b290d64d6c9 100644
--- a/audio/xmpeg3/files/patch-aa
+++ b/audio/xmpeg3/files/patch-aa
@@ -1,7 +1,7 @@
 --- xmpeg3.orig	Tue Mar 25 13:21:26 1997
 +++ xmpeg3	Thu Oct 30 16:00:48 1997
 @@ -1,3 +1,4 @@
-+#!@@PREFIX@@/bin/wish8.1
++#!@@PREFIX@@/bin/wish8.0
  #############################################################################
  # Visual Tcl v1.07 Project
  #
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index d642d154d739..54f5849cefa3 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -8,19 +8,19 @@
 
 DISTNAME=	uudeview-0.5.13
 PKGNAME=	xdeview-0.5.13
-CATEGORIES=	converters tk81
+CATEGORIES=	converters tk80
 MASTER_SITES=	http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \
 		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/
 
 MAINTAINER=	hoek@FreeBSD.ORG
 
-LIB_DEPENDS=    tk81\\.1\\.:${PORTSDIR}/x11/tk81 \
+LIB_DEPENDS=    tk80\\.1\\.:${PORTSDIR}/x11/tk80 \
 		uu\\.1\\.:${PORTSDIR}/converters/uulib
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tcl="${PREFIX}" --enable-tk="${PREFIX}"
 # Season to taste --- anything over tcl7.5
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/tcl8.1 -I${PREFIX}/include/tk8.1"
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0"
 
 ALL_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 6227f0387c62..99ae3a1bf023 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -8,12 +8,12 @@
 
 DISTNAME=	zorro-1.1p8
 PKGNAME=	zorro-1.1.8
-CATEGORIES=	misc tk81
+CATEGORIES=	misc tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	tk81\\.1\\.:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
 
diff --git a/deskutils/zorro/files/patch-aa b/deskutils/zorro/files/patch-aa
index e9a53376fd8b..02f645527961 100644
--- a/deskutils/zorro/files/patch-aa
+++ b/deskutils/zorro/files/patch-aa
@@ -9,7 +9,7 @@
   # ----------------------------------------------------------------------
   #   AUTHOR:  Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
 --- 1,6 ----
-! #!/usr/local/bin/wish8.1
+! #!/usr/local/bin/wish8.0
   #
 ! # Version 1.1 Patch 8
   #
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 452c617a1c51..71e09a60b527 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -8,12 +8,12 @@
 
 DISTNAME=	SpecTcl1.1
 PKGNAME=	SpecTcl-1.1
-CATEGORIES=	devel tk81
+CATEGORIES=	devel tk80
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/SpecTcl/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
 
diff --git a/devel/SpecTcl/files/patch-aa b/devel/SpecTcl/files/patch-aa
index f996fe573650..da3ccd3320fc 100644
--- a/devel/SpecTcl/files/patch-aa
+++ b/devel/SpecTcl/files/patch-aa
@@ -9,7 +9,7 @@
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.1
++WISH=wish8.0
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk $@ &
  echo "Starting SpecTcl 1.1"
diff --git a/devel/SpecTcl/files/patch-ab b/devel/SpecTcl/files/patch-ab
index 06392c097e30..989a413e26ae 100644
--- a/devel/SpecTcl/files/patch-ab
+++ b/devel/SpecTcl/files/patch-ab
@@ -9,7 +9,7 @@
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.1
++WISH=wish8.0
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk -java $@ &
  echo "Starting SpecTcl 1.0"
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index f4204ac1b51f..09db66aa7883 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -7,13 +7,13 @@
 #
 
 DISTNAME=	tkcvs-6.0
-CATEGORIES=	devel tk81
+CATEGORIES=	devel tk80
 MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
 		http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
 
 MAINTAINER=	shanee@augusta.de
 
-LIB_DEPENDS=	tk81\\.1\\.:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
 MAN1=		tkcvs.1 tkdiff.1
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index aa97081e2447..2fbced5d12af 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -22,10 +22,10 @@
  # Find a Tk interpreter.
   
 -WISH=`which wish4.0`
-+WISH=`which wish8.1`
++WISH=`which wish8.0`
  if [ ! -f $WISH ]; then
 -  WISH=`which wish4.1`
-+  WISH=`which wish4.1`
++  WISH=`which wish4.0`
  fi
  if [ ! -f $WISH ]; then
 -  echo "I cant find a Tk interpreter on your system"
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index 58c5b286c324..2341b9886414 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -7,19 +7,19 @@
 #
 
 DISTNAME=	tkref-1.01
-CATEGORIES=	devel x11 tk81
+CATEGORIES=	devel x11 tk80
 MASTER_SITES=	http://gtcs.com/softdist/ \
 		${MASTER_SITE_LOCAL}
 
 MAINTAINER=	bgingery@gtcs.com
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
 do-patch:
-	perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.1|;" \
+	perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.0|;" \
 		${WRKDIR}/TkRef
 
 do-install:
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index ed8b5def2964..1f2305ab7acb 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -8,13 +8,13 @@
 
 DISTNAME=	vt-1.11
 PKGNAME=	vtcl-1.11
-CATEGORIES=	devel x11 tk81
+CATEGORIES=	devel x11 tk80
 MASTER_SITES=	http://www.neuron.com/stewart/vtcl/dload/ \
 		ftp://ftp.neuron.com/pub/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 WRKSRC=		${WRKDIR}/vtcl
 NO_BUILD=	yes
diff --git a/devel/vtcl/files/patch-aa b/devel/vtcl/files/patch-aa
index d95aff2fcfd0..2de7e44da2b3 100644
--- a/devel/vtcl/files/patch-aa
+++ b/devel/vtcl/files/patch-aa
@@ -4,4 +4,4 @@
 *** 1,1 ****
 ! #!/usr/bin/wish -f
 --- 1,1 ----
-! #!/usr/local/bin/wish8.1 -f
+! #!/usr/local/bin/wish8.0 -f
diff --git a/devel/vtcl/files/patch-ab b/devel/vtcl/files/patch-ab
index 36bb1661e66e..e89be3cbe90b 100644
--- a/devel/vtcl/files/patch-ab
+++ b/devel/vtcl/files/patch-ab
@@ -12,7 +12,7 @@
 --- 1,7 ----
   #!/bin/sh
   
-! PATH_TO_WISH=/usr/local/bin/wish8.1
+! PATH_TO_WISH=/usr/local/bin/wish8.0
 ! VTCL_HOME=/usr/local/lib/vtcl
   
   export PATH_TO_WISH
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index e2122363b452..a25e0c102944 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -7,13 +7,13 @@
 #
 
 DISTNAME=       tksol-1.0
-CATEGORIES=	games tk81
+CATEGORIES=	games tk80
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	tg@freebsd.org
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/release
diff --git a/games/tksol/files/patch-a b/games/tksol/files/patch-a
index 9305876571a0..f68768b2b93c 100644
--- a/games/tksol/files/patch-a
+++ b/games/tksol/files/patch-a
@@ -14,7 +14,7 @@
  # Absolute pathname of the wish executable #
  ############################################
 -WISH = /usr/imports/bin/wish
-+WISH = ${PREFIX}/bin/wish8.1
++WISH = ${PREFIX}/bin/wish8.0
  
  ####################################################
  # Directory where the script tksol will be located #
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 4f61ae996d35..9d8a2c07220f 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -7,14 +7,13 @@
 #
 
 DISTNAME=	cqcam-0.45a
-CATEGORIES=	graphics tk81
+CATEGORIES=	graphics tk80
 MASTER_SITES=	http://www.cs.virginia.edu/~patrick/cqcam/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-LIB_DEPENDS=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
-		tk81\\.1:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
 MAN1=		cqcam.1
 
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 870683d5ad9c..f52e9ff29740 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	imm-3.5a1
-CATEGORIES=	mbone tk81
+CATEGORIES=	mbone tk80
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 DISTFILES=	imm.source.tar.Z
 WRKSRC=		${WRKDIR}/mnm
 
 MAINTAINER=	fenner@freebsd.org
 
-LIB_DEPENDS=	tk81\\.1:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 
diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd
index c84e9af025f1..51724b551d01 100644
--- a/mbone/imm/files/Makefile.freebsd
+++ b/mbone/imm/files/Makefile.freebsd
@@ -1,11 +1,11 @@
 # Some versions of make, like SGI's, use the following variable to
 # determine which shell to use for executing commands:
 SHELL = /bin/sh
-INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.1 -I${LOCALBASE}/include/tk8.1
+INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
 # Libraries to use when linking: 
 LIBS = -lm
 
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk81 -ltcl81 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11
 
 TARGET		= ../freebsd
 
diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile
index 80bd5118092e..be3f030c7339 100644
--- a/misc/tkcron/Makefile
+++ b/misc/tkcron/Makefile
@@ -7,13 +7,13 @@
 #
 
 DISTNAME=	tkcron-2.12
-CATEGORIES=	misc tk81
+CATEGORIES=	misc tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
 EXTRACT_SUFX=	.tcl.gz
 
 MAINTAINER=	sander@haldjas.folklore.ee
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS= -cd
diff --git a/misc/tkcron/files/Makefile b/misc/tkcron/files/Makefile
index 5c93e51cc1da..b46a3ce43f0b 100644
--- a/misc/tkcron/files/Makefile
+++ b/misc/tkcron/files/Makefile
@@ -4,7 +4,7 @@ WISHDIR?=	${BINDIR}
 all:		tkcron
 
 tkcron:	
-	sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.1;g" tkcron.tcl > tkcron
+	sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.0;g" tkcron.tcl > tkcron
 
 install:	all
 	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} tkcron ${BINDIR}
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 6ca46893ef56..8b762ae89374 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -7,12 +7,12 @@
 #
 
 DISTNAME=	tkinfo-2.4
-CATEGORIES=	misc tk81
+CATEGORIES=	misc tk80
 MASTER_SITES=	http://math-www.uni-paderborn.de/~axel/tkinfo/
 
 MAINTAINER=	tg@FreeBSD.ORG
 
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 NO_BUILD=	yes
 MAN1=		tkinfo.1
diff --git a/misc/tkinfo/files/patch-aa b/misc/tkinfo/files/patch-aa
index 8b57ac9aa6aa..06b17a94ae6a 100644
--- a/misc/tkinfo/files/patch-aa
+++ b/misc/tkinfo/files/patch-aa
@@ -4,7 +4,7 @@
  #!/bin/sh
  # This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \
 -exec wish "$0" "$@"
-+exec wish8.1 "$0" "$@"
++exec wish8.0 "$0" "$@"
  
  ##########################################################################
  # Version of TkInfo:
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 870683d5ad9c..f52e9ff29740 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	imm-3.5a1
-CATEGORIES=	mbone tk81
+CATEGORIES=	mbone tk80
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 DISTFILES=	imm.source.tar.Z
 WRKSRC=		${WRKDIR}/mnm
 
 MAINTAINER=	fenner@freebsd.org
 
-LIB_DEPENDS=	tk81\\.1:${PORTSDIR}/x11/tk81
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
index c84e9af025f1..51724b551d01 100644
--- a/net/imm/files/Makefile.freebsd
+++ b/net/imm/files/Makefile.freebsd
@@ -1,11 +1,11 @@
 # Some versions of make, like SGI's, use the following variable to
 # determine which shell to use for executing commands:
 SHELL = /bin/sh
-INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.1 -I${LOCALBASE}/include/tk8.1
+INCLUDE_DIR	= -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
 # Libraries to use when linking: 
 LIBS = -lm
 
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk81 -ltcl81 -lX11
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11
 
 TARGET		= ../freebsd