Correct CATEGORIES - make first category in the CATEGORIES list matching parent

directory.

37 files changed, 49 insertions, 49 deletions

diff --git a/archivers/deepforest/Makefile b/archivers/deepforest/Makefile
index 6b513a4e6352..082592d82a1b 100644
--- a/archivers/deepforest/Makefile
+++ b/archivers/deepforest/Makefile
@@ -23,18 +23,18 @@ USE_X_PREFIX=	yes
 SCRIPTS_ENV=	LANG=C LN=${LN} PERL=${PERL} LANGUAGE=${LANGUAGE} VERSION=${TKSTEPVERSION}
 PLIST_SUB=	PIXMAP_PATH=${PIXMAPPATH:S@^${PREFIX}/@@}
 
-# This port is for both converters/deepforest and japanese/deepforest.
-# But converters/deepforest and japanese/deepforest are mutually exclusive and
+# This port is for both archivers/deepforest and japanese/deepforest.
+# But archivers/deepforest and japanese/deepforest are mutually exclusive and
 # SHOULD NOT BE INSTALLED SIMULTANEOUSLY!
 TKSTEPVERSION=	8.0
 PIXMAPPATH?=	${PREFIX}/share/WindowMaker/Pixmaps
 LANGUAGE?=
 .if (${LANGUAGE} == "Japanese")
-CATEGORY_LIST=	archivers windowmaker tkstep80 japanese
+CATEGORY_LIST=	japanese windowmaker tkstep80 japanese
 RUN_DEP_LIST=	${LOCALBASE}/lib/tkstep8.0jp/tkstep.tcl:${PORTSDIR}/japanese/tkstep80
 LIB_DEP_LIST=	img.1:${PORTSDIR}/japanese/libimg
 .else
-CATEGORY_LIST=	converters windowmaker tkstep80
+CATEGORY_LIST=	archivers windowmaker tkstep80
 RUN_DEP_LIST=	${LOCALBASE}/lib/tkstep8.0/tkstep.tcl:${PORTSDIR}/x11-toolkits/tkstep80
 LIB_DEP_LIST=	img.1:${PORTSDIR}/graphics/libimg
 .endif
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 7edc2afde790..1ec188ca4aa3 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	1.94
-CATEGORIES=	misc kde
+CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 7edc2afde790..1ec188ca4aa3 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	1.94
-CATEGORIES=	misc kde
+CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index c4931a6b1f8f..e0a8786e482c 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PV
 PORTVERSION=	1.0
-CATEGORIES=	net perl5
+CATEGORIES=	devel net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PV
 PKGNAMEPREFIX=	p5-
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 70e533895f65..666231bbe134 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclreadline
 PORTVERSION=	1.0.3
-CATEGORIES=	tcl80 tcl82
+CATEGORIES=	devel tcl80 tcl82
 MASTER_SITES=	ftp://tclreadline.sourceforge.net/pub/tclreadline/
 
 MAINTAINER=	darius@dons.net.au
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index ada23196eecf..2b39a05cbf8b 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qstat
 PORTVERSION=	2.3g
-CATEGORIES=	misc
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.activesw.com/pub/quake/
 DISTNAME=	qstat23g
 
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index b0f4da0136b4..fcea058fbdb8 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkgraph
 PORTVERSION=	0.6.1
-CATEGORIES=	math
+CATEGORIES=	graphics math
 MASTER_SITES=	http://gtkgraph.linuxave.net/
 
 MAINTAINER=	jedgar@FreeBSD.org
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index 422ba2f4a9cc..a17c51fb7a9e 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -1,23 +1,23 @@
-# New ports collection makefile for: premail
-# Date created:         31 Jan 1997
-# Whom:                 ache
+# New ports collection makefile for:	premail
+# Date created:				31 Jan 1997
+# Whom:					ache
 #
 # $FreeBSD$
 #
 
 PORTNAME=	premail
-PORTVERSION= 	0.46
-CATEGORIES=     security mail
-MASTER_SITES=   ftp://ftp.jpunix.com/pub/remailer-tools/ \
+PORTVERSION=	0.46
+CATEGORIES=	mail security
+MASTER_SITES=	ftp://ftp.jpunix.com/pub/remailer-tools/ \
 		ftp://ftp.kiarchive.ru/pub/unix/crypto/
 
 MAINTAINER=	ache@FreeBSD.org
 
-BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
+BUILD_DEPENDS+=	pgp:${PORTSDIR}/security/pgp
 
-WRKSRC=         ${WRKDIR}/premail
-USE_PERL5=      Yes
-NO_BUILD=       Yes
+WRKSRC=		${WRKDIR}/premail
+USE_PERL5=	yes
+NO_BUILD=	yes
 
 post-patch:
 	cd ${WRKSRC}; \
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index f08f81d83315..96f9f291b13b 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libneural
 PORTVERSION=	1.0.2
-CATEGORIES=	devel
+CATEGORIES=	math devel
 MASTER_SITES=	http://ieee.uow.edu.au/documents/contrib/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 488e6d93e1eb..6250f9edbe99 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	biblereader
 PORTVERSION=	0.3.2
-CATEGORIES=	deskutils
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.whitevine.com/biblereader/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kjv.tar.gz
 .if defined(WITH_TRANSLATIONS)
diff --git a/misc/peq/Makefile b/misc/peq/Makefile
index 19414b9136d2..f2a9f9c7d794 100644
--- a/misc/peq/Makefile
+++ b/misc/peq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peq
 PORTVERSION=	0.7.1
-CATEGORIES=	games
+CATEGORIES=	misc games
 MASTER_SITES=	http://silverstone.fortunecity.com/jaguar/37/ \
 		ftp://lost.iafrica.com/pub/peq/
 
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 7edc2afde790..1ec188ca4aa3 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	1.94
-CATEGORIES=	misc kde
+CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 7edc2afde790..1ec188ca4aa3 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	1.94
-CATEGORIES=	misc kde
+CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 0672f4a708b8..07edcab5ef65 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	citrix_ica
 PORTVERSION=	3.0.15
-CATEGORIES=	comms linux
+CATEGORIES=	net comms linux
 MASTER_SITES=  
 DISTNAME=	linux
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 0672f4a708b8..07edcab5ef65 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	citrix_ica
 PORTVERSION=	3.0.15
-CATEGORIES=	comms linux
+CATEGORIES=	net comms linux
 MASTER_SITES=  
 DISTNAME=	linux
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/cvsup-bin/Makefile b/net/cvsup-bin/Makefile
index 6e0c6c79036b..30ba0212b205 100644
--- a/net/cvsup-bin/Makefile
+++ b/net/cvsup-bin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsup-bin
 PORTVERSION=	16.1
-CATEGORIES=	devel net
+CATEGORIES=	net devel
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
 
 MAINTAINER=	jdp@freebsd.org
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 4c13df085276..bdf045607ee2 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsup
 PORTVERSION=	16.1
-CATEGORIES=	devel net
+CATEGORIES=	net devel
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/ \
 		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/sources/
 
diff --git a/net/cvsupd-bin/Makefile b/net/cvsupd-bin/Makefile
index 626084e1a1aa..2f796cf98775 100644
--- a/net/cvsupd-bin/Makefile
+++ b/net/cvsupd-bin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsupd-bin
 PORTVERSION=	16.1
-CATEGORIES=	devel net
+CATEGORIES=	net devel
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/binaries/
 
 MAINTAINER=	jdp@freebsd.org
diff --git a/net/dante/Makefile b/net/dante/Makefile
index cff9449bbbe7..e8965ef7b3e9 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dante
 PORTVERSION=	1.1.2
-CATEGORIES=	security net
+CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.inet.no/pub/socks/ \
 		http://www.freenix.no/~anders/ \
 		ftp://totem.fix.no/pub/mirrors/misc/
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 19b4e9847ef4..cb97d6d5d28f 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iplog
 PORTVERSION=	2.2.1
-CATEGORIES=	security
+CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://misc.ojnk.net/~odin/stuff/
 MASTER_SITE_SUBDIR=	ojnk
diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile
index 37fed3e48591..c74d0a87c03f 100644
--- a/net/ksamba/Makefile
+++ b/net/ksamba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksamba
 PORTVERSION=	0.3.3
-CATEGORIES=	kde net
+CATEGORIES=	net kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= unstable/apps/network
 
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index d50259462abc..965a8dc7df22 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bibview
 PORTVERSION=	2.2
-CATEGORIES=	databases print
+CATEGORIES=	print databases
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR= biblio/bibtex/utils/bibview-2.0
 
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 498fbda6d07c..2bba66942e4c 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	1.3.12
-CATEGORIES=	www russian
+CATEGORIES=	russian www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
 		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
diff --git a/russian/rispell/Makefile b/russian/rispell/Makefile
index af5227f42c65..c4c82bd97bdf 100644
--- a/russian/rispell/Makefile
+++ b/russian/rispell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ispell
 PORTVERSION=	1.0
-CATEGORIES=     textproc russian
+CATEGORIES=     russian textproc
 MASTER_SITES=   http://www.ispras.ru/~knizhnik/
 DISTNAME=	rispell
 
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index 2f25c6964b05..180efdc8e1d9 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmpccard
 PORTVERSION=	1.3
-CATEGORIES=	misc windowmaker
+CATEGORIES=	sysutils misc windowmaker
 MASTER_SITES=	http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
 
 MAINTAINER=	taoka@FreeBSD.org
diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 8f705f6ef6d9..5ffb9852bceb 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asWedit
 PORTVERSION= 	4.0.1
-CATEGORIES=	editors www linux
+CATEGORIES=	www editors linux
 MASTER_SITES=	http://www.advasoft.com/asWedit/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/www/asWedit/ \
 		ftp://sunsite.auc.dk/pub/infosystems/www/asWedit/ \
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index 2b80206add85..7c0b9a353437 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgihtml
 PORTVERSION= 	1.69
-CATEGORIES=	devel www
+CATEGORIES=	www devel
 MASTER_SITES=	ftp://hcs.harvard.edu/pub/web/tools/cgihtml/
 
 MAINTAINER=	roam@orbitel.bg
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 47298ca1ef6c..7d4e0aa881c4 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgiparse
 PORTVERSION= 	0.9b
-CATEGORIES=	devel www
+CATEGORIES=	www devel
 MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/jmpc/dist/	\
 		http://www.funkthat.com/~jmg/
 
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index 8eeb9051e747..c002041cf745 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	publicfile
 PORTVERSION= 	0.52
-CATEGORIES=	ftp
+CATEGORIES=	www ftp
 MASTER_SITES=	http://cr.yp.to/publicfile/ \
 		ftp://cr.yp.to/publicfile/
 
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index e1290b240380..9aaa9142d7e5 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttmkfdir
 PORTVERSION= 	0.0
-CATEGORIES=	x11
+CATEGORIES=	x11-fonts x11
 MASTER_SITES=	http://www.darmstadt.gmd.de/~pommnitz/TrueType/
 DISTNAME=	${PORTNAME}
 
diff --git a/x11-servers/Xatm/Makefile b/x11-servers/Xatm/Makefile
index e170ac07dfd6..81a22e0a1e43 100644
--- a/x11-servers/Xatm/Makefile
+++ b/x11-servers/Xatm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfs-atm
 PORTVERSION= 	3.0.1
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
 DISTNAME=	${PORTNAME}+cid-${PORTVERSION}
 
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index ff6305b96c54..3abeea926a3b 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x2vnc
 PORTVERSION= 	1.1
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	http://www.hubbe.net/~hubbe/
 
 MAINTAINER=	ade@FreeBSD.org
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index bb6e9c784668..8c8814a2de6e 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x2x
 PORTVERSION= 	1.27
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile
index b9370d2ebb31..5741fb0a75f9 100644
--- a/x11-wm/gnome2wmaker/Makefile
+++ b/x11-wm/gnome2wmaker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome2wmaker
 PORTVERSION= 	1.2
-CATEGORIES=	x11-toolkits gnome
+CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://ulli.linuxbox.com/gnome2wmaker/
 
 MAINTAINER=     reg@FreeBSD.org
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 631db1ecf2a5..e8d514bbcebd 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	1.94
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 631db1ecf2a5..e8d514bbcebd 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	1.94
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 631db1ecf2a5..e8d514bbcebd 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	1.94
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11 x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src