14 files changed, 15 insertions, 15 deletions

diff --git a/lang/expect-devel/Makefile b/lang/expect-devel/Makefile
index 87e2b728facd..f053b4dccaa7 100644
--- a/lang/expect-devel/Makefile
+++ b/lang/expect-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	expect
 PORTVERSION=	5.44.1.4
-CATEGORIES=	lang tcl84 tk84
+CATEGORIES=	lang tcl tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wintcltk
 DISTNAME=	expect-cvs-20071014
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 3a486cff751c..a0d73ba6e4b1 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -7,7 +7,7 @@
 PORTNAME=	expect
 PORTVERSION=	5.43.0
 PORTREVISION=	3
-CATEGORIES=	lang tcl84 tk84
+CATEGORIES=	lang tcl tk
 MASTER_SITES=	http://expect.nist.gov/src/
 
 MAINTAINER=	shaun@FreeBSD.org
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index a7eaf6934566..2ed7e05bc8d0 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gcl
 PORTVERSION=	2.6.7
 PORTREVISION=	3
-CATEGORIES=	lang tcl84 tk84
+CATEGORIES=	lang tcl tk
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcl
 
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 06cbff3240b0..75d5a14e1b9c 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	itcl
 PORTVERSION=	3.3
 PORTREVISION=	2
-CATEGORIES=	lang tcl84
+CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl${PORTVERSION}
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index 827f932d3bfc..647cbb4c7857 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mozart
 PORTVERSION=	1.3.1.20040616
 PORTREVISION=	3
-CATEGORIES=	lang tk84 parallel
+CATEGORIES=	lang tk parallel
 MASTER_SITES=	http://www.mozart-oz.org/download/mozart-ftp/store/1.3.1-2004-06-16/
 DISTFILES=	${DISTNAME}-src.tar.gz
 .if !defined(NOPORTDOCS)
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 3aa045909594..ad7eb9e51314 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	otcl
 PORTVERSION=	1.13
 PORTREVISION=	3
 DISTVERSIONPREFIX=	src-
-CATEGORIES=	lang tcl84 tk84
+CATEGORIES=	lang tcl tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	otcl-tclcl
 
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile
index 4d6f2786d236..a038934fcc0d 100644
--- a/lang/tcl-wrapper/Makefile
+++ b/lang/tcl-wrapper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wrapper
 PORTVERSION=	1.1
-CATEGORIES=	lang tcl84
+CATEGORIES=	lang tcl
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	${TX_PORT}-
 DISTFILES=	# none
@@ -34,7 +34,7 @@ TX_PORT=	tk
 TX_PORT_U=	Tk
 TX_CAT=		x11-toolkits
 USE_TK_RUN=	yes
-CATEGORIES=	x11-toolkits tk84
+CATEGORIES=	x11-toolkits tk
 .else
 USE_TCL_RUN=	yes
 .endif
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index bc444c8c7852..59a5d2224424 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tcl
 PORTVERSION=	8.0.5
 PORTREVISION=	3
-CATEGORIES=	lang tcl80
+CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=tcl8_0
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 2baeb1f25cf6..144d032ff4f4 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tcl
 PORTVERSION=	8.2.3
 PORTREVISION=	9
-CATEGORIES=	lang tcl82
+CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 49047408e7e3..5ed5a2d5bf8c 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tcl
 PORTVERSION=	8.3.5
 PORTREVISION=	8
-CATEGORIES=	lang tcl83
+CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 0638806eb0bc..6fd761ced076 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tcl
 PORTVERSION=	8.4.18
 PORTEPOCH=	1
-CATEGORIES=	lang tcl84
+CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 3b41fcfd51f1..0b6ccefbcd3e 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tclX
 PORTVERSION=	8.4
 PORTREVISION=	1
-CATEGORIES=	lang tcl${USE_TCL} devel
+CATEGORIES=	lang tcl devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tclx
 DISTNAME=	tclx${PORTVERSION}
diff --git a/lang/tcltutor/Makefile b/lang/tcltutor/Makefile
index 6c96840488ab..cd55853e9f6e 100644
--- a/lang/tcltutor/Makefile
+++ b/lang/tcltutor/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	tcltutor
 PORTVERSION=	2.b.4
 PORTREVISION=	5
-CATEGORIES=	lang tk84 tcl84
+CATEGORIES=	lang tcl tk
 MASTER_SITES=	http://www.msen.com/~clif/
 DISTNAME=	Tutor2b4
 
diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile
index ed3107d9c302..eb6f037d32e9 100644
--- a/lang/xotcl/Makefile
+++ b/lang/xotcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xotcl
 PORTVERSION=	1.6.0
-CATEGORIES?=	lang tcl84
+CATEGORIES?=	lang tcl
 MASTER_SITES=	SF
 
 MAINTAINER=	mm@FreeBSD.org