Add virtual category "linux" to Linux apps and support libs/utils.

88 files changed, 89 insertions, 88 deletions

diff --git a/archivers/linux_rar/Makefile b/archivers/linux_rar/Makefile
index 83e32ac075ae..37983886b145 100644
--- a/archivers/linux_rar/Makefile
+++ b/archivers/linux_rar/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=       rarlnx26
 PKGNAME=        linux_rar-2.60
-CATEGORIES=	archivers
+CATEGORIES=	archivers linux
 MASTER_SITES=	ftp://rarsoft.ti.sk/pub/rar/ \
 		ftp://ftp.cdrom.com/pub/cheats/dlh/rar/ \
 		ftp://ftp.cdrom.com/pub/sac/pack/
diff --git a/archivers/pkzip/Makefile b/archivers/pkzip/Makefile
index eac393142e70..3f4181c2fadc 100644
--- a/archivers/pkzip/Makefile
+++ b/archivers/pkzip/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=       pklin251
 PKGNAME=        pkzip-2.5
-CATEGORIES=	archivers
+CATEGORIES=	archivers linux
 MASTER_SITES=   ftp://ftp.pkware.com/
 EXTRACT_SUFX=	.exe
 
diff --git a/audio/linux-realplayer/Makefile b/audio/linux-realplayer/Makefile
index 6d88ee503692..0a7dfdcac67b 100644
--- a/audio/linux-realplayer/Makefile
+++ b/audio/linux-realplayer/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	rv50_linux20
 PKGNAME=	linux-realplayer-5.0
-CATEGORIES=	audio
+CATEGORIES=	audio linux
 MASTER_SITES=	
 
 MAINTAINER=	kris@FreeBSD.org
diff --git a/biology/kinemage/Makefile b/biology/kinemage/Makefile
index 7abb54c86ade..a859d9ddc154 100644
--- a/biology/kinemage/Makefile
+++ b/biology/kinemage/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	MAGE_4_2.LINUX
 PKGNAME=	kinemage-4.2
-CATEGORIES=     biology
+CATEGORIES=     biology linux
 MASTER_SITES=	ftp://kinemage.biochem.duke.edu/LINUXprograms/ \
 		ftp://ftp.ebi.ac.uk/pub/databases/pdb/pub/xternal_software/kinemage/LINUX/ \
 		ftp://ftp.pdb.bnl.gov/pub/xternal_software/kinemage/LINUX/
diff --git a/chinese/acroread-chsfont/Makefile b/chinese/acroread-chsfont/Makefile
index 91755fe26551..5f5f97f33677 100644
--- a/chinese/acroread-chsfont/Makefile
+++ b/chinese/acroread-chsfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	chsfont
-CATEGORIES=	chinese
+CATEGORIES=	chinese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/chinese/acroread-chtfont/Makefile b/chinese/acroread-chtfont/Makefile
index 871f652aca60..dfcab9754c7a 100644
--- a/chinese/acroread-chtfont/Makefile
+++ b/chinese/acroread-chtfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	chtfont
-CATEGORIES=	chinese
+CATEGORIES=	chinese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/chinese/acroread5-chsfont/Makefile b/chinese/acroread5-chsfont/Makefile
index 91755fe26551..5f5f97f33677 100644
--- a/chinese/acroread5-chsfont/Makefile
+++ b/chinese/acroread5-chsfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	chsfont
-CATEGORIES=	chinese
+CATEGORIES=	chinese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/chinese/acroread5-chtfont/Makefile b/chinese/acroread5-chtfont/Makefile
index 871f652aca60..dfcab9754c7a 100644
--- a/chinese/acroread5-chtfont/Makefile
+++ b/chinese/acroread5-chtfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	chtfont
-CATEGORIES=	chinese
+CATEGORIES=	chinese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index 0d40ca06a421..880a0389089a 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_devtools
 PKGNAME=		linux_devtools-6.1
-CATEGORIES=		emulators devel
+CATEGORIES=		devel emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_KERNEL_HEADERS} \
 			${RPM_GLIBC_DEVEL} \
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index 0d40ca06a421..880a0389089a 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_devtools
 PKGNAME=		linux_devtools-6.1
-CATEGORIES=		emulators devel
+CATEGORIES=		devel emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_KERNEL_HEADERS} \
 			${RPM_GLIBC_DEVEL} \
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index 0d40ca06a421..880a0389089a 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_devtools
 PKGNAME=		linux_devtools-6.1
-CATEGORIES=		emulators devel
+CATEGORIES=		devel emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_KERNEL_HEADERS} \
 			${RPM_GLIBC_DEVEL} \
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 09469bdeb0c5..101aa8066e29 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	linux_kdump-1.4
-CATEGORIES=	devel
+CATEGORIES=	devel linux
 MASTER_SITES=	http://people.FreeBSD.org/~marcel/			\
 		ftp://ftp.scc.nl/pub/FreeBSD/distfiles/
 
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 26f806f5fb5e..7911c75b42e5 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=	GUILG00
 PKGNAME=	wordperfect-8.0
-CATEGORIES=     editors
+CATEGORIES=     editors linux
 MASTER_SITES=	
 EXTRACT_SUFX=	.GZ
 
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 1a20e5263d46..81c9e586a080 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=		linux_base
 PKGNAME=		linux_base-6.1
-CATEGORIES=		emulators
+CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
 			${RPM_RPM} ${RPM_SET3}
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index a91041c92b86..aaecd7facef1 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=       VMware-1.1.2-364
 PKGNAME=        vmware-1.1.2
-CATEGORIES=	emulators
+CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
 		http://vmware-chil.www.conxion.com/software/ \
@@ -127,7 +127,6 @@ post-install:
 	@${ECHO} "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-" 
 .endif
 
-	
 pre-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.linproc \
 		  ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.net
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index a91041c92b86..aaecd7facef1 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=       VMware-1.1.2-364
 PKGNAME=        vmware-1.1.2
-CATEGORIES=	emulators
+CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
 		http://vmware-chil.www.conxion.com/software/ \
@@ -127,7 +127,6 @@ post-install:
 	@${ECHO} "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-" 
 .endif
 
-	
 pre-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.linproc \
 		  ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.net
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index a91041c92b86..aaecd7facef1 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=       VMware-1.1.2-364
 PKGNAME=        vmware-1.1.2
-CATEGORIES=	emulators
+CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
 		http://vmware-chil.www.conxion.com/software/ \
@@ -127,7 +127,6 @@ post-install:
 	@${ECHO} "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-" 
 .endif
 
-	
 pre-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.linproc \
 		  ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc.net
diff --git a/games/adom/Makefile b/games/adom/Makefile
index efecbf6a1fad..9ed401bffe45 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	adom-099g15-elf
 PKGNAME=	adom-0.99.g15
-CATEGORIES=	games
+CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 
 MAINTAINER=	rover@lglobus.ru
diff --git a/games/linuxdoom/Makefile b/games/linuxdoom/Makefile
index 3aae0f4c2778..d75af826f68c 100644
--- a/games/linuxdoom/Makefile
+++ b/games/linuxdoom/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    games
+# New ports collection makefile for:    linux doom
 # Version required:	1.8
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
@@ -8,7 +8,7 @@
 
 DISTNAME=	doom-1.8
 PKGNAME=	linuxdoom-1.8
-CATEGORIES=	games
+CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/doom
 DISTFILES=	linux-doom-1.8.tar.gz musserver.tgz smooth-joystick4doom.tgz
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 5da61bf6b04b..e62879b1f984 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
-CATEGORIES=	games
+CATEGORIES=	games linux
 MASTER_SITES=	ftp://usa.lostboys.nl/pub/medialab/rollemup/Linux/
 
 MAINTAINER=	sanpei@jp.FreeBSD.org
diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile
index fea4b436c127..2a3d6032f113 100644
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_49
 PKGNAME=	de-staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.hagenhomes.com/pub/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index fea4b436c127..2a3d6032f113 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_49
 PKGNAME=	de-staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.hagenhomes.com/pub/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
 		ftp://ftp.stardivision.de/pub/support/so51a/nwspatch/unxlnxi/  \
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index a13eaf577b8a..2300c0e2206b 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	so51a_lnx_01
 PKGNAME=	staroffice-5.1a
-CATEGORIES=	editors
+CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		http://www.hagenhomes.com/freebsd/files/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
index 0bcae75a4c9c..4a541b292c12 100644
--- a/graphics/linux_glx/Makefile
+++ b/graphics/linux_glx/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	linux_glx-991127
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.FreeBSD.org/~3d/distfiles/glx/linux/
 
 MAINTAINER=	3d@freebsd.org
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index 4fb02884ee01..e4e2cde83997 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	mtv-1.1.0.7
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/
 DISTFILES=	mtv-1.1.0.7.tar.gz libforms.so.0.88.gz
 
diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile
index 5244ac07e177..b1f5c4a6b59b 100644
--- a/graphics/netshow/Makefile
+++ b/graphics/netshow/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	netshow_linux
 PKGNAME=	netshow-2.00.251
-CATEGORIES=	graphics net
+CATEGORIES=	graphics net linux
 MASTER_SITES=	http://microsoft.com/netshow/download/en/beta/
 EXTRACT_SUFX=	.gz
 
diff --git a/graphics/xmovie/Makefile b/graphics/xmovie/Makefile
index fbb13ca0d6ee..b8ee701bb80c 100644
--- a/graphics/xmovie/Makefile
+++ b/graphics/xmovie/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	xmovie-i586-1.3.1
 PKGNAME=	xmovie-1.3.1
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.FreeBSD.org/~imura/distfiles/
 # Distfile has no version info. The original site is below.
 # MASTER_SITES=	http://heroine.linuxbox.com/
diff --git a/japanese/acroread-jpnfont/Makefile b/japanese/acroread-jpnfont/Makefile
index db64232ccc52..f4d261d4c99d 100644
--- a/japanese/acroread-jpnfont/Makefile
+++ b/japanese/acroread-jpnfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	jpnfont
-CATEGORIES=	japanese
+CATEGORIES=	japanese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/japanese/acroread5-jpnfont/Makefile b/japanese/acroread5-jpnfont/Makefile
index db64232ccc52..f4d261d4c99d 100644
--- a/japanese/acroread5-jpnfont/Makefile
+++ b/japanese/acroread5-jpnfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	jpnfont
-CATEGORIES=	japanese
+CATEGORIES=	japanese linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/korean/acroread-korfont/Makefile b/korean/acroread-korfont/Makefile
index 7f9b420a7f9c..b34307342148 100644
--- a/korean/acroread-korfont/Makefile
+++ b/korean/acroread-korfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	korfont
-CATEGORIES=	korean
+CATEGORIES=	korean linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/korean/acroread5-korfont/Makefile b/korean/acroread5-korfont/Makefile
index 7f9b420a7f9c..b34307342148 100644
--- a/korean/acroread5-korfont/Makefile
+++ b/korean/acroread5-korfont/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	korfont
-CATEGORIES=	korean
+CATEGORIES=	korean linux
 
 MASTERDIR=	${.CURDIR}/../../print/acroread-commfont
 
diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile
index 1276a6f1740e..c1a0235a95fe 100644
--- a/korean/hanIM/Makefile
+++ b/korean/hanIM/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=       hanIM-${HANIM_VER}-${HANIM_VER_PL}.i386
 PKGNAME=        ko-hanIM-${HANIM_VER}
-CATEGORIES=     korean x11
+CATEGORIES=     korean x11 linux
 MASTER_SITES=   ftp://www.mizi.co.kr/pub/hanIM/ \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
 EXTRACT_SUFX=   .rpm
diff --git a/korean/linux_locale/Makefile b/korean/linux_locale/Makefile
index 7a3d0ee4c6fb..1598f456db7a 100644
--- a/korean/linux_locale/Makefile
+++ b/korean/linux_locale/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	linux_locale-ko-1.0
 PKGNAME=	ko-linux_locale-1.0
-CATEGORIES=	korean emulators
+CATEGORIES=	korean emulators linux
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
 
 MAINTAINER=	cjh@kr.freebsd.org
diff --git a/lang/ETHOberonV4/Makefile b/lang/ETHOberonV4/Makefile
index dc411c37d00e..7a2894f5fd96 100644
--- a/lang/ETHOberonV4/Makefile
+++ b/lang/ETHOberonV4/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	ETHLinuxOberon
 PKGNAME=	ETHOberonV4-0.9
-CATEGORIES=	lang
+CATEGORIES=	lang linux
 MASTER_SITES=	ftp://ftp.inf.ethz.ch/pub/Oberon/OberonV4/Linux/latest/
 EXTRACT_SUFX=	.tgz
 
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index eaee95bf641a..81941c46cd13 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	Wingz-142
-CATEGORIES=	math
+CATEGORIES=	math linux
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/financial/spreadsheet
 EXTRACT_SUFX=	.tgz
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index eaee95bf641a..81941c46cd13 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	Wingz-142
-CATEGORIES=	math
+CATEGORIES=	math linux
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/financial/spreadsheet
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 6d88ee503692..0a7dfdcac67b 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	rv50_linux20
 PKGNAME=	linux-realplayer-5.0
-CATEGORIES=	audio
+CATEGORIES=	audio linux
 MASTER_SITES=	
 
 MAINTAINER=	kris@FreeBSD.org
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index fbb13ca0d6ee..b8ee701bb80c 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	xmovie-i586-1.3.1
 PKGNAME=	xmovie-1.3.1
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.FreeBSD.org/~imura/distfiles/
 # Distfile has no version info. The original site is below.
 # MASTER_SITES=	http://heroine.linuxbox.com/
diff --git a/multimedia/mtv/Makefile b/multimedia/mtv/Makefile
index 4fb02884ee01..e4e2cde83997 100644
--- a/multimedia/mtv/Makefile
+++ b/multimedia/mtv/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	mtv-1.1.0.7
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/
 DISTFILES=	mtv-1.1.0.7.tar.gz libforms.so.0.88.gz
 
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index 5244ac07e177..b1f5c4a6b59b 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	netshow_linux
 PKGNAME=	netshow-2.00.251
-CATEGORIES=	graphics net
+CATEGORIES=	graphics net linux
 MASTER_SITES=	http://microsoft.com/netshow/download/en/beta/
 EXTRACT_SUFX=	.gz
 
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index fbb13ca0d6ee..b8ee701bb80c 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	xmovie-i586-1.3.1
 PKGNAME=	xmovie-1.3.1
-CATEGORIES=	graphics
+CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.FreeBSD.org/~imura/distfiles/
 # Distfile has no version info. The original site is below.
 # MASTER_SITES=	http://heroine.linuxbox.com/
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index aa7affdbd66b..586878c2f18e 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=       linux
 PKGNAME=	citrix_ica-3.0.15
-CATEGORIES=	comms
+CATEGORIES=	comms linux
 MASTER_SITES=   
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index aa7affdbd66b..586878c2f18e 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=       linux
 PKGNAME=	citrix_ica-3.0.15
-CATEGORIES=	comms
+CATEGORIES=	comms linux
 MASTER_SITES=   
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index ddcebc075a17..1f9c1a789763 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME?=	commfont # dummy
 PKGNAME=	${PKG_PRE}acroread-${DISTNAME}-1999.7.20
-CATEGORIES?=	japanese print
+CATEGORIES?=	japanese print linux
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 
 MAINTAINER=	taoka@FreeBSD.org
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 11b3b9508cc3..1ce1bff77dcf 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	ar302lin
 PKGNAME=	acroread-3.02
-CATEGORIES=	print
+CATEGORIES=	print linux
 MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/3.x/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/acrobatreader/unix/3.x/
 EXTRACT_SUFX=	.tar.Z
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index 8a079924eab2..6f630f214480 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	linux-ar-40
 PKGNAME=	acroread-4.0
-CATEGORIES=	print
+CATEGORIES=	print linux
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 
 MAINTAINER=	dima@FreeBSD.org
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index ddcebc075a17..1f9c1a789763 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME?=	commfont # dummy
 PKGNAME=	${PKG_PRE}acroread-${DISTNAME}-1999.7.20
-CATEGORIES?=	japanese print
+CATEGORIES?=	japanese print linux
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 
 MAINTAINER=	taoka@FreeBSD.org
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 8a079924eab2..6f630f214480 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	linux-ar-40
 PKGNAME=	acroread-4.0
-CATEGORIES=	print
+CATEGORIES=	print linux
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 
 MAINTAINER=	dima@FreeBSD.org
diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 78db86905eaa..00deedeffddd 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	asWedit-4.0-i386.linux
 PKGNAME=	asWedit-4.0.1
-CATEGORIES=	editors www
+CATEGORIES=	editors www 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/linux-netscape4/Makefile b/www/linux-netscape4/Makefile
index edb825c1268e..3c081247fe94 100644
--- a/www/linux-netscape4/Makefile
+++ b/www/linux-netscape4/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	communicator-v408-export.x86-unknown-linux2.0_libc5
 PKGNAME=	linux-netscape-4.08
-CATEGORIES=	www
+CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
 		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile
index 55151bb5c476..7e7134c712d5 100644
--- a/www/linux-netscape47-communicator/Makefile
+++ b/www/linux-netscape47-communicator/Makefile
@@ -8,6 +8,7 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
+CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
 		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
 DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
diff --git a/www/linux-netscape47-navigator/Makefile b/www/linux-netscape47-navigator/Makefile
index 55151bb5c476..7e7134c712d5 100644
--- a/www/linux-netscape47-navigator/Makefile
+++ b/www/linux-netscape47-navigator/Makefile
@@ -8,6 +8,7 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
+CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
 		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
 DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 55151bb5c476..7e7134c712d5 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -8,6 +8,7 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
+CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
 		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
 DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index 14e573cb9f2f..7cbc14b3200b 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -9,7 +9,7 @@
 
 DISTNAME=	communicator-v407-us.x86-unknown-linux2.0_libc5
 PKGNAME=	netscape-communicator-4.07.us
-CATEGORIES=	www
+CATEGORIES=	www linux
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 9229a76a932a..a43171a83ea9 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
-CATEGORIES=	www
+CATEGORIES?=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
 DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 9229a76a932a..a43171a83ea9 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME?=	netscape-${BROWSER}-${BROWSER_VER}
-CATEGORIES=	www
+CATEGORIES?=	www
 MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
 DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz
 
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 55151bb5c476..7e7134c712d5 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -8,6 +8,7 @@
 #
 
 DISTNAME=	linux-netscape-${BROWSER}-${BROWSER_VER}
+CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/ \
 		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.7/unix/supported/linux20_glibc2/complete_install/
 DISTFILES=	communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz