19 files changed, 41 insertions, 29 deletions

diff --git a/LEGAL b/LEGAL
index 0ab2ded3a118..f5389c57e29e 100644
--- a/LEGAL
+++ b/LEGAL
@@ -492,7 +492,7 @@ savage/Samuraiwars*	games/linux-savage-samuraiwars	Freeware, but license
 						terms are unclear
 savage/SFE*		games/linux-savage	Freeware, but license terms
 						are unclear
-sdr-*			mbone/sdr		Crypto; export-controlled
+sdr-*			net/sdr			Crypto; export-controlled
 seatools_cli.tar	sysutils/seatools	Distfile should be loaded by
 						hand
 serialmail-*		mail/serialmail		No license -- see
diff --git a/MOVED b/MOVED
index cffec17d5953..2eead02fc115 100644
--- a/MOVED
+++ b/MOVED
@@ -1559,3 +1559,16 @@ www/py-turbosetup||2011-02-27|Removed, part of python since python25
 textproc/py-csv||2011-02-27|Removed, part of python since python25
 devel/py-uuid||2011-02-27|Removed, part of python since python25
 graphics/libv3d||2011-02-28|Has expired: unmaintained and failed to build for months
+mbone/rat|audio/rat|2011-03-06|Changed category
+mbone/rat30|audio/rat30|2011-03-06|Changed category
+mbone/speak_freely|audio/speak_freely|2011-03-06|Changed category
+mbone/vat|audio/vat|2011-03-06|Changed category
+mbone/xspeakfree|audio/xspeakfree|2011-03-06|Changed category
+mbone/vic|multimedia/vic|2011-03-06|Changed category
+mbone/imm|net/imm|2011-03-06|Changed category
+mbone/mcl|net/mcl|2011-03-06|Changed category
+mbone/rqm|net/rqm|2011-03-06|Changed category
+mbone/rtptools|net/rtptools|2011-03-06|Changed category
+mbone/sdr|net/sdr|2011-03-06|Changed category
+mbone/udpcast|net/udpcast|2011-03-06|Changed category
+mbone/wb|net/wb|2011-03-06|Changed category
diff --git a/audio/Makefile b/audio/Makefile
index 8cfd5a64da17..c1acc599cb1e 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -654,6 +654,8 @@
     SUBDIR += quimup
     SUBDIR += raop_play
     SUBDIR += raproxy
+    SUBDIR += rat
+    SUBDIR += rat30
     SUBDIR += raul
     SUBDIR += rawrec
     SUBDIR += rbscrobbler
@@ -717,6 +719,7 @@
     SUBDIR += soundtouch
     SUBDIR += soundtracker
     SUBDIR += sox
+    SUBDIR += speak_freely
     SUBDIR += specimen
     SUBDIR += speex
     SUBDIR += spek
@@ -782,6 +785,7 @@
     SUBDIR += umix
     SUBDIR += umodplayer
     SUBDIR += vagalume
+    SUBDIR += vat
     SUBDIR += ventrilo-server
     SUBDIR += vitunes
     SUBDIR += voipong
@@ -887,6 +891,7 @@
     SUBDIR += xoscope
     SUBDIR += xpi-musicpm
     SUBDIR += xsidplay
+    SUBDIR += xspeakfree
     SUBDIR += xsynth-dssi
     SUBDIR += xtuner
     SUBDIR += xvmixer
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 00cfd4535a75..dd1facf4a1b7 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	rat
 PORTVERSION=	4.2.25
 PORTREVISION=	4
-CATEGORIES=	mbone audio ipv6 tk
+CATEGORIES=	audio ipv6 tk mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \
 		http://www.icir.org/hodson/ucl-mirror/
 
diff --git a/audio/rat30/Makefile b/audio/rat30/Makefile
index 56ab15d5ba14..0109a9eba525 100644
--- a/audio/rat30/Makefile
+++ b/audio/rat30/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	rat
 PORTVERSION=	3.0.35
 PORTREVISION=	2
-CATEGORIES=	mbone audio
+CATEGORIES=	audio mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \
 		CENKES
 
diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile
index 9215744498df..37f2e052e6c4 100644
--- a/audio/speak_freely/Makefile
+++ b/audio/speak_freely/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	speak_freely
 PORTVERSION=	7.6a
-CATEGORIES=	mbone audio security
+CATEGORIES=	audio security mbone
 MASTER_SITES=	SF/speak-freely/speak-freely/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index d0200638bdca..feae7b740391 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	vat
 PORTVERSION=	4.0b2
 PORTREVISION=	3
-CATEGORIES=	mbone tk
+CATEGORIES=	audio mbone tk
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 DISTFILES=	vatsrc-4.0b2.tar.gz
 
diff --git a/audio/xspeakfree/Makefile b/audio/xspeakfree/Makefile
index b885d245147f..17f990e1bd2b 100644
--- a/audio/xspeakfree/Makefile
+++ b/audio/xspeakfree/Makefile
@@ -8,14 +8,14 @@
 PORTNAME=	xspeakfree
 PORTVERSION=	0.8.2
 PORTREVISION=	3
-CATEGORIES=	mbone net audio
+CATEGORIES=	audio tk mbone
 MASTER_SITES=	http://www.liquidx.org/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk (wish) frontend to Speak Freely
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely
+		${LOCALBASE}/bin/sfmike:${PORTSDIR}/audio/speak_freely
 
 NO_BUILD=	yes
 
diff --git a/mbone/Makefile b/mbone/Makefile
index 502c53e1ad69..9c308de14ac1 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -3,18 +3,4 @@
 
     COMMENT = MBone applications
 
-    SUBDIR += imm
-    SUBDIR += mcl
-    SUBDIR += rat
-    SUBDIR += rat30
-    SUBDIR += rqm
-    SUBDIR += rtptools
-    SUBDIR += sdr
-    SUBDIR += speak_freely
-    SUBDIR += udpcast
-    SUBDIR += vat
-    SUBDIR += vic
-    SUBDIR += wb
-    SUBDIR += xspeakfree
-
 .include <bsd.port.subdir.mk>
diff --git a/multimedia/Makefile b/multimedia/Makefile
index a154d77d1813..7640c2e44ebf 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -331,6 +331,7 @@
     SUBDIR += vcdtools
     SUBDIR += vdpau-video
     SUBDIR += vdpauinfo
+    SUBDIR += vic
     SUBDIR += vlc
     SUBDIR += vodcatcher
     SUBDIR += vstream-client
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 549c0661d49e..7da563dd82f0 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	vic
 PORTVERSION=	2.8.1.1.6
 PORTREVISION=	2
-CATEGORIES=	mbone tk ipv6
+CATEGORIES=	multimedia 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/Makefile b/net/Makefile
index 1074ee6c8a0d..ffe51b206767 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -251,6 +251,7 @@
     SUBDIR += igmpproxy
     SUBDIR += ilbc
     SUBDIR += imapproxy
+    SUBDIR += imm
     SUBDIR += iodine
     SUBDIR += ip6_int
     SUBDIR += ipa_ip6fw
@@ -376,6 +377,7 @@
     SUBDIR += mad_fcl
     SUBDIR += mars_nwe
     SUBDIR += mcast-tools
+    SUBDIR += mcl
     SUBDIR += mediaproxy
     SUBDIR += mediatomb
     SUBDIR += merlinmon
@@ -941,6 +943,7 @@
     SUBDIR += rmsg
     SUBDIR += roadrunner
     SUBDIR += rp-pppoe
+    SUBDIR += rqm
     SUBDIR += rshell
     SUBDIR += rsmb
     SUBDIR += rsplib
@@ -948,6 +951,7 @@
     SUBDIR += rtg
     SUBDIR += rtpbreak
     SUBDIR += rtpproxy
+    SUBDIR += rtptools
     SUBDIR += ruby-dict
     SUBDIR += ruby-icmp
     SUBDIR += ruby-ldap
@@ -1000,6 +1004,7 @@
     SUBDIR += scr_ipfm
     SUBDIR += scribe
     SUBDIR += sdl_net
+    SUBDIR += sdr
     SUBDIR += seda
     SUBDIR += sendemail
     SUBDIR += sendfile
@@ -1128,6 +1133,7 @@
     SUBDIR += twinkle
     SUBDIR += twitux
     SUBDIR += ucarp
+    SUBDIR += udpcast
     SUBDIR += udptunnel
     SUBDIR += udpxy
     SUBDIR += ulxmlrpcpp
@@ -1162,6 +1168,7 @@
     SUBDIR += wackford-squeers
     SUBDIR += wakeonlan
     SUBDIR += warppipe
+    SUBDIR += wb
     SUBDIR += whois
     SUBDIR += widentd
     SUBDIR += wire
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 7ad7149eed3c..6419c1a11eaa 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	imm
 PORTVERSION=	3.5a1
 PORTREVISION=	3
-CATEGORIES=	mbone tk
+CATEGORIES=	net mbone tk
 MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
 DISTNAME=	imm.source
 EXTRACT_SUFX=	.tar.Z
diff --git a/net/mcl/Makefile b/net/mcl/Makefile
index d087695902d6..b105f22a0a3a 100644
--- a/net/mcl/Makefile
+++ b/net/mcl/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mcl
 PORTVERSION=	2.99.1
 PORTREVISION=	1
-CATEGORIES=	mbone net
+CATEGORIES=	net mbone
 MASTER_SITES=	http://www.inrialpes.fr/planete/people/roca/mcl/bin/
 DISTNAME=	mcl_v2.99.1
 EXTRACT_SUFX=	.tgz
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
index bdf424e8ee5d..f4686ea65c88 100644
--- a/net/rqm/Makefile
+++ b/net/rqm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	rqm
 PORTVERSION=	1.0.0
 PORTREVISION=	1
-CATEGORIES=	mbone tk
+CATEGORIES=	net mbone tk
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index ea02adc0d525..145c75bfa87f 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rtptools
 PORTVERSION=	1.18
-CATEGORIES=	mbone
+CATEGORIES=	net mbone
 MASTER_SITES=	http://www.cs.columbia.edu/IRT/software/rtptools/download/
 
 MAINTAINER=	tut@nhamon.com.ua
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index 1b32fc22d111..bf937877dc08 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	sdr
 PORTVERSION=	3.0
 PORTREVISION=	3
-CATEGORIES=	mbone tk
+CATEGORIES=	net mbone tk
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/udpcast/Makefile b/net/udpcast/Makefile
index 1c33f6320ea4..f2b19135b437 100644
--- a/net/udpcast/Makefile
+++ b/net/udpcast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	udpcast
 PORTVERSION=	0.${RELEASE_DATE}
-CATEGORIES=	mbone sysutils
+CATEGORIES=	net mbone sysutils
 MASTER_SITES=	http://udpcast.linux.lu/download/
 DISTNAME=	${PORTNAME}-${RELEASE_DATE}
 
diff --git a/net/wb/Makefile b/net/wb/Makefile
index ce6020a014c1..05f1a48f0511 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	wb
 PORTVERSION=	1.59
 PORTREVISION=	4
-CATEGORIES=	mbone
+CATEGORIES=	net mbone
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/wb/
 DISTFILES=	i386-wb-1.59.tar.Z