aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2008-04-09 13:42:26 +0000
committerPav Lucistnik <pav@FreeBSD.org>2008-04-09 13:42:26 +0000
commit92b220fa9c42a6c193337144b12ad0856cacbdeb (patch)
tree167e145ff2514271fb5c10b0e9f4b2859ead22b3
parent94169091b9fe1df39f70fc46f1dd7a7ae2aaed61 (diff)
downloadports-92b220fa9c42a6c193337144b12ad0856cacbdeb.tar.gz
ports-92b220fa9c42a6c193337144b12ad0856cacbdeb.zip
Notes
-rw-r--r--archivers/tclmkziplib/Makefile2
-rw-r--r--astro/gpsman/Makefile2
-rw-r--r--astro/ptiger/Makefile2
-rw-r--r--astro/tclgeomap/Makefile2
-rw-r--r--astro/tkgeomap/Makefile2
-rw-r--r--astro/xeartk/Makefile2
-rw-r--r--audio/etktab/Makefile2
-rw-r--r--audio/snack/Makefile2
-rw-r--r--audio/vat/Makefile2
-rw-r--r--audio/xcd/Makefile2
-rw-r--r--chinese/hanzim/Makefile2
-rw-r--r--chinese/tcl83/Makefile2
-rw-r--r--chinese/tk83/Makefile2
-rw-r--r--comms/tkhylafax/Makefile2
-rw-r--r--comms/tkscanfax/Makefile2
-rw-r--r--converters/xdeview/Makefile2
-rw-r--r--databases/metakit/Makefile4
-rw-r--r--databases/mysqltcl/Makefile2
-rw-r--r--databases/pgaccess/Makefile2
-rw-r--r--databases/pgtcl/Makefile2
-rw-r--r--databases/postgresql-pltcl/Makefile2
-rw-r--r--databases/postgresql-tcltk/Makefile4
-rw-r--r--databases/sqlite2/Makefile4
-rw-r--r--databases/sqlite3/Makefile2
-rw-r--r--databases/sqlite34/Makefile2
-rw-r--r--databases/tcl-Mysql/Makefile2
-rw-r--r--deskutils/ical/Makefile2
-rw-r--r--deskutils/zorro/Makefile2
-rw-r--r--devel/SpecTcl/Makefile2
-rw-r--r--devel/cbrowser/Makefile2
-rw-r--r--devel/clig/Makefile2
-rw-r--r--devel/e4graph/Makefile2
-rw-r--r--devel/gcvs/Makefile2
-rw-r--r--devel/hs-tclhaskell-ghc/Makefile2
-rw-r--r--devel/p5-Inline-Tcl/Makefile2
-rw-r--r--devel/swig11/Makefile2
-rw-r--r--devel/tcl-memchan/Makefile2
-rw-r--r--devel/tcl-neo/Makefile2
-rw-r--r--devel/tcl-trf/Makefile2
-rw-r--r--devel/tclcl/Makefile2
-rw-r--r--devel/tclgetopts/Makefile2
-rw-r--r--devel/tcllib/Makefile2
-rw-r--r--devel/tclmore/Makefile2
-rw-r--r--devel/tclreadline/Makefile2
-rw-r--r--devel/tclthread/Makefile2
-rw-r--r--devel/tcltls/Makefile2
-rw-r--r--devel/tkcon/Makefile2
-rw-r--r--devel/tkinspect/Makefile2
-rw-r--r--devel/tkmerge/Makefile2
-rw-r--r--devel/tkp4/Makefile2
-rw-r--r--devel/ztcl/Makefile2
-rw-r--r--editors/e93/Makefile2
-rw-r--r--editors/impress/Makefile2
-rw-r--r--editors/tpad/Makefile2
-rw-r--r--editors/vigor/Makefile2
-rw-r--r--emulators/bsvc/Makefile2
-rw-r--r--emulators/frodo/Makefile2
-rw-r--r--emulators/hfsutils/Makefile2
-rw-r--r--emulators/tkhfs/Makefile2
-rw-r--r--games/awele/Makefile2
-rw-r--r--games/dontspace/Makefile2
-rw-r--r--games/ifm/Makefile2
-rw-r--r--games/klondike/Makefile2
-rw-r--r--games/polypuzzle/Makefile2
-rw-r--r--games/tkmoo/Makefile2
-rw-r--r--games/tksol/Makefile2
-rw-r--r--games/ttraffic/Makefile2
-rw-r--r--games/tvp/Makefile2
-rw-r--r--games/xconq/Makefile2
-rw-r--r--german/ding/Makefile2
-rw-r--r--graphics/gdtclft/Makefile2
-rw-r--r--graphics/gpsmanshp/Makefile2
-rw-r--r--graphics/graphviz/Makefile2
-rw-r--r--graphics/libimg-tk83/Makefile2
-rw-r--r--graphics/libimg/Makefile2
-rw-r--r--graphics/tkpng/Makefile2
-rw-r--r--graphics/togl/Makefile2
-rw-r--r--irc/evangeline/Makefile2
-rw-r--r--irc/quirc/Makefile2
-rw-r--r--irc/tkirc/Makefile2
-rw-r--r--irc/zircon/Makefile2
-rw-r--r--japanese/ewipe/Makefile2
-rw-r--r--japanese/expect/Makefile2
-rw-r--r--japanese/ical/Makefile2
-rw-r--r--japanese/postgresql-tcltk/Makefile2
-rw-r--r--japanese/tcl80/Makefile2
-rw-r--r--japanese/tk80/Makefile2
-rw-r--r--japanese/tkstep80/Makefile2
-rw-r--r--japanese/xshodou/Makefile2
-rw-r--r--lang/expect-devel/Makefile2
-rw-r--r--lang/expect/Makefile2
-rw-r--r--lang/gcl/Makefile2
-rw-r--r--lang/itcl/Makefile2
-rw-r--r--lang/mozart/Makefile2
-rw-r--r--lang/otcl/Makefile2
-rw-r--r--lang/tcl-wrapper/Makefile4
-rw-r--r--lang/tcl80/Makefile2
-rw-r--r--lang/tcl82/Makefile2
-rw-r--r--lang/tcl83/Makefile2
-rw-r--r--lang/tcl84/Makefile2
-rw-r--r--lang/tclX/Makefile2
-rw-r--r--lang/tcltutor/Makefile2
-rw-r--r--lang/xotcl/Makefile2
-rw-r--r--mail/exmh2/Makefile2
-rw-r--r--mail/postilion/Makefile2
-rw-r--r--mail/tkrat2/Makefile2
-rw-r--r--math/mpexpr/Makefile2
-rw-r--r--math/vtk-tcl/Makefile2
-rw-r--r--mbone/imm/Makefile2
-rw-r--r--mbone/nte/Makefile2
-rw-r--r--mbone/rtpmon/Makefile2
-rw-r--r--mbone/sdr/Makefile2
-rw-r--r--mbone/vat/Makefile2
-rw-r--r--mbone/vic/Makefile2
-rw-r--r--misc/dejagnu/Makefile2
-rw-r--r--misc/dotfile/Makefile2
-rw-r--r--misc/ewipe/Makefile2
-rw-r--r--misc/sonytv/Makefile2
-rw-r--r--misc/tkinfo/Makefile2
-rw-r--r--misc/tkman/Makefile2
-rw-r--r--misc/tkregexp/Makefile2
-rw-r--r--multimedia/nxtvepg/Makefile2
-rw-r--r--multimedia/tkxanim/Makefile2
-rw-r--r--multimedia/vic/Makefile2
-rw-r--r--net-im/coccinella/Makefile2
-rw-r--r--net-im/icb/Makefile2
-rw-r--r--net-mgmt/scotty3/Makefile2
-rw-r--r--net/cnet/Makefile2
-rw-r--r--net/imm/Makefile2
-rw-r--r--net/openverse/Makefile2
-rw-r--r--net/sdr/Makefile2
-rw-r--r--net/tcpillust/Makefile2
-rw-r--r--net/ttt/Makefile2
-rw-r--r--news/brag/Makefile2
-rw-r--r--science/elmer-fem/Makefile2
-rw-r--r--science/vmd/Makefile2
-rw-r--r--security/secpanel/Makefile2
-rw-r--r--security/tclsasl/Makefile2
-rw-r--r--sysutils/dirdiff/Makefile2
-rw-r--r--sysutils/modules/Makefile2
-rw-r--r--textproc/cost/Makefile2
-rw-r--r--textproc/redet/Makefile2
-rw-r--r--textproc/tclExpat/Makefile2
-rw-r--r--textproc/tkdiff/Makefile2
-rw-r--r--www/aolserver-xotcl/Makefile2
-rw-r--r--www/mod_dtcl/Makefile2
-rw-r--r--www/neowebscript/Makefile2
-rw-r--r--www/tclhttpd/Makefile2
-rw-r--r--www/tclwebtest/Makefile2
-rw-r--r--www/websh/Makefile2
-rw-r--r--x11-clocks/tktz/Makefile2
-rw-r--r--x11-fm/filerunner/Makefile2
-rw-r--r--x11-fm/tkdesk/Makefile2
-rw-r--r--x11-fm/x-files/Makefile2
-rw-r--r--x11-fonts/tkfont/Makefile2
-rw-r--r--x11-toolkits/blt/Makefile2
-rw-r--r--x11-toolkits/itk/Makefile2
-rw-r--r--x11-toolkits/iwidgets/Makefile2
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile2
-rw-r--r--x11-toolkits/p5-TclTk/Makefile2
-rw-r--r--x11-toolkits/p5-Tk/Makefile2
-rw-r--r--x11-toolkits/py-tktreectrl/Makefile2
-rw-r--r--x11-toolkits/ruby-tk/Makefile2
-rw-r--r--x11-toolkits/tile/Makefile2
-rw-r--r--x11-toolkits/tix/Makefile2
-rw-r--r--x11-toolkits/tk80/Makefile2
-rw-r--r--x11-toolkits/tk82/Makefile2
-rw-r--r--x11-toolkits/tk83/Makefile2
-rw-r--r--x11-toolkits/tk84/Makefile2
-rw-r--r--x11-toolkits/tkdnd/Makefile2
-rw-r--r--x11-toolkits/tkstep80/Makefile2
-rw-r--r--x11-toolkits/tktable/Makefile2
-rw-r--r--x11-toolkits/tktray/Makefile2
-rw-r--r--x11-toolkits/tktreectrl/Makefile2
-rw-r--r--x11/tkgoodstuff/Makefile2
175 files changed, 179 insertions, 179 deletions
diff --git a/archivers/tclmkziplib/Makefile b/archivers/tclmkziplib/Makefile
index 818cb618c0b5..d69af3c04916 100644
--- a/archivers/tclmkziplib/Makefile
+++ b/archivers/tclmkziplib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclmkziplib
PORTVERSION= 1.0
-CATEGORIES= archivers tcl83 tcl84
+CATEGORIES= archivers tcl
MASTER_SITES= http://mkextensions.sourceforge.net/
DISTNAME= mkZiplib${PORTVERSION:S/.//}
diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index d7bbe6268f5a..bede8fcd862a 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpsman
PORTVERSION= 6.3.2
-CATEGORIES= astro tk84 geography
+CATEGORIES= astro tk geography
MASTER_SITES= http://www.ncc.up.pt/gpsman/gpsmanhtml/
MASTER_SITE_SUBDIR= science/cartography
EXTRACT_SUFX= .tgz
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index 613d26dfe472..2e977935e165 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ptiger
PORTVERSION= 2.2
PORTREVISION= 2
-CATEGORIES= astro tk84
+CATEGORIES= astro tk
MASTER_SITES= SF
MASTER_SITE_SUBDIR= tkgeomap
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index a3db6278e3e0..459d970784d4 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclgeomap
PORTVERSION= 2.11.4
-CATEGORIES= astro tcl84
+CATEGORIES= astro tcl
MASTER_SITES= SF/tkgeomap
MAINTAINER= infofarmer@FreeBSD.org
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 34b6a13d0b15..3f13915e5f40 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tkgeomap
PORTVERSION= 2.11.4
-CATEGORIES= astro tk84
+CATEGORIES= astro tk
MASTER_SITES= SF
MAINTAINER= infofarmer@FreeBSD.org
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index be5421d20924..82adac39100a 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xeartk
PORTVERSION= 2.2
PORTREVISION= 2
-CATEGORIES= astro tk84
+CATEGORIES= astro tk
MASTER_SITES= SF
MASTER_SITE_SUBDIR= tkgeomap
diff --git a/audio/etktab/Makefile b/audio/etktab/Makefile
index a10a9bf68826..ab98a2d31c33 100644
--- a/audio/etktab/Makefile
+++ b/audio/etktab/Makefile
@@ -8,7 +8,7 @@
PORTNAME= etktab
PORTVERSION= 3.2
PORTREVISION= 1
-CATEGORIES= audio tcl84 tk84
+CATEGORIES= audio tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= etktab
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} canada_multi-3.2.etk \
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 8739e202022c..781be11ba48a 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -9,7 +9,7 @@
PORTNAME= snack
PORTVERSION= 2.2.10
PORTREVISION= 2
-CATEGORIES= audio tcl84 tk84
+CATEGORIES= audio tcl tk
MASTER_SITES= http://www.speech.kth.se/snack/dist/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index f68945deb3a7..ebffe32725a2 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vat
PORTVERSION= 4.0b2
PORTREVISION= 2
-CATEGORIES= mbone tk83
+CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index ba0156157f87..79c48b7481e0 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xcd
PORTVERSION= 1.7
PORTREVISION= 2
-CATEGORIES= audio tk84
+CATEGORIES= audio tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
diff --git a/chinese/hanzim/Makefile b/chinese/hanzim/Makefile
index 9553bdd6b69c..5e32794be17a 100644
--- a/chinese/hanzim/Makefile
+++ b/chinese/hanzim/Makefile
@@ -9,7 +9,7 @@
PORTNAME= hanzim
PORTVERSION= 1.3
PORTREVISION= 3
-CATEGORIES= chinese tk84
+CATEGORIES= chinese tk
MASTER_SITES= http://kamares.ucsd.edu/~arobert/Files/Chinese/ \
http://www.525183.com/freebsd/hanzim/ \
http://www.chinatinco.com/freebsd/hanzim/ \
diff --git a/chinese/tcl83/Makefile b/chinese/tcl83/Makefile
index a74692bb8d4c..abb6f5c79464 100644
--- a/chinese/tcl83/Makefile
+++ b/chinese/tcl83/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tcl
PORTVERSION= 8.3.0
-CATEGORIES= chinese lang tcl83
+CATEGORIES= chinese lang tcl
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_3
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/chinese/tk83/Makefile b/chinese/tk83/Makefile
index 0b7ac4d70202..5f50ad038702 100644
--- a/chinese/tk83/Makefile
+++ b/chinese/tk83/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.3.0
PORTREVISION= 1
-CATEGORIES= chinese x11-toolkits tk83
+CATEGORIES= chinese x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_3
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 14083962875f..263de78d42ff 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkhylafax
PORTVERSION= 3.2b
PORTREVISION= 2
-CATEGORIES= comms tk84
+CATEGORIES= comms tk
MASTER_SITES= ftp://ftp.hylafax.org/contrib/tkhylafax/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/}
diff --git a/comms/tkscanfax/Makefile b/comms/tkscanfax/Makefile
index dba4cd99fc02..f0836de52930 100644
--- a/comms/tkscanfax/Makefile
+++ b/comms/tkscanfax/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tkscanfax
PORTVERSION= 1.1.4
PORTREVISION= 1
PORTEPOCH= 1
-CATEGORIES= comms tk84
+CATEGORIES= comms tk
MASTER_SITES= http://shino.pos.to/linux/tkscanfax/
MAINTAINER= mita@FreeBSD.org
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 1ac63c6ffc1c..22a381e595d7 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xdeview
PORTVERSION= 0.5.20
PORTREVISION= 1
-CATEGORIES= converters tcl84 tk84
+CATEGORIES= converters tcl tk
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
DISTNAME= uudeview-${PORTVERSION}
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 1831e5fd7954..b70671826430 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -43,13 +43,13 @@ PLIST_SUB+= WITH_PYTHON="@comment "
.endif
.if defined(METAKIT_WITH_TCL83)
-CATEGORIES+= tcl83
+CATEGORIES+= tcl
TCL_V= 8.3
TCL_SHORT_V= 83
.endif
.if defined(METAKIT_WITH_TCL84)
-CATEGORIES+= tcl84
+CATEGORIES+= tcl
TCL_V= 8.4
TCL_SHORT_V= 84
.endif
diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile
index a64c70c86300..233b38bd0982 100644
--- a/databases/mysqltcl/Makefile
+++ b/databases/mysqltcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mysqltcl
PORTVERSION= 3.05
-CATEGORIES= databases tcl82 tcl83 tcl84
+CATEGORIES= databases tcl
MASTER_SITES= http://www.xdobry.de/mysqltcl/
MAINTAINER= bkoenig@alpha-tierchen.de
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 4f151634666f..074465d8d49c 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pgaccess
PORTVERSION= 0.99.0.20040219
PORTREVISION= 1
-CATEGORIES= databases tcl${TCLVERSION:S/.//} tk${TCLVERSION:S/.//}
+CATEGORIES= databases tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pgaccess
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 07d8100aaffd..e41191fa6e57 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pgtcl
PORTVERSION= 1.6.0
-CATEGORIES= databases tcl84
+CATEGORIES= databases tcl
DISTNAME= ${PORTNAME}${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src
MASTER_SITES= http://pgfoundry.org/frs/download.php/1229/:src
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 1584907a1b6d..f5e823f07156 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= postgresql
PORTREVISION= 0
-CATEGORIES= databases tcl${TCLVERSION:S/.//}
+CATEGORIES= databases tcl
PKGNAMESUFFIX= -pltcl
MAINTAINER= girgen@FreeBSD.org
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 24e5cfb99d03..a53daee74b58 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= postgresql
PORTREVISION= 1
-CATEGORIES?= databases tcl${TCLVERSION:C/[^0-9]//g}
+CATEGORIES?= databases tcl
PKGNAMESUFFIX= -tcltk
MAINTAINER= girgen@FreeBSD.org
@@ -56,7 +56,7 @@ LIB_DEPENDS+= tk${TCLVERSION:S/.//}:${TKPORTDIR}${TCLVERSION:C/[^0-9]//g}
TKCONFIG= ${LOCALBASE}/lib/tk${TCLVERSION}
INCDIRS= ${TCL_INCDIR}:${TK_INCDIR}
PLIST_SUB+= TK=""
-CATEGORIES+= tk${TCLVERSION:C/[^0-9]//g}
+CATEGORIES+= tk
.endif
BUILD_DIRS= src/port ${INSTALL_DIRS}
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 8d06128fef6e..86d4bbf6b201 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -52,7 +52,7 @@ WITH_TCL84= yes
.if defined(WITH_TCL84)
BROKEN= please, select only one TCL wrapper
.endif
-CATEGORIES+= tcl83
+CATEGORIES+= tcl
TCL_VERSION= 8.3
WITH_TCL= YES
.endif
@@ -61,7 +61,7 @@ WITH_TCL= YES
.if defined(WITH_TCL83)
BROKEN= please, select only one TCL wrapper
.endif
-CATEGORIES+= tcl84
+CATEGORIES+= tcl
TCL_VERSION= 8.4
WITH_TCL= YES
.endif
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 860ec44d61de..535b4b3eb8f6 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --enable-tempstore=yes
TCL_V?= 8.4
MAKE_ARGS+= TCLSH=tclsh${TCL_V}
MAKE_ENV+= TCL_VER=${TCL_V}
-CATEGORIES+= lang tcl${TCL_V:S/.//}
+CATEGORIES+= lang tcl
LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
PLIST_SUB+= WITH_TCLWRAPPER=""
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index 433a113b694c..8b908665f8e6 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -62,7 +62,7 @@ EXTRA_PATCHES+= ${FILESDIR}/fts2_patch-Makefile.in
.endif
.if defined(WITH_TCLWRAPPER)
-CATEGORIES+= lang tcl${TCL_V:S/.//}
+CATEGORIES+= lang tcl
LIB_DEPENDS+= tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
PLIST_SUB+= WITH_TCLWRAPPER=""
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 28f473a6a51b..1c5293c18ae5 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ${TCL_NODOT}-sql
PORTVERSION= 20000114
PORTREVISION= 5
-CATEGORIES= databases ${TCL_NODOT}
+CATEGORIES= databases tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl-sql
DISTNAME= tcl-sql-${PORTVERSION}
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 33341fe28f16..7d922fd2c92a 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -9,7 +9,7 @@
PORTNAME= ical
PORTVERSION= 2.2
PORTREVISION= 3
-CATEGORIES= deskutils tk84
+CATEGORIES= deskutils tk
MASTER_SITES= ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
MAINTAINER= obrien@FreeBSD.org
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 74184b10c56d..67b99850c1b7 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zorro
PORTVERSION= 1.1.8
PORTREVISION= 2
-CATEGORIES= deskutils tk84
+CATEGORIES= deskutils tk
MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
http://atreides.freenix.no/~anders/ \
ftp://totem.fix.no/pub/mirrors/misc/
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index b91bb960eba8..714f4b9d01f8 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= SpecTcl
PORTVERSION= 1.1
PORTREVISION= 4
-CATEGORIES= devel tk84
+CATEGORIES= devel tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 4e878e3cc41f..25f89881adbd 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cbrowser
PORTVERSION= 0.8
PORTREVISION= 2
-CATEGORIES= devel tk84
+CATEGORIES= devel tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 069317ff2ea1..6daa04b5c684 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clig
PORTVERSION= 1.9.11.1
-CATEGORIES= devel tcl84
+CATEGORIES= devel tcl
MASTER_SITES= http://wsd.iitb.fhg.de/~geg/clighome/ \
http://www.carpetsmoker.net/distfiles/ \
http://www.xs4all.nl/~tournoij/distfiles/
diff --git a/devel/e4graph/Makefile b/devel/e4graph/Makefile
index 48a6f0ad4fc4..f461214a1d9a 100644
--- a/devel/e4graph/Makefile
+++ b/devel/e4graph/Makefile
@@ -9,7 +9,7 @@
PORTNAME= e4graph
PORTVERSION= 1.0a11
PORTREVISION= 3
-CATEGORIES= devel tcl84
+CATEGORIES= devel tcl
MASTER_SITES= SF
EXTRACT_SUFX= .src.tar.gz
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index eecec0ab0e9e..e0f9526edb77 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gcvs
PORTVERSION= 1.0
PORTREVISION= 10
PORTEPOCH= 1
-CATEGORIES= devel tk84
+CATEGORIES= devel tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cvsgui
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile
index 22e4f318303f..ad725e292175 100644
--- a/devel/hs-tclhaskell-ghc/Makefile
+++ b/devel/hs-tclhaskell-ghc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclhaskell
PORTVERSION= 1.2
PORTREVISION= 5
-CATEGORIES= devel haskell tcl83
+CATEGORIES= devel haskell tcl
MASTER_SITES= http://www.dcs.gla.ac.uk/~meurig/TclHaskell/
PKGNAMEPREFIX= hs-
PKGNAMESUFFIX= -${GHCDEP}
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index 8bd77fac8a6a..d9d4b0119929 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Inline-Tcl
PORTVERSION= 0.09
-CATEGORIES= devel perl5 tcl84
+CATEGORIES= devel perl5 tcl
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Inline
PKGNAMEPREFIX= p5-
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 6a0dcf4bf42c..175d011d857c 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -8,7 +8,7 @@
PORTNAME= swig
PORTVERSION= ${VER}p5
PORTREVISION= 9
-CATEGORIES= devel perl5 python tcl84
+CATEGORIES= devel perl5 python tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 00dfe4ecbdf6..3483087e9023 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -7,7 +7,7 @@
PORTNAME= memchan
PORTVERSION= 2.2a4
-CATEGORIES= devel tcl${TCL_VER:S/.//}
+CATEGORIES= devel tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
PKGNAMEPREFIX= tcl-
DISTNAME= Memchan${PORTVERSION}
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index 25b258676f75..9759f83cd0d8 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= neotcl
PORTVERSION= 8.2.2
PORTREVISION= 3
-CATEGORIES= devel tcl83
+CATEGORIES= devel tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nws
DISTNAME= neowebscript-3.3
diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index da639302552e..fbb889841e40 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Trf
PORTVERSION= 2.1p2
PORTREVISION= 4
-CATEGORIES= devel tcl${TCL_VER:S/.//}
+CATEGORIES= devel tcl
MASTER_SITES= http://www.oche.de/~akupries/soft/trf/download/
PKGNAMEPREFIX= tcl-
DISTNAME= trf${PORTVERSION}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 3b1e13cb900c..9378370948a9 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tclcl
PORTVERSION= 1.19
PORTREVISION= 2
DISTVERSIONPREFIX= src-
-CATEGORIES= devel tcl84 tk84
+CATEGORIES= devel tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= otcl-tclcl
diff --git a/devel/tclgetopts/Makefile b/devel/tclgetopts/Makefile
index 03950122d5ff..61b942d9587d 100644
--- a/devel/tclgetopts/Makefile
+++ b/devel/tclgetopts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclGetOpts
PORTVERSION= 1.0
-CATEGORIES= devel tcl80 tcl82 tcl83 tcl84
+CATEGORIES= devel tcl
MASTER_SITES= http://www.waxandwane.com/toolbox/tclGetOpts/
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= ${PORTVERSION}.tar.gz
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index d65bbfe05ef6..fb4e4d20a8bb 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tcllib
PORTVERSION= 1.10
-CATEGORIES= devel tcl83 tcl84
+CATEGORIES= devel tcl
PORTREVISION= 1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcllib
diff --git a/devel/tclmore/Makefile b/devel/tclmore/Makefile
index 526ca3b71d55..a376f111431f 100644
--- a/devel/tclmore/Makefile
+++ b/devel/tclmore/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclmore
PORTVERSION= 0.7b1
-CATEGORIES= devel tcl84
+CATEGORIES= devel tcl
MASTER_SITES= http://download.gna.org/tclmore/0.7/
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 43b4365066bb..557dd87c14af 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tclreadline
PORTVERSION= 2.1.0
PORTREVISION= 2
-CATEGORIES= devel tcl80 tcl82 tcl83 tcl84
+CATEGORIES= devel tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tclreadline
diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile
index defe273b478a..2f81a2848600 100644
--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thread
PORTVERSION= 2.6.5
-CATEGORIES= devel tcl84
+CATEGORIES= devel tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
PKGNAMEPREFIX= tcl
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index f527be0c2653..d48d1b2dbe4e 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tcltls
PORTVERSION= 1.5.0
-CATEGORIES= devel tcl83 tcl84
+CATEGORIES= devel tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=tls
DISTNAME= tls${PORTVERSION}-src
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index 36a46c62e84b..20c6e9ecbca3 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkcon
PORTVERSION= 2.4
PORTREVISION= 1
-CATEGORIES= devel tcl84 tk84
+CATEGORIES= devel tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index 4f77929c2fcf..8effa648de48 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkinspect
PORTVERSION= 5.1.6p10
PORTREVISION= 1
-CATEGORIES= devel tcl84 tk84
+CATEGORIES= devel tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=tkcon
diff --git a/devel/tkmerge/Makefile b/devel/tkmerge/Makefile
index e2c3f6106d70..2e19f9f703f6 100644
--- a/devel/tkmerge/Makefile
+++ b/devel/tkmerge/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkmerge
PORTVERSION= 0.85
PORTREVISION= 1
-CATEGORIES= devel tk84
+CATEGORIES= devel tk
MASTER_SITES= http://immure.com/~bob/ports/tkmerge/
MAINTAINER= bob@immure.com
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index db1874c19757..5621b5df9d16 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkp4
PORTVERSION= 1.12
PORTREVISION= 1
-CATEGORIES= devel tk83 tk84
+CATEGORIES= devel tk
MASTER_SITES= http://www.timshel.ca/tkp4/
MAINTAINER= mi@aldan.algebra.com
diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile
index e0c8bb3e6f67..78307040127f 100644
--- a/devel/ztcl/Makefile
+++ b/devel/ztcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ztcl
DISTVERSION= 1.0b4
-CATEGORIES= devel tcl84
+CATEGORIES= devel tcl
MASTER_SITES= http://download.gna.org/ztcl/1.0/
DISTNAME= ${PORTNAME}_${DISTVERSION}_src
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index 01bfd9514e72..bd4324963d1f 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -8,7 +8,7 @@
PORTNAME= e93
PORTVERSION= 1.3.4
PORTREVISION= 2
-CATEGORIES= editors tcl84 tk84
+CATEGORIES= editors tcl tk
MASTER_SITES= ftp://ftp.e93.org/pub/ \
http://www.crpetsmoker.net/distfiles/ \
http://www.xs4all.nl/~tournoij/distfiles/
diff --git a/editors/impress/Makefile b/editors/impress/Makefile
index 5137bffd1e65..7f20c61207ca 100644
--- a/editors/impress/Makefile
+++ b/editors/impress/Makefile
@@ -8,7 +8,7 @@
PORTNAME= impress
PORTVERSION= 1.1b9
PORTREVISION= 2
-CATEGORIES= editors tk84
+CATEGORIES= editors tk
MASTER_SITES= TUCOWS http://fresh.t-systems-sfr.com/unix/src/privat2/ \
ftp://ftp.plig.net/pub/OpenBSD/distfiles/ \
ftp://ftp.openoffice.pl/bsd/FreeBSD/ports/distfiles/
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index 19411a5fcdbf..c5c451ea7595 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tpad
PORTVERSION= 1.3
PORTREVISION= 1
-CATEGORIES= editors tcl84 tk84
+CATEGORIES= editors tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://monitor.deis.unical.it/ant/tpad/ \
http://queen.rett.polimi.it/~ant/tcl/script/ \
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 454fc019b457..e7fc6c6da57d 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vigor
PORTVERSION= 0.016
PORTREVISION= 3
-CATEGORIES= editors tk84 tcl84
+CATEGORIES= editors tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 55f1109231e6..5e5c3ece686a 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bsvc
PORTVERSION= 2.1
PORTREVISION= 2
-CATEGORIES= emulators tk84
+CATEGORIES= emulators tk
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/emulators
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 27ba63aa1326..41d733847c16 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= frodo
PORTVERSION= 4.1b
PORTREVISION= 7
-CATEGORIES= emulators tk84
+CATEGORIES= emulators tk
MASTER_SITES= http://frodo.cebix.net/downloads/
DISTNAME= FrodoV4_1b.Src
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 6220057566ab..3336a5102bd0 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hfsutils
PORTVERSION= 3.2.6
PORTREVISION= 2
-CATEGORIES= emulators tk84
+CATEGORIES= emulators tk
MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
MAINTAINER= ports@FreeBSD.org
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 8127f9245b01..3d19e06e7f9e 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkhfs
PORTVERSION= 1.27
PORTREVISION= 2
-CATEGORIES= emulators tk84
+CATEGORIES= emulators tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 626c799391eb..cf111f7c4352 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -8,7 +8,7 @@
PORTNAME= awele
PORTVERSION= 1.0
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www-air.inria.fr/ftp/Jean-Paul/ \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
diff --git a/games/dontspace/Makefile b/games/dontspace/Makefile
index 3058dccfcce4..af68698f74ac 100644
--- a/games/dontspace/Makefile
+++ b/games/dontspace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dontspace
PORTVERSION= 1.2
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 5e3f389e670b..0174f262cb53 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ifm
PORTVERSION= 5.2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www.ifarchive.org/%SUBDIR%/
MASTER_SITE_SUBDIR= if-archive/mapping-tools
diff --git a/games/klondike/Makefile b/games/klondike/Makefile
index 4861b37d07e1..bb626dd9b423 100644
--- a/games/klondike/Makefile
+++ b/games/klondike/Makefile
@@ -8,7 +8,7 @@
PORTNAME= klondike
PORTVERSION= 1.9
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JACOBY/
MAINTAINER= faber@isi.edu
diff --git a/games/polypuzzle/Makefile b/games/polypuzzle/Makefile
index 993348dfcb73..868e214f41d5 100644
--- a/games/polypuzzle/Makefile
+++ b/games/polypuzzle/Makefile
@@ -8,7 +8,7 @@
PORTNAME= polypuzzle
PORTVERSION= 1.6
PORTREVISION= 1
-CATEGORIES= games tcl84 tk84
+CATEGORIES= games tcl tk
MASTER_SITES= ftp://ibiblio.org/pub/Linux/games/
EXTRACT_SUFX= .tgz
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 75fe405f1a78..d7b48267fd07 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkmoo
PORTVERSION= 0.3.32
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www.awns.com/tkMOO-light/Source/
DISTNAME= tkMOO-light-${PORTVERSION}
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 197b3a661ed4..49441c2682c7 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tksol
PORTVERSION= 1.8.4
PORTREVISION= 1
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/solitaires
EXTRACT_SUFX= .tgz
diff --git a/games/ttraffic/Makefile b/games/ttraffic/Makefile
index bb17bdc6cedb..a73656558e67 100644
--- a/games/ttraffic/Makefile
+++ b/games/ttraffic/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ttraffic
PORTVERSION= 0.8
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://alpha.luc.ac.be/Research/Algebra/Members/Ttraffic/ \
http://www.tobez.org/download/port-mirrors/games/ttraffic/
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index e7b4b2ca4b10..cfc627744dc9 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tvp
PORTVERSION= 0.9.7.1
PORTREVISION= 2
-CATEGORIES= games tk84
+CATEGORIES= games tk
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 60a403bab9ee..4f034b39fd99 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xconq
PORTVERSION= 7.4.1
PORTREVISION= 5
-CATEGORIES= games tcl84 tk84
+CATEGORIES= games tcl tk
MASTER_SITES= ftp://sources.redhat.com/pub/xconq/ \
ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/
diff --git a/german/ding/Makefile b/german/ding/Makefile
index 4ba709bbd097..f7e8d7ded203 100644
--- a/german/ding/Makefile
+++ b/german/ding/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ding
PORTVERSION= 1.5
PORTREVISION= 2
-CATEGORIES= german tk84
+CATEGORIES= german tk
MASTER_SITES= ftp://ftp.tu-chemnitz.de/pub/Local/urz/ding/
MAINTAINER= beat@chruetertee.ch
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index e6a385c254c4..b5a5b5d7924d 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Gdtclft
PORTVERSION= 2.2.5
PORTREVISION= 7
-CATEGORIES= graphics tcl${TCL_DVER}
+CATEGORIES= graphics tcl
MASTER_SITES= http://www.graphviz.org/pub/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile
index 27ee0fbf6d4e..f1c634c8e356 100644
--- a/graphics/gpsmanshp/Makefile
+++ b/graphics/gpsmanshp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gpsmanshp
PORTVERSION= 1.2
PORTREVISION= 1
-CATEGORIES= graphics tcl${TCLVERSION:S/.//} geography
+CATEGORIES= graphics tcl geography
MASTER_SITES= http://www.ncc.up.pt/gpsmanshp/
DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 4ff3c9158872..1475dccae57b 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -8,7 +8,7 @@
PORTNAME= graphviz
PORTVERSION= 2.18
PORTREVISION= 1
-CATEGORIES= graphics tk84
+CATEGORIES= graphics tk
MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/graphics/libimg-tk83/Makefile b/graphics/libimg-tk83/Makefile
index e11bac11413f..7a5b5382ccab 100644
--- a/graphics/libimg-tk83/Makefile
+++ b/graphics/libimg-tk83/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libimg-tk83
-CATEGORIES= graphics tk83
+CATEGORIES= graphics tk
MAINTAINER= martin@matuska.org
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index 90a133b6c4b5..7d49c6ce82a8 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libimg
PORTVERSION= 1.2.4
PORTREVISION= 4
-CATEGORIES?= graphics tk84
+CATEGORIES?= graphics tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tkimg
DISTNAME= img${PORTVERSION}
diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile
index 049b26e0cab1..9810fd8c5565 100644
--- a/graphics/tkpng/Makefile
+++ b/graphics/tkpng/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkpng
PORTVERSION= 0.7
PORTREVISION= 1
-CATEGORIES= graphics tk84
+CATEGORIES= graphics tk
MASTER_SITES= SF
DISTNAME= ${PORTNAME}${PORTVERSION}-src
EXTRACT_SUFX= .tgz
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index d537d46610bf..1a3caae430d5 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= togl
PORTVERSION= 1.7
-CATEGORIES= graphics tk84
+CATEGORIES= graphics tk
MASTER_SITES= SF
DISTNAME= Togl-${PORTVERSION}
diff --git a/irc/evangeline/Makefile b/irc/evangeline/Makefile
index 2762d5e98f87..6a7e54d6e7b6 100644
--- a/irc/evangeline/Makefile
+++ b/irc/evangeline/Makefile
@@ -7,7 +7,7 @@
PORTNAME= evangeline
PORTVERSION= 1.1.4
-CATEGORIES= irc tcl84
+CATEGORIES= irc tcl
MASTER_SITES= http://www.averse.piasta.pl/_data/evangeline/${PORTVERSION}/
DISTFILES= ${PORTNAME}-${PORTVERSION}-b1.tar.gz
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 625a10a5c9eb..be41ad23949f 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= quirc
PORTVERSION= 0.9.84
PORTREVISION= 2
-CATEGORIES= irc tk84
+CATEGORIES= irc tk
MASTER_SITES= ${MASTER_SITE_LOCAL:S/$/:local/}
MAINTAINER= ports@FreeBSD.org
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index f497070480c7..46b3d2ba8b88 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkirc
PORTVERSION= 2.46
PORTREVISION= 2
-CATEGORIES= irc tk84
+CATEGORIES= irc tk
MASTER_SITES= http://netsplit.de/tkirc2/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index f974c8c8fda7..6c904950aab6 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= zircon
PORTVERSION= 1.18.256
PORTREVISION= 2
-CATEGORIES= irc tk84
+CATEGORIES= irc tk
MASTER_SITES= ftp://catless.ncl.ac.uk/pub/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dinoex
diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index b58f1663c6d4..df0f3fc7c08d 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-CATEGORIES= japanese tk82
+CATEGORIES= japanese tk
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/tk-based presentation tool with Japanese support
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index eb0c4d622c81..fd905c36f769 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -8,7 +8,7 @@
PORTNAME= expect
PORTVERSION= 5.30
PORTREVISION= 1
-CATEGORIES= japanese lang tk80
+CATEGORIES= japanese lang tk
MASTER_SITES= ftp://ftp.nist.gov/mel/div826/subject/expect/old/
MAINTAINER= taguchi@tohoku.iij.ad.jp
diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile
index 72f615338643..0bfb45cd1e24 100644
--- a/japanese/ical/Makefile
+++ b/japanese/ical/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ical
PORTVERSION= 2.2
PORTREVISION= 1
-CATEGORIES= japanese deskutils tk80
+CATEGORIES= japanese deskutils tk
MASTER_SITES= ftp://ftp.sco.com/skunkware/src/shellutil/ \
ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \
ftp://ftp.netsw.org/netsw/X11/Tools/Desktop/ \
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 314c4411cbcd..dcd8ac50b8a2 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= postgresql
PORTREVISION= 1
-CATEGORIES= japanese databases tcl${TCLVERSION:C/[^0-9]//g}
+CATEGORIES= japanese databases tcl
PKGNAMESUFFIX= -tcltk
MAINTAINER= saito@a2z.co.jp
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 7ead22d50e80..63181d929681 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tcl
PORTVERSION= 8.0.5
PORTREVISION= 1
-CATEGORIES= japanese lang tcl80
+CATEGORIES= japanese lang tcl
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR=tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index b89e879b9e7e..a1a34451aae3 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.0.5
PORTREVISION= 4
-CATEGORIES= japanese x11-toolkits tk80
+CATEGORIES= japanese x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 1d68086bc724..50a855d365a7 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkstep
PORTVERSION= 8.0.5
PORTREVISION= 1
-CATEGORIES= japanese tk80
+CATEGORIES= japanese tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= tk${PORTVERSION}
diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile
index 5918a5178ce7..79ecafc705f1 100644
--- a/japanese/xshodou/Makefile
+++ b/japanese/xshodou/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xshodou
PORTVERSION= 1.11
PORTREVISION= 1
-CATEGORIES= japanese tk80
+CATEGORIES= japanese tk
MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
MAINTAINER= ports@FreeBSD.org
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
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 466a05dc49a7..9550b959ce99 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -10,7 +10,7 @@
PORTNAME= exmh
PORTVERSION= 2.7.2
PORTREVISION= 1
-CATEGORIES+= mail tk84
+CATEGORIES+= mail tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index 102375356e99..8a0043b6d1ab 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -8,7 +8,7 @@
PORTNAME= postilion
PORTVERSION= 0.9.3c
PORTREVISION= 3
-CATEGORIES= mail tk83
+CATEGORIES= mail tk
MASTER_SITES= http://www.postilion.org/software/Postilion/
DISTNAME= ${PORTNAME}-current
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 1c8b1672553e..319edcea0684 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkrat
PORTVERSION= 2.1.5
PORTREVISION= 2
-CATEGORIES= mail tk84
+CATEGORIES= mail tk
MASTER_SITES= http://tkrat.org/downloads/stable/ \
ftp://ftp.tkrat.org/pub/tkrat/
diff --git a/math/mpexpr/Makefile b/math/mpexpr/Makefile
index 3ff8cf23fd51..849bd09c02a9 100644
--- a/math/mpexpr/Makefile
+++ b/math/mpexpr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mpexpr
PORTVERSION= 1.1
-CATEGORIES= math tcl84
+CATEGORIES= math tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mpexpr
diff --git a/math/vtk-tcl/Makefile b/math/vtk-tcl/Makefile
index 8bcee258e1d0..8fbd9ee642f0 100644
--- a/math/vtk-tcl/Makefile
+++ b/math/vtk-tcl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-CATEGORIES+= tcl84 tk84
+CATEGORIES+= tcl tk
PKGNAMESUFFIX= -tcl
COMMENT= The Visualization Toolkit Tcl libs
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 6d5e44e69700..1426bff716fb 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= imm
PORTVERSION= 3.5a1
PORTREVISION= 2
-CATEGORIES= mbone tk84
+CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index faec015e4f18..2888e9da6604 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nte
PORTVERSION= 1.5a29
PORTREVISION= 2
-CATEGORIES= mbone tk80
+CATEGORIES= mbone tk
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/
MAINTAINER= fenner@FreeBSD.org
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index ef82ee4140ea..632c47d92346 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rtpmon
PORTVERSION= 1.0a7
PORTREVISION= 4
-CATEGORIES= mbone tk83
+CATEGORIES= mbone tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index c14b6e4eb4d8..f6bcc8ff9474 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sdr
PORTVERSION= 3.0
PORTREVISION= 1
-CATEGORIES= mbone tk84
+CATEGORIES= mbone tk
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
MAINTAINER= fenner@FreeBSD.org
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index f68945deb3a7..ebffe32725a2 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vat
PORTVERSION= 4.0b2
PORTREVISION= 2
-CATEGORIES= mbone tk83
+CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 5779f9ff15fd..b9a5417971ce 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vic
PORTVERSION= 2.8.1.1.6
PORTREVISION= 1
-CATEGORIES= mbone tk84 ipv6
+CATEGORIES= mbone tk ipv6
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/
DISTNAME= ${PORTNAME}-2.8ucl1.1.6
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 44f369d938cd..ac0a4809f020 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dejagnu
PORTVERSION= 1.4.4
PORTREVISION= 1
-CATEGORIES= misc tcl84 tk84
+CATEGORIES= misc tcl tk
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 81f01386d8fd..e7a8d259d802 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dotfile
PORTVERSION= 2.4.1
PORTREVISION= 2
-CATEGORIES= misc tk82
+CATEGORIES= misc tk
MASTER_SITES= http://www.blackie.dk/dotfile/download/
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index 172d152bb795..7c7bb6425f56 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ewipe
PORTVERSION= 1.2.0
PORTREVISION= 2
-CATEGORIES?= misc tk84
+CATEGORIES?= misc tk
MASTER_SITES= http://www.jnet-jp.to/~sekisita/ewipe/ \
http://www.carpetsmoker.net/distfiles/ \
http://www.xs4all.nl/~tournoij/distfiles/
diff --git a/misc/sonytv/Makefile b/misc/sonytv/Makefile
index 4b983cbc4c68..0a6a98e20794 100644
--- a/misc/sonytv/Makefile
+++ b/misc/sonytv/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sonytv
PORTVERSION= 1.0
PORTREVISION= 1
-CATEGORIES= misc tk83
+CATEGORIES= misc tk
MASTER_SITES= http://tools.ana.com/demos/
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 04bf4201fa16..0601524a6391 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkinfo
PORTVERSION= 2.8
PORTREVISION= 1
-CATEGORIES= misc tk84
+CATEGORIES= misc tk
MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 82231b75f065..85b5a318b589 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkman
PORTVERSION= 2.2
PORTREVISION= 2
-CATEGORIES= misc tk84
+CATEGORIES= misc tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/misc/tkregexp/Makefile b/misc/tkregexp/Makefile
index 0ebf335e8910..9eea6c948fcb 100644
--- a/misc/tkregexp/Makefile
+++ b/misc/tkregexp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkregexp
PORTVERSION= 3.0
PORTREVISION= 2
-CATEGORIES= misc tk84
+CATEGORIES= misc tk
MASTER_SITES= http://laurent.riesterer.free.fr/regexp/
DISTNAME= visual_regexp-${PORTVERSION}
diff --git a/multimedia/nxtvepg/Makefile b/multimedia/nxtvepg/Makefile
index d695e856082e..aa1db6113739 100644
--- a/multimedia/nxtvepg/Makefile
+++ b/multimedia/nxtvepg/Makefile
@@ -8,7 +8,7 @@
PORTNAME= nxtvepg
PORTVERSION= 2.7.6
PORTREVISION= 2
-CATEGORIES= multimedia tcl84 tk84
+CATEGORIES= multimedia tcl tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index 00d67238ce23..36dcece20a9a 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkxanim
PORTVERSION= 0.43
PORTREVISION= 2
-CATEGORIES= multimedia tk84
+CATEGORIES= multimedia tk
MASTER_SITES= http://freshmeat.net/redir/tkxanim/10652/url_tgz/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 5779f9ff15fd..b9a5417971ce 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vic
PORTVERSION= 2.8.1.1.6
PORTREVISION= 1
-CATEGORIES= mbone tk84 ipv6
+CATEGORIES= mbone tk ipv6
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/
DISTNAME= ${PORTNAME}-2.8ucl1.1.6
diff --git a/net-im/coccinella/Makefile b/net-im/coccinella/Makefile
index d6e3ef1f5c60..709b67de72c1 100644
--- a/net-im/coccinella/Makefile
+++ b/net-im/coccinella/Makefile
@@ -8,7 +8,7 @@
PORTNAME= coccinella
PORTVERSION= 0.95.1
PORTREVISION= 1
-CATEGORIES= net-im tk84
+CATEGORIES= net-im tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= Coccinella-${PORTVERSION}Src
diff --git a/net-im/icb/Makefile b/net-im/icb/Makefile
index 7d6501d40d10..f6b075ed573e 100644
--- a/net-im/icb/Makefile
+++ b/net-im/icb/Makefile
@@ -9,7 +9,7 @@
PORTNAME= icb
PORTVERSION= 5.1.0
PORTREVISION= 3
-CATEGORIES= net-im tcl84
+CATEGORIES= net-im tcl
MASTER_SITES= http://www.obfuscation.org/icb/
DISTNAME= c${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index d748a5e7162c..6d949160fd69 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= scotty
PORTVERSION= 20000221
PORTREVISION= 4
-CATEGORIES= net-mgmt tcl84 tk84
+CATEGORIES= net-mgmt tcl tk
MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/devel/
DISTNAME= ${PORTNAME}-00-02-21
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index 631c7db39424..ef7032e5fc2a 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -10,7 +10,7 @@
PORTNAME= cnet
PORTVERSION= 2.0.10
PORTREVISION= 2
-CATEGORIES= net tcl84 tk84
+CATEGORIES= net tcl tk
MASTER_SITES= http://www.csse.uwa.edu.au/cnet/ \
ftp://ftp.giga.net.tw/OS/FreeBSD/distfiles/ \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 6d5e44e69700..1426bff716fb 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -8,7 +8,7 @@
PORTNAME= imm
PORTVERSION= 3.5a1
PORTREVISION= 2
-CATEGORIES= mbone tk84
+CATEGORIES= mbone tk
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
diff --git a/net/openverse/Makefile b/net/openverse/Makefile
index 2ab0619728e4..4556322ab400 100644
--- a/net/openverse/Makefile
+++ b/net/openverse/Makefile
@@ -7,7 +7,7 @@
PORTNAME= OpenVerse
PORTVERSION= 0.8.7
PORTREVISION= 2
-CATEGORIES= net tcl84 tk84
+CATEGORIES= net tcl tk
MASTER_SITES= http://www.openverse.com/files/OpenVerse/
DISTNAME= ${PORTNAME}-0.8-7
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index c14b6e4eb4d8..f6bcc8ff9474 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sdr
PORTVERSION= 3.0
PORTREVISION= 1
-CATEGORIES= mbone tk84
+CATEGORIES= mbone tk
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
MAINTAINER= fenner@FreeBSD.org
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index 766c3766ebd5..210dfd4a7790 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tcpillust
PORTVERSION= 1.0a
PORTREVISION= 2
-CATEGORIES= net tk84 tcl84
+CATEGORIES= net tcl tk
MASTER_SITES= ftp://ftp.csl.sony.co.jp/CSL/nishida/
MAINTAINER= nishida@csl.sony.co.jp
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 27a96fdbef85..d1b57c03327f 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ttt
PORTVERSION= 1.8.2
PORTREVISION= 1
-CATEGORIES= net tk84 ipv6
+CATEGORIES= net tk ipv6
MASTER_SITES= ftp://ftp.csl.sony.co.jp/pub/kjc/
MAINTAINER= ports@FreeBSD.org
diff --git a/news/brag/Makefile b/news/brag/Makefile
index cdfb36490443..79f4a05d968d 100644
--- a/news/brag/Makefile
+++ b/news/brag/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brag
PORTVERSION= 1.4.1
-CATEGORIES= news tcl84
+CATEGORIES= news tcl
MASTER_SITES= http://brag.sourceforge.net/ \
CRITICAL
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index 7b5a37205d85..44b2c5333bb5 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fem
PORTVERSION= 5.4.0
PORTREVISION= 1
-CATEGORIES= science tk84
+CATEGORIES= science tk
MASTER_SITES= SF/elmerfem
PKGNAMEPREFIX= elmer-
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index 7501d47c24ad..2ebc6e378aab 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= vmd
PORTVERSION= 1.8.3
PORTREVISION= 1
-CATEGORIES= science graphics python tcl84 tk84
+CATEGORIES= science graphics python tcl tk
MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/:tachyon \
ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/:stride
DISTFILES= ${VMD_DIST} \
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 2cff3fce5cba..6a9d34277472 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= secpanel
PORTVERSION= 0.5.3
PORTEPOCH= 1
-CATEGORIES= security tcl84 tk84
+CATEGORIES= security tcl tk
MASTER_SITES= http://themediahost.de/secpanel/data/ CENKES
EXTRACT_SUFX= .tgz
diff --git a/security/tclsasl/Makefile b/security/tclsasl/Makefile
index 0695025d5bf3..9f1e2e8a92b3 100644
--- a/security/tclsasl/Makefile
+++ b/security/tclsasl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tclsasl
PORTVERSION= 1.0
-CATEGORIES= security tcl84
+CATEGORIES= security tcl
MASTER_SITES= http://beepcore-tcl.sourceforge.net/
EXTRACT_SUFX= .tgz
diff --git a/sysutils/dirdiff/Makefile b/sysutils/dirdiff/Makefile
index ae4af9c7fea1..e55a3e99e4d5 100644
--- a/sysutils/dirdiff/Makefile
+++ b/sysutils/dirdiff/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dirdiff
PORTVERSION= 2.1
PORTREVISION= 3
-CATEGORIES= sysutils tcl84 tk84
+CATEGORIES= sysutils tcl tk
MASTER_SITES= ftp://ftp.samba.org/pub/paulus/
MAINTAINER= grog@FreeBSD.Org
diff --git a/sysutils/modules/Makefile b/sysutils/modules/Makefile
index ae50d5c84f84..fbd35396f8e2 100644
--- a/sysutils/modules/Makefile
+++ b/sysutils/modules/Makefile
@@ -7,7 +7,7 @@
PORTNAME= modules
PORTVERSION= 3.1.6
-CATEGORIES= sysutils tcl84
+CATEGORIES= sysutils tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/textproc/cost/Makefile b/textproc/cost/Makefile
index 1de68bdf318e..e483a5efc9d3 100644
--- a/textproc/cost/Makefile
+++ b/textproc/cost/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cost
PORTVERSION= 2.2p1
PORTREVISION= 1
-CATEGORIES= textproc tcl84
+CATEGORIES= textproc tcl
MASTER_SITES= http://www.flightlab.com/~joe/cost/
MAINTAINER= carpetsmoker@xs4all.nl
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index da85b80cb12e..6c8794588856 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= redet
PORTVERSION= 8.24
-CATEGORIES= textproc tk84
+CATEGORIES= textproc tk
MASTER_SITES= http://www.billposer.org/Software/Downloads/ CENKES
MAINTAINER= infofarmer@FreeBSD.org
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 6eb9c2ba2635..f79c0894a9ac 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -8,7 +8,7 @@
PORTNAME= TclExpat
PORTVERSION= 1.1
PORTREVISION= 5
-CATEGORIES= textproc tcl84
+CATEGORIES= textproc tcl
MASTER_SITES= http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
MAINTAINER= mi@aldan.algebra.com
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index 98edd7f90d89..18cfe0e51dfc 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tkdiff
PORTVERSION= 4.1.4
-CATEGORIES= textproc tk84
+CATEGORIES= textproc tk
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-unix
diff --git a/www/aolserver-xotcl/Makefile b/www/aolserver-xotcl/Makefile
index ec9c84ad6be9..9b9bd0ad8ebe 100644
--- a/www/aolserver-xotcl/Makefile
+++ b/www/aolserver-xotcl/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-CATEGORIES= www tcl84
+CATEGORIES= www tcl
PKGNAMEPREFIX= aolserver-
AOLSERVER_XOTCL= yes
diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index 1cb3ca57c30f..dbcadbda7571 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mod_dtcl
PORTVERSION= 0.12.0
PORTREVISION= 1
-CATEGORIES= www tcl84
+CATEGORIES= www tcl
MASTER_SITES= http://tcl.apache.org/mod_dtcl/download/
MAINTAINER= mi@aldan.algebra.com
diff --git a/www/neowebscript/Makefile b/www/neowebscript/Makefile
index a52458ee9b24..0ee09ab10ea8 100644
--- a/www/neowebscript/Makefile
+++ b/www/neowebscript/Makefile
@@ -8,7 +8,7 @@
PORTNAME= neowebscript
PORTVERSION= 3.3
PORTREVISION= 2
-CATEGORIES= www tcl83
+CATEGORIES= www tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nws
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index dd327de0b887..29de72e25c08 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tclhttpd
PORTVERSION= 3.5.1
PORTREVISION= 2
-CATEGORIES= www tcl83 tcl84
+CATEGORIES= www tcl
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= httpd
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index bc02e816cf3e..5842a2c42713 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tclwebtest
PORTVERSION= 1.0
PORTREVISION= 3
-CATEGORIES= www tcl84
+CATEGORIES= www tcl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 484bef8f5d71..81b5b590aee9 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -8,7 +8,7 @@
PORTNAME= websh
PORTVERSION= 3.6.0b4
PORTREVISION= 1
-CATEGORIES= www tcl84
+CATEGORIES= www tcl
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source
EXTRACT_SUFX= -src.tar.gz
diff --git a/x11-clocks/tktz/Makefile b/x11-clocks/tktz/Makefile
index 8120bbff0e25..35348f037d23 100644
--- a/x11-clocks/tktz/Makefile
+++ b/x11-clocks/tktz/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tktz
PORTVERSION= 0.2
PORTREVISION= 1
-CATEGORIES= x11-clocks tk84
+CATEGORIES= x11-clocks tk
MASTER_SITES= http://gromnizki.unixdev.net/soft/
MAINTAINER= gromnizki@unixdev.net
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 2ce5dc73de14..b3315092f465 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -8,7 +8,7 @@
PORTNAME= filerunner
PORTVERSION= 2.5.1
PORTREVISION= 2
-CATEGORIES= x11-fm tk84
+CATEGORIES= x11-fm tk
MASTER_SITES= ${MASTER_SITE_NETBSD} \
http://www.cd.chalmers.se/~hch/
DISTNAME= FileRunner-${PORTVERSION}
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 8fd7ccb62613..6b75c8e46298 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkdesk
PORTVERSION= 2.0.2
PORTREVISION= 1
-CATEGORIES= x11-fm tk84
+CATEGORIES= x11-fm tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index db1712e7b631..53150cf1c42f 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -8,7 +8,7 @@
PORTNAME= x-files
PORTVERSION= 2.00b1
PORTREVISION= 2
-CATEGORIES= x11-fm tk83
+CATEGORIES= x11-fm tk
MASTER_SITES= http://users.tkk.fi/~mkivinie/X-Files/data/
DISTNAME= X-Files-${PORTVERSION}
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index fdaa8d7e1943..e9ae40a13c19 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkfont
PORTVERSION= 1.1
PORTREVISION= 3
-CATEGORIES= x11-fonts tcl84 tk84
+CATEGORIES= x11-fonts tcl tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= petef
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index e140bb080f83..e45f27ae708e 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -8,7 +8,7 @@
PORTNAME= blt
PORTVERSION= 2.4z
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index b476e188c5ad..a548caf4da10 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= itk
PORTVERSION= 3.3
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=incrtcl
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index ef55de30aadb..53e9a42ae33c 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= iwidgets
PORTVERSION= 4.0.1
PORTREVISION= 1
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=incrtcl
DISTNAME= iwidgets${PORTVERSION}
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index b0ac3518c3db..9de2fdcc7a5f 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Tcl-Tk
PORTVERSION= 0.97
-CATEGORIES= x11-toolkits lang perl5 tk82
+CATEGORIES= x11-toolkits lang perl5 tk
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 78915e38e7cd..4b897f62f4fa 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= TclTk
PORTVERSION= 0.75
PORTREVISION= 1
-CATEGORIES= x11-toolkits lang perl5 tk82
+CATEGORIES= x11-toolkits lang perl5 tk
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 5d7faa4d8af1..b5aabb99eb69 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= Tk
PORTVERSION= 804.027
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk84 perl5
+CATEGORIES= x11-toolkits tk perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tk
PKGNAMEPREFIX= p5-
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 5e9cbf9e6d67..63a2e753ccf2 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tktreectrl
PORTVERSION= 0.7
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= http://klappnase.bubble.org/TkinterTreectrl/ CENKES
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TkinterTreectrl-${DISTVERSION}
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 2d8c777b9e49..ae596dd93438 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
PORTREVISION= 1
PORTREVISION= ${RUBY_PORTREVISION}
PORTEPOCH= 1
-CATEGORIES+= x11-toolkits ruby tk${TK_VERSION:C/[^0-9]//g} tcl${TK_VERSION:C/[^0-9]//g}
+CATEGORIES+= x11-toolkits ruby tcl tk
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index f0ff2fd7227c..18dbfa4a5a2c 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tile
PORTVERSION= 0.7.8
PORTREVISION= 1
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= SF/tktable
MAINTAINER= infofarmer@FreeBSD.org
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 39a32badfab3..41cbe7f48053 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tix
PORTVERSION= 8.1.4
PORTREVISION= 4
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tix
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 99b0f58564ff..dec3bd4a45ef 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.0.5
PORTREVISION= 6
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 3d66dc7c4aa1..27075e022909 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.2.3
PORTREVISION= 10
-CATEGORIES= x11-toolkits tk82
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_2
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 8c5b22d202da..5028ac8e8dda 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.3.5
PORTREVISION= 9
-CATEGORIES= x11-toolkits tk83
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}-src
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index eb8e1c2d50b2..d019c780b2bf 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tk
PORTVERSION= 8.4.18
PORTEPOCH= 2
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index de1215f8ea51..db09c415c75b 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tkdnd
PORTVERSION= 1.0
DISTVERSION= 1.0.20040304
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= CENKES
# Distfile prepared from SourceForge CVS
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 4e3892687f0a..72d1eda723bc 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkstep
PORTVERSION= 8.0.4
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk80
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= tk${PORTVERSION}
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index e4bf808d2882..94a7d599363d 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tktable
PORTVERSION= 2.9
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME:S/tk/Tk/}${PORTVERSION}
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index d135b7da68b4..15c2aaad9b61 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tktray
PORTVERSION= 1.1
PORTREVISION= 2
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= http://www.sw4me.com/ CENKES
DISTNAME= ${TKPKG}
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index ad7238d97361..02fea821a3fe 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tktreectrl
PORTVERSION= 2.2.3
PORTREVISION= 1
-CATEGORIES= x11-toolkits tk84
+CATEGORIES= x11-toolkits tk
MASTER_SITES= SF
MAINTAINER= infofarmer@FreeBSD.org
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index 3376bc1d820d..45d6965c3528 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tkgoodstuff
PORTVERSION= 8.0
PORTREVISION= 2
-CATEGORIES= x11 tk80
+CATEGORIES= x11 tk
#
# No longer published by original developer. This port still works, although
# there are other (better) applications that do similar things. For now,