- Move from versioned tcl/tk CATEGORIES to simple tcl and tk categories

With hat:	portmgr

10 files changed, 13 insertions, 13 deletions

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}