diff -ruN ports/chinese/bitchx/Makefile ports-patch/chinese/bitchx/Makefile
--- ports/chinese/bitchx/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/chinese/bitchx/Makefile	Fri Mar  7 09:09:37 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	BitchX
 PORTREVISION=	3
-CATEGORIES=	chinese irc
+CATEGORIES=	chinese
 
 MAINTAINER=	clive@FreeBSD.org
 COMMENT=	A zh-tw cursor movement friendly, wrapping clean BitchX
diff -ruN ports/chinese/eterm/Makefile ports-patch/chinese/eterm/Makefile
--- ports/chinese/eterm/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/chinese/eterm/Makefile	Fri Mar  7 09:06:49 2003
@@ -3,7 +3,7 @@
 # Whom:                Michael C. Wu
 # $FreeBSD: ports/chinese/eterm/Makefile,v 1.8 2003/02/26 14:23:40 foxfair Exp $
 
-CATEGORIES=	chinese x11
+CATEGORIES=	chinese
 
 MASTERDIR=      ${.CURDIR}/../../x11/eterm
 
diff -ruN ports/chinese/xemacs21/Makefile ports-patch/chinese/xemacs21/Makefile
--- ports/chinese/xemacs21/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/chinese/xemacs21/Makefile	Fri Mar  7 09:15:33 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/chinese/xemacs21/Makefile,v 1.8 2003/02/26 14:23:43 foxfair Exp $
 #
 
-CATEGORIES=	chinese editors
+CATEGORIES=	chinese
 
 MAINTAINER=	keith@FreeBSD.org
 COMMENT=	XEmacs text editor version 21, with XIM support and Big5 settings
diff -ruN ports/chinese/xmms/Makefile ports-patch/chinese/xmms/Makefile
--- ports/chinese/xmms/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/chinese/xmms/Makefile	Fri Mar  7 09:16:54 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/chinese/xmms/Makefile,v 1.7 2002/11/28 16:37:31 lioux Exp $
 #
 
-CATEGORIES=	chinese multimedia
+CATEGORIES=	chinese
 
 MASTERDIR=	${.CURDIR}/../../multimedia/xmms
 
diff -ruN ports/editors/ooodict-bg_BG/Makefile ports-patch/editors/ooodict-bg_BG/Makefile
--- ports/editors/ooodict-bg_BG/Makefile	Fri Mar  7 08:46:06 2003
+++ ports-patch/editors/ooodict-bg_BG/Makefile	Fri Mar  7 09:08:47 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-bg_BG/Makefile,v 1.1 2002/08/11 19:10:38 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	bg
 LANGSUFFIX=	BG
 LANGDIST+=	bg_BG.zip
diff -ruN ports/editors/ooodict-ca_ES/Makefile ports-patch/editors/ooodict-ca_ES/Makefile
--- ports/editors/ooodict-ca_ES/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-ca_ES/Makefile	Fri Mar  7 09:10:48 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-ca_ES/Makefile,v 1.1 2002/08/11 19:10:38 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	ca
 LANGSUFFIX=	ES
 LANGDIST+=	ca_ES.zip
diff -ruN ports/editors/ooodict-cs_CZ/Makefile ports-patch/editors/ooodict-cs_CZ/Makefile
--- ports/editors/ooodict-cs_CZ/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-cs_CZ/Makefile	Fri Mar  7 09:04:56 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-cs_CZ/Makefile,v 1.1 2002/08/11 19:10:38 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	cs 
 LANGSUFFIX=	CZ
 LANGDIST+=	cs_CZ.zip
diff -ruN ports/editors/ooodict-da_DK/Makefile ports-patch/editors/ooodict-da_DK/Makefile
--- ports/editors/ooodict-da_DK/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-da_DK/Makefile	Fri Mar  7 09:05:36 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-da_DK/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	da
 LANGSUFFIX=	DK
 LANGDIST+=	da_DK.zip
diff -ruN ports/editors/ooodict-el_GR/Makefile ports-patch/editors/ooodict-el_GR/Makefile
--- ports/editors/ooodict-el_GR/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-el_GR/Makefile	Fri Mar  7 09:08:42 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-el_GR/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	el
 LANGSUFFIX=	GR
 LANGDIST+=	el_GR-enhanced.zip
diff -ruN ports/editors/ooodict-en_CA/Makefile ports-patch/editors/ooodict-en_CA/Makefile
--- ports/editors/ooodict-en_CA/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-en_CA/Makefile	Fri Mar  7 09:10:38 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-en_CA/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	en
 LANGSUFFIX=	CA
 LANGDIST+=	en_CA.zip
diff -ruN ports/editors/ooodict-en_GB/Makefile ports-patch/editors/ooodict-en_GB/Makefile
--- ports/editors/ooodict-en_GB/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-en_GB/Makefile	Fri Mar  7 09:08:38 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-en_GB/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	en
 LANGSUFFIX=	GB
 LANGDIST+=	en_GB.zip
diff -ruN ports/editors/ooodict-en_US/Makefile ports-patch/editors/ooodict-en_US/Makefile
--- ports/editors/ooodict-en_US/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-en_US/Makefile	Fri Mar  7 09:10:35 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-en_US/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	en
 LANGSUFFIX=	US
 LANGDIST+=	en_US.zip
diff -ruN ports/editors/ooodict-es_ES/Makefile ports-patch/editors/ooodict-es_ES/Makefile
--- ports/editors/ooodict-es_ES/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-es_ES/Makefile	Fri Mar  7 09:08:35 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-es_ES/Makefile,v 1.1 2002/08/11 19:10:39 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	es
 LANGSUFFIX=	ES
 LANGDIST+=	es_ES.zip
diff -ruN ports/editors/ooodict-hr_HR/Makefile ports-patch/editors/ooodict-hr_HR/Makefile
--- ports/editors/ooodict-hr_HR/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-hr_HR/Makefile	Fri Mar  7 09:10:32 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-hr_HR/Makefile,v 1.1 2002/08/11 19:10:40 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	hr
 LANGSUFFIX=	HR
 LANGDIST+=	hr_HR.zip
diff -ruN ports/editors/ooodict-hu_HU/Makefile ports-patch/editors/ooodict-hu_HU/Makefile
--- ports/editors/ooodict-hu_HU/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-hu_HU/Makefile	Fri Mar  7 09:08:30 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-hu_HU/Makefile,v 1.1 2002/08/11 19:10:40 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	hu
 LANGSUFFIX=	HU
 LANGDIST+=	hu_HU.zip
diff -ruN ports/editors/ooodict-it_IT/Makefile ports-patch/editors/ooodict-it_IT/Makefile
--- ports/editors/ooodict-it_IT/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-it_IT/Makefile	Fri Mar  7 09:10:24 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-it_IT/Makefile,v 1.1 2002/08/11 19:10:40 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	it
 LANGSUFFIX=	IT
 LANGDIST+=	it_IT.zip
diff -ruN ports/editors/ooodict-nl_NL/Makefile ports-patch/editors/ooodict-nl_NL/Makefile
--- ports/editors/ooodict-nl_NL/Makefile	Fri Mar  7 08:47:33 2003
+++ ports-patch/editors/ooodict-nl_NL/Makefile	Fri Mar  7 09:08:25 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-nl_NL/Makefile,v 1.1 2002/08/11 19:10:40 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	nl
 LANGSUFFIX=	NL
 LANGDIST+=	nl_NL.zip
diff -ruN ports/editors/ooodict-pl_PL/Makefile ports-patch/editors/ooodict-pl_PL/Makefile
--- ports/editors/ooodict-pl_PL/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/ooodict-pl_PL/Makefile	Fri Mar  7 09:10:20 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-pl_PL/Makefile,v 1.1 2002/08/11 19:10:40 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	pl
 LANGSUFFIX=	PL
 LANGDIST+=	pl_PL.zip
diff -ruN ports/editors/ooodict-sk_SK/Makefile ports-patch/editors/ooodict-sk_SK/Makefile
--- ports/editors/ooodict-sk_SK/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/ooodict-sk_SK/Makefile	Fri Mar  7 09:08:21 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-sk_SK/Makefile,v 1.1 2002/08/11 19:10:41 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	sk
 LANGSUFFIX=	SK
 LANGDIST+=	sk_SK.zip
diff -ruN ports/editors/ooodict-sv_SE/Makefile ports-patch/editors/ooodict-sv_SE/Makefile
--- ports/editors/ooodict-sv_SE/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/ooodict-sv_SE/Makefile	Fri Mar  7 09:10:16 2003
@@ -7,8 +7,6 @@
 # $FreeBSD: ports/editors/ooodict-sv_SE/Makefile,v 1.1 2002/08/11 19:10:41 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANGPREFIX=	sv
 LANGSUFFIX=	SE
 LANGDIST+=	sv_SE.zip
diff -ruN ports/editors/openoffice-ar/Makefile ports-patch/editors/openoffice-ar/Makefile
--- ports/editors/openoffice-ar/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-ar/Makefile	Fri Mar  7 09:05:30 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-ar/Makefile,v 1.1 2002/06/15 00:05:33 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	ar
 LANG_EXT=	96
 LANG_CONFIGURE_ARG=	ARAB
diff -ruN ports/editors/openoffice-dk/Makefile ports-patch/editors/openoffice-dk/Makefile
--- ports/editors/openoffice-dk/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-dk/Makefile	Fri Mar  7 09:10:44 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-dk/Makefile,v 1.3 2002/08/11 19:10:36 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	dk
 LANG_EXT=	45
 LANG_CONFIGURE_ARG=	DAN
diff -ruN ports/editors/openoffice-es/Makefile ports-patch/editors/openoffice-es/Makefile
--- ports/editors/openoffice-es/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-es/Makefile	Fri Mar  7 09:08:55 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-es/Makefile,v 1.4 2002/08/19 14:03:54 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	es
 LANG_EXT=	34
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
diff -ruN ports/editors/openoffice-gr/Makefile ports-patch/editors/openoffice-gr/Makefile
--- ports/editors/openoffice-gr/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-gr/Makefile	Fri Mar  7 09:09:02 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-gr/Makefile,v 1.3 2002/08/11 19:10:36 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	gr
 LANG_EXT=	30
 LANG_CONFIGURE_ARG=	GREEK
diff -ruN ports/editors/openoffice-it/Makefile ports-patch/editors/openoffice-it/Makefile
--- ports/editors/openoffice-it/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-it/Makefile	Fri Mar  7 09:05:28 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-it/Makefile,v 1.4 2002/08/19 14:03:54 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	it
 LANG_EXT=	39
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
diff -ruN ports/editors/openoffice-nl/Makefile ports-patch/editors/openoffice-nl/Makefile
--- ports/editors/openoffice-nl/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-nl/Makefile	Fri Mar  7 09:05:33 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-nl/Makefile,v 1.3 2002/08/11 19:10:36 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	nl
 LANG_EXT=	31
 LANG_CONFIGURE_ARG=	DTCH
diff -ruN ports/editors/openoffice-pl/Makefile ports-patch/editors/openoffice-pl/Makefile
--- ports/editors/openoffice-pl/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-pl/Makefile	Fri Mar  7 09:08:52 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-pl/Makefile,v 1.3 2002/08/11 19:10:37 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	pl
 LANG_EXT=	48
 LANG_CONFIGURE_ARG=	POL
diff -ruN ports/editors/openoffice-se/Makefile ports-patch/editors/openoffice-se/Makefile
--- ports/editors/openoffice-se/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-se/Makefile	Fri Mar  7 09:05:21 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-se/Makefile,v 1.4 2002/08/19 14:03:54 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	se
 LANG_EXT=	46
 L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
diff -ruN ports/editors/openoffice-tr/Makefile ports-patch/editors/openoffice-tr/Makefile
--- ports/editors/openoffice-tr/Makefile	Fri Mar  7 08:47:53 2003
+++ ports-patch/editors/openoffice-tr/Makefile	Fri Mar  7 09:08:59 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/editors/openoffice-tr/Makefile,v 1.1 2002/06/15 00:04:43 mbr Exp $
 #
 
-CATEGORIES=	editors
-
 LANG_PKGNAME=	tr
 LANG_EXT=	90
 LANG_CONFIGURE_ARG=	TURK
diff -ruN ports/japanese/binder/Makefile ports-patch/japanese/binder/Makefile
--- ports/japanese/binder/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/japanese/binder/Makefile	Fri Mar  7 09:23:22 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/japanese/binder/Makefile,v 1.4 2001/05/22 18:19:40 sobomax Exp $
 #
 
-CATEGORIES=	japanese
-
 LANGUAGE=	Japanese
 MASTERDIR=	${.CURDIR}/../../x11-fm/binder
 
diff -ruN ports/japanese/jgv/Makefile ports-patch/japanese/jgv/Makefile
--- ports/japanese/jgv/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/japanese/jgv/Makefile	Fri Mar  7 09:27:56 2003
@@ -5,8 +5,6 @@
 # $FreeBSD: ports/japanese/jgv/Makefile,v 1.4 2001/05/22 18:19:41 sobomax Exp $
 #
 
-CATEGORIES=	japanese
-
 LANGUAGE=	Japanese
 MASTERDIR=	${.CURDIR}/../../graphics/jgv
 
diff -ruN ports/japanese/libimg/Makefile ports-patch/japanese/libimg/Makefile
--- ports/japanese/libimg/Makefile	Fri Mar  7 08:42:36 2003
+++ ports-patch/japanese/libimg/Makefile	Fri Mar  7 08:55:00 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	libimg
 PORTVERSION=	1.2b2
-CATEGORIES=	japanese graphics tk80 japanese
+CATEGORIES=	japanese graphics tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/ \
 		http://www.aaa-int.or.jp/~jfactory/TkStep/dist/
 DISTNAME=	img${PORTVERSION}
diff -ruN ports/korean/openoffice/Makefile ports-patch/korean/openoffice/Makefile
--- ports/korean/openoffice/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/korean/openoffice/Makefile	Fri Mar  7 09:28:29 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/korean/openoffice/Makefile,v 1.3 2002/08/24 16:45:20 mbr Exp $
 #
 
-CATEGORIES=	korean editors
+CATEGORIES=	korean
 
 LANG_PKGNAME=	ko
 LANG_EXT=	82
diff -ruN ports/www/w3m-m17n/Makefile ports-patch/www/w3m-m17n/Makefile
--- ports/www/w3m-m17n/Makefile	Fri Mar  7 08:42:56 2003
+++ ports-patch/www/w3m-m17n/Makefile	Fri Mar  7 09:09:27 2003
@@ -5,10 +5,9 @@
 # $FreeBSD: ports/www/w3m-m17n/Makefile,v 1.3 2003/02/22 14:25:38 nobutaka Exp $
 #
 
-CATEGORIES=	www
 COMMENT=	A pager/text-based WWW browser with multilingualization support
 
-MASTERDIR=	${.CURDIR}/../../www/w3m
+MASTERDIR=	${.CURDIR}/../w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist