After repo copy from graphics category to newly create multimedia

one, update all appropriate references: *_DEPENDS, CATEGORIES

Repo copied by:		cvs (joe)
Approved by:		portmgr (self & no objections)

40 files changed, 51 insertions, 51 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 4bb3300957d1..93104ea43ec7 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	0.9.0.101
-CATEGORIES=	graphics multimedia
+CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
 DISTNAME=	avidemux-0.9rc1
 EXTRACT_SUFX=	.tgz
@@ -43,7 +43,7 @@ WITH_XVID=	yes
 .endif
 
 .if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/graphics/xvid
+LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
diff --git a/multimedia/avinfo/Makefile b/multimedia/avinfo/Makefile
index 0604ec1a72c6..fb08cdb0a75e 100644
--- a/multimedia/avinfo/Makefile
+++ b/multimedia/avinfo/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	avinfo
 PORTVERSION=	0.7.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://anime.org.ru/soft/avinfo/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 9fb463299565..5040aada46ab 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.42
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://cserv.sourceforge.net/old/
 
 MAINTAINER=	chein@freebsd.org
diff --git a/multimedia/dtv/Makefile b/multimedia/dtv/Makefile
index a885a96b4935..e0515e39ae8a 100644
--- a/multimedia/dtv/Makefile
+++ b/multimedia/dtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dtv
 PORTVERSION=	0.50
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=   http://apollo.backplane.com/FreeBSDPorts/
 
 MAINTAINER=	dillon@backplane.com
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index 345de3db980c..d9e0b1537bdc 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dumpmpeg
 PORTVERSION=	0.6
-CATEGORIES=	graphics
+CATEGORIES=	multimedia graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -16,7 +16,7 @@ MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	Dump frames from mpeg movies
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/graphics/smpeg
+		smpeg:${PORTSDIR}/multimedia/smpeg
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
diff --git a/multimedia/enjoympeg/Makefile b/multimedia/enjoympeg/Makefile
index 5c4f8de2a774..c10bc03bf945 100644
--- a/multimedia/enjoympeg/Makefile
+++ b/multimedia/enjoympeg/Makefile
@@ -8,14 +8,14 @@
 
 PORTNAME=	enjoympeg
 PORTVERSION=	0.4.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freenet.de/for_Ki/
 
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	An MPEG-1 video player
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/graphics/smpeg
+		smpeg:${PORTSDIR}/multimedia/smpeg
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 9c0b85d0c8cf..fb3fa4d7c208 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fxtv
 PORTVERSION=	1.03
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	rhh
 EXTRACT_SUFX=	.tgz
@@ -23,8 +23,8 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 #RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 #		mpg123:${PORTSDIR}/audio/mpg123 \
 #		mpeg_musicin:${PORTSDIR}/audio/mpegaudio \
-#		mpeg_encode:${PORTSDIR}/graphics/mpeg_encode \
-#		mplex:${PORTSDIR}/graphics/mplex
+#		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
+#		mplex:${PORTSDIR}/multimedia/mplex
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index be5ee85eca9e..2b4ee6bad01f 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	gopchop
 PORTVERSION=	0.6
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://outflux.net/unix/software/GOPchop/download/
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile
index 5a9511397c7f..c0289618f263 100644
--- a/multimedia/gxanim/Makefile
+++ b/multimedia/gxanim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxanim
 PORTVERSION=	0.50
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.greslin.org/code/
 DISTNAME=	GXAnim-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	rbt@zort.ca
 COMMENT=	Graphical front end to Xanim
 
-RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
+RUN_DEPENDS=	xanim:${PORTSDIR}/multimedia/xanim
 
 WRKSRC=	${WRKDIR}/gxanim-${PORTVERSION}
 
diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile
index 57c736e620ec..c5d3a589ff49 100644
--- a/multimedia/libfame/Makefile
+++ b/multimedia/libfame/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libfame
 PORTVERSION=	0.9.0
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fame
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index f08bb0c4019d..1a613bd60f70 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	libquicktime
 PORTVERSION=	0.9.1
 PORTREVISION=	2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index dfbb1eba3386..3115865ede8e 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmovie
 PORTVERSION=	1.9.8.1
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	heroines
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
diff --git a/multimedia/mmsclient/Makefile b/multimedia/mmsclient/Makefile
index 4c92abffeb7e..dff66c145885 100644
--- a/multimedia/mmsclient/Makefile
+++ b/multimedia/mmsclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmsclient
 PORTVERSION=	0.0.3
-CATEGORIES=	graphics audio
+CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.geocities.com/majormms/ \
 		ftp://danfe.rimusa.org/tmp/ \
 		http://inet.ssc.nsu.ru/~danfe/
diff --git a/multimedia/mpeg/Makefile b/multimedia/mpeg/Makefile
index 597acee2f782..b1ef2344ed1f 100644
--- a/multimedia/mpeg/Makefile
+++ b/multimedia/mpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg
 PORTVERSION=	1.2.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.uni-koeln.de/graph/mpeg/ \
 		ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/mpeg/mni.mcgill.ca/
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index 00cc50015da0..302254fe471c 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg2codec
 PORTVERSION=	1.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.mpeg.org/pub/mpeg/mssg/
 DISTFILES=	mpeg2vidcodec_v12.tar.gz
 
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index 9ddd34ada3b0..02f43f4f3417 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg2play
 PORTVERSION=	1.1b
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 
 MAINTAINER=	charnier@lirmm.fr
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index 03f0486c8217..da02c1ab992d 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg_encode
 PORTVERSION=	1.5b
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 DISTNAME=	${PKGNAME}-src
 
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 0fa8f646aa65..099a928ff83f 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg_play
 PORTVERSION=	2.4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
 EXTRACT_SUFX=	-patched-src.tar.gz
 
diff --git a/multimedia/mpeg_stat/Makefile b/multimedia/mpeg_stat/Makefile
index fb279a55b1f0..53bc6f1bb345 100644
--- a/multimedia/mpeg_stat/Makefile
+++ b/multimedia/mpeg_stat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg_stat
 PORTVERSION=	2.2b
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
 DISTNAME=	${PKGNAME}-src
 
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index adf49cf03865..1a1b36b891c8 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpegedit
 PORTVERSION=	2.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.netsw.org/graphic/movie/mpeg/mpegedit/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
 
diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index b9989fd78cc4..7b211cecfdce 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mpgtx
 PORTVERSION=	1.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index cb7fba42b04e..580dc8e95f23 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplex
 PORTVERSION=	1.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/general/graphics/mpeg/mplex/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/mtv/Makefile b/multimedia/mtv/Makefile
index ebe1769c1d66..544486226207 100644
--- a/multimedia/mtv/Makefile
+++ b/multimedia/mtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mtv
 PORTVERSION=	1.2.5
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz libSDLx11.so.tar.gz
 
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index b0574f667aa3..70a132daa394 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netshow
 PORTVERSION=	2.00.251
-CATEGORIES=	graphics net linux
+CATEGORIES=	multimedia linux net
 MASTER_SITES=	http://microsoft.com/netshow/download/en/beta/
 DISTNAME=	netshow_linux
 EXTRACT_SUFX=	.gz
diff --git a/multimedia/ppm2fli/Makefile b/multimedia/ppm2fli/Makefile
index a5d6a78c1c37..74b3c43425a0 100644
--- a/multimedia/ppm2fli/Makefile
+++ b/multimedia/ppm2fli/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ppm2fli
 PORTVERSION=	2.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia graphics
 MASTER_SITES=	http://vento.pi.tu-berlin.de/ppm2fli/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 865bf94e75d3..04705a53f037 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	smpeg-xmms
 PORTVERSION=	0.3.4
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia gnome
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A mpeg video plugin for XMMS
 
-LIB_DEPENDS=	smpeg.1:${PORTSDIR}/graphics/smpeg \
+LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg \
 		xmms.3:${PORTSDIR}/multimedia/xmms
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 8bdf55688d7c..9c1cfa5ddbcf 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smpeg
 PORTVERSION=	0.4.4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.lokigames.com/pub/open-source/smpeg/ \
 		ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
 		ftp://boudicca.tux.org/misc/lokigames/open-source/smpeg/ \
diff --git a/multimedia/splitmpg/Makefile b/multimedia/splitmpg/Makefile
index 8fc0fb8fe87d..0e0d0ca81fb1 100644
--- a/multimedia/splitmpg/Makefile
+++ b/multimedia/splitmpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	splitmpg
 PORTVERSION=	1.0
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ibiblio.org/pub/multimedia/utilities/ms-windows/mpegplay/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index 5cd195b4b140..1cf46fcf296e 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	tkxanim
 PORTVERSION=	0.43
-CATEGORIES=	graphics tk82
+CATEGORIES=	multimedia tk82
 MASTER_SITES=	http://members.yourlink.net/aaron/software/linux/
 
 MAINTAINER=	jedgar@fxp.org
 COMMENT=	Tcl/Tk frontend to xanim
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
-		xanim:${PORTSDIR}/graphics/xanim
+		xanim:${PORTSDIR}/multimedia/xanim
 
 WRKSRC=		${WRKDIR}/Tkxanim
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 207dd84db1d3..e47376968f16 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	0.95.1
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.95
 DIST_SUBDIR=	gnome2
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 5d56adf29ac4..f49816f5b182 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
 
 MAINTAINER=	hendrik@scholz.net
@@ -154,7 +154,7 @@ CONFIGURE_ARGS+=	--with-openqt=no
 .endif
 
 .if defined(WITH_FAME)
-LIB_DEPENDS+=	fame-0.9:${PORTSDIR}/graphics/libfame
+LIB_DEPENDS+=	fame-0.9:${PORTSDIR}/multimedia/libfame
 PLIST_SUB+=	WITH_FAME=""
 .else
 PLIST_SUB+=	WITH_FAME="@comment "
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 16e2a6ad620b..d1cf3b6c755a 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.4.4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		ftp://ftp.Awfulhak.org/pub/vlc/ \
 		http://people.FreeBSD.org/~brian/vlc/
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 16e2a6ad620b..d1cf3b6c755a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.4.4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		ftp://ftp.Awfulhak.org/pub/vlc/ \
 		http://people.FreeBSD.org/~brian/vlc/
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index ccbec150b02e..1ac188b7bf55 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xanim
 PORTVERSION=	2.92.0
-CATEGORIES=	graphics
+CATEGORIES=	multimedia graphics
 MASTER_SITES=	ftp://xanim.va.pubnix.com/:main \
 		http://www.go.dlr.de/fresh/unix/src/misc/:main \
 		ftp://xanim.va.pubnix.com/dlls/ \
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 09a58584f9c8..c429a99194b7 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xawtv
 PORTVERSION=	3.86
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://bytesex.org/xawtv/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -57,7 +57,7 @@ CFLAGS+=	-DMMX=1
 
 .if defined(WITH_LIBQTIME)
 CONFIGURE_ARGS+=--enable-quicktime
-LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/graphics/libquicktime
+LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 PLIST_SUB+=	QT=
 .else
 CONFIGURE_ARGS+=--enable-quicktime=no
diff --git a/multimedia/xine_d4d_plugin/Makefile b/multimedia/xine_d4d_plugin/Makefile
index 5cc1fdff6a6a..860e0899fab3 100644
--- a/multimedia/xine_d4d_plugin/Makefile
+++ b/multimedia/xine_d4d_plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine_d4d_plugin
 PORTVERSION=	0.3.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://debianlinux.net/ \
 		http://hermes.homelinux.net/xine/
 
diff --git a/multimedia/xine_d5d_plugin/Makefile b/multimedia/xine_d5d_plugin/Makefile
index f3b694b124ad..2a41b36079c1 100644
--- a/multimedia/xine_d5d_plugin/Makefile
+++ b/multimedia/xine_d5d_plugin/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xine_d5d_plugin
 PORTVERSION=	0.2.7
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://debianlinux.net/ \
 		http://hermes.homelinux.net/xine/
 DISTNAME=	xine-d5d-${PORTVERSION}
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index dfbb1eba3386..3115865ede8e 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmovie
 PORTVERSION=	1.9.8.1
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	heroines
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index a9e4121d2b7a..2df8179f139e 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmps
 PORTVERSION=	0.2.0
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://xmps.sourceforge.net/sources/
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index d356de923ffd..b65ed8b9198c 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	xtheater
 PORTVERSION=	1.0.0.p1
 PORTEPOCH=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Xtheater-${PORTVERSION:S/.p/-pre/}
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MPEG-1 player in GTK+ capable of playing MPEG-1 format streams
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg.1:${PORTSDIR}/graphics/smpeg
+		smpeg.1:${PORTSDIR}/multimedia/smpeg
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config