39 files changed, 75 insertions, 75 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 9fa3c866a5a0..56b64da1e363 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	avifile
 PORTVERSION=	0.7.18.20021107
 PORTEPOCH=	2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://avifile.sourceforge.net/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
 EXTRACT_SUFX=	.tgz
@@ -40,7 +40,7 @@ PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
 
 MAN1=		aviplay.1
 
-#CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+#CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 9e0329ced776..e0100a4d8b41 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	0.4.5
 PORTREVISION=	4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	lioux
 DISTNAME=	ffmpeg-cvs-2002101400
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 9e0329ced776..e0100a4d8b41 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	0.4.5
 PORTREVISION=	4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	lioux
 DISTNAME=	ffmpeg-cvs-2002101400
diff --git a/multimedia/ffmpeg045/Makefile b/multimedia/ffmpeg045/Makefile
index 9e0329ced776..e0100a4d8b41 100644
--- a/multimedia/ffmpeg045/Makefile
+++ b/multimedia/ffmpeg045/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	0.4.5
 PORTREVISION=	4
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	lioux
 DISTNAME=	ffmpeg-cvs-2002101400
diff --git a/multimedia/gstreamer-player/Makefile b/multimedia/gstreamer-player/Makefile
index a7d28bb18ec0..d3c2ae877b07 100644
--- a/multimedia/gstreamer-player/Makefile
+++ b/multimedia/gstreamer-player/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.0
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia audio gnome
 MASTER_SITES=	http://gstreamer.net/releases/0.4.0/src/
 PKGNAMESUFFIX=	-player
 DISTNAME=	gst-player-${PORTVERSION}
@@ -17,11 +17,11 @@ MAINTAINER=	lioux@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gstreamer.0:${PORTSDIR}/graphics/gstreamer \
+		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	gst-visualise:${PORTSDIR}/graphics/gstreamer-plugins
+RUN_DEPENDS=	gst-visualise:${PORTSDIR}/multimedia/gstreamer-plugins
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 1b0f92b1aa69..9458e394c59f 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-plugins
@@ -18,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		gstreamer.0:${PORTSDIR}/graphics/gstreamer \
+		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -267,7 +267,7 @@ PLIST_SUB+=	ARTS=""
 CONFIGURE_ARGS+=	--disable-avifile
 PLIST_SUB+=	AVIFILE="@comment "
 .else
-LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 
 PLIST_SUB+=	AVIFILE=""
 .endif
@@ -380,7 +380,7 @@ PLIST_SUB+=	LIBAUDIOFILE=""
 CONFIGURE_ARGS+=	--disable-libdv
 PLIST_SUB+=	LIBDV="@comment "
 .else
-LIB_DEPENDS+=	dv.2:${PORTSDIR}/graphics/libdv
+LIB_DEPENDS+=	dv.2:${PORTSDIR}/multimedia/libdv
 
 PLIST_SUB+=	LIBDV=""
 .endif
@@ -400,7 +400,7 @@ PLIST_SUB+=	LIBDVDNAV=""
 CONFIGURE_ARGS+=	--disable-dvdread
 PLIST_SUB+=	LIBDVDREAD="@comment "
 .else
-LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/multimedia/libdvdread
 
 PLIST_SUB+=	LIBDVDREAD=""
 .endif
@@ -436,7 +436,7 @@ PLIST_SUB+=	LIBMIKMOD=""
 CONFIGURE_ARGS+=	--disable-mpeg2dec
 PLIST_SUB+=	LIBMPEG2="@comment "
 .else
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
 
 CONFIGURE_ARGS+=	--with-mpeg2dec-prefix=${LOCALBASE}
 PLIST_SUB+=	LIBMPEG2=""
@@ -477,7 +477,7 @@ PLIST_SUB+=	LIBMAD=""
 CONFIGURE_ARGS+=	--disable-openquicktime
 PLIST_SUB+=	OPENQUICKTIME="@comment "
 .else
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 PLIST_SUB+=	OPENQUICKTIME=""
 .endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 1b0f92b1aa69..9458e394c59f 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-plugins
@@ -18,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		gstreamer.0:${PORTSDIR}/graphics/gstreamer \
+		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -267,7 +267,7 @@ PLIST_SUB+=	ARTS=""
 CONFIGURE_ARGS+=	--disable-avifile
 PLIST_SUB+=	AVIFILE="@comment "
 .else
-LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 
 PLIST_SUB+=	AVIFILE=""
 .endif
@@ -380,7 +380,7 @@ PLIST_SUB+=	LIBAUDIOFILE=""
 CONFIGURE_ARGS+=	--disable-libdv
 PLIST_SUB+=	LIBDV="@comment "
 .else
-LIB_DEPENDS+=	dv.2:${PORTSDIR}/graphics/libdv
+LIB_DEPENDS+=	dv.2:${PORTSDIR}/multimedia/libdv
 
 PLIST_SUB+=	LIBDV=""
 .endif
@@ -400,7 +400,7 @@ PLIST_SUB+=	LIBDVDNAV=""
 CONFIGURE_ARGS+=	--disable-dvdread
 PLIST_SUB+=	LIBDVDREAD="@comment "
 .else
-LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/multimedia/libdvdread
 
 PLIST_SUB+=	LIBDVDREAD=""
 .endif
@@ -436,7 +436,7 @@ PLIST_SUB+=	LIBMIKMOD=""
 CONFIGURE_ARGS+=	--disable-mpeg2dec
 PLIST_SUB+=	LIBMPEG2="@comment "
 .else
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
 
 CONFIGURE_ARGS+=	--with-mpeg2dec-prefix=${LOCALBASE}
 PLIST_SUB+=	LIBMPEG2=""
@@ -477,7 +477,7 @@ PLIST_SUB+=	LIBMAD=""
 CONFIGURE_ARGS+=	--disable-openquicktime
 PLIST_SUB+=	OPENQUICKTIME="@comment "
 .else
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 PLIST_SUB+=	OPENQUICKTIME=""
 .endif
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 8b1502a7ecd7..5f29fdc44f5f 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index 8b1502a7ecd7..5f29fdc44f5f 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 8af07e452641..d120bb3544d5 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	GSubEdit
 PORTVERSION=	0.4.p1
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/pre/}
diff --git a/multimedia/libdivxdecore-devel/Makefile b/multimedia/libdivxdecore-devel/Makefile
index 410195e81204..e844feb6cdac 100644
--- a/multimedia/libdivxdecore-devel/Makefile
+++ b/multimedia/libdivxdecore-devel/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	libdivxdecore
 PORTVERSION=	0.4.0.50
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://download.projectmayo.com/dnload/divxcore/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	decore${PORTVERSION:E}src
diff --git a/multimedia/libdivxdecore/Makefile b/multimedia/libdivxdecore/Makefile
index d8ce39a4c96e..90bc2abb5fac 100644
--- a/multimedia/libdivxdecore/Makefile
+++ b/multimedia/libdivxdecore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdivxdecore
 PORTVERSION=	0.4.7
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://download.projectmayo.com/dnload/divx4linux/xmps/
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/multimedia/libdivxencore/Makefile b/multimedia/libdivxencore/Makefile
index cb7b66959f25..20ca163dfb9d 100644
--- a/multimedia/libdivxencore/Makefile
+++ b/multimedia/libdivxencore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdivxencore
 PORTVERSION=	0.4.0.50
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://download.projectmayo.com/dnload/divxcore/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	encore${PORTVERSION:E}src
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index f04ee36b0352..f984e55831c6 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdv
 PORTVERSION=	0.9.8
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	libdv-${PORTVERSION:C/\.(.)$/\1/}
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 77c8a2a93f7f..ee5d1abca663 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libdvdcss
 PORTVERSION=	1.2.2
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 78d1f211a6c8..59ecc19a2df5 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	libdvdread
 PORTVERSION=	0.9.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/graphics/libdvdcss
+LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index d61bf2fb33b9..5e597a81cfe7 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmovtar
 PORTVERSION=	0.1.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 6fd24c429478..04c3d2bf02ae 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	libmpeg2
 PORTVERSION=	0.2.1
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 DISTNAME=	mpeg2dec-${PORTVERSION}
 
diff --git a/multimedia/linux-divx4linux/Makefile b/multimedia/linux-divx4linux/Makefile
index 251add5012e7..974c55c5c496 100644
--- a/multimedia/linux-divx4linux/Makefile
+++ b/multimedia/linux-divx4linux/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	divx4linux
 PORTVERSION=	5.0.${RELEASE_DATE}
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	http://download.divx.com/divx/
-
+PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}501-${RELEASE_DATE}
-
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lioux@FreeBSD.org
diff --git a/multimedia/linux-divx4linux4/Makefile b/multimedia/linux-divx4linux4/Makefile
index 8131ddb87f9f..e89a7ce59806 100644
--- a/multimedia/linux-divx4linux4/Makefile
+++ b/multimedia/linux-divx4linux4/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	divx4linux
 PORTVERSION=	0.${RELEASE_DATE:S/_/./}
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	http://download.divx.com/videocodecs/linux/
+PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${RELEASE_DATE}
 EXTRACT_SUFX=	.tgz
 
diff --git a/multimedia/linux-divxplayer/Makefile b/multimedia/linux-divxplayer/Makefile
index a1a871e86e61..053236f35c29 100644
--- a/multimedia/linux-divxplayer/Makefile
+++ b/multimedia/linux-divxplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	divxplayer
 PORTVERSION=	0.2.0
-CATEGORIES=	graphics linux
+CATEGORIES=	multimedia linux
 MASTER_SITES=	http://download.divx.com/player/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	divx-player-installer
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index a780f69e38a6..6923d59dead1 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linux-realplayer
 PORTVERSION=	8.cs2
-CATEGORIES=	audio graphics linux
+CATEGORIES=	multimedia audio linux
 MASTER_SITES=	# fetch manually
 DISTNAME=	rp${PORTVERSION:R}_linux20_libc6_i386_${PORTVERSION:E}
 EXTRACT_SUFX=	_rpm
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 7de25cec719c..21eb5437224a 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -8,14 +8,14 @@
 PORTNAME=	mjpegtools
 PORTVERSION=	1.6.0
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
 
 MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	aviplay.0:${PORTSDIR}/graphics/avifile \
+LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GNOMENG=	yes
@@ -83,13 +83,13 @@ USE_GNOME+=	gtk12
 .endif
 #
 .ifdef(WITH_LIBDV)
-LIB_DEPENDS+=	dv.2:${PORTSDIR}/graphics/libdv
+LIB_DEPENDS+=	dv.2:${PORTSDIR}/multimedia/libdv
 
 CONFIGURE_ARGS+=	--with-dv=${LOCALBASE}
 .endif
 #
 .ifdef(WITH_LIBMOVTAR)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/graphics/libmovtar
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/multimedia/libmovtar
 
 CONFIGURE_ARGS+=	--with-movtar-prefix=${LOCALBASE}
 .endif
@@ -102,7 +102,7 @@ CONFIGURE_ENV+=		SDL_CONFIG="${SDL_CONFIG}"
 .endif
 #
 .ifdef(WITH_QUICKTIME)
-LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 CONFIGURE_ARGS+=	--with-quicktime=${LOCALBASE}
 .endif
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 894e87a4d42b..b12afcb4875a 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	0.9.6
-CATEGORIES=	graphics audio ipv6 net
+CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/multimedia/mplayer-fonts/Makefile b/multimedia/mplayer-fonts/Makefile
index 9ee37891226b..5ceea751e813 100644
--- a/multimedia/mplayer-fonts/Makefile
+++ b/multimedia/mplayer-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer-fonts
 PORTVERSION=	0.50
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
 		http://www.rrr.de/~riggs/mplayer/
 
diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index b2e7b010fbbc..0b1c7ee54429 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	1.0.3
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/ \
 		http://ftp.mplayerhq.hu/MPlayer/Skin/ \
 		http://www2.mplayerhq.hu/MPlayer/Skin/ \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 31b630f0ff76..52d89627f3db 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mplayer
 PORTVERSION=	0.90.0.10
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia audio
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -101,9 +101,9 @@ CONFIGURE_ARGS+=	--enable-gui
 
 .if defined(WITH_DVD)
 .if !defined(WITH_LIBDVDREAD)
-LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/graphics/libdvdcss
+LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss
 .else
-LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/multimedia/libdvdread
 .endif
 .endif
 
@@ -138,7 +138,7 @@ CONFIGURE_ARGS+=	--with-extraincdir=${LOCALBASE}/include/freetype2 \
 			--enable-freetype
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
 .else
-RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
+RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
 .endif
 
 .if defined(WITH_XANIM)
@@ -181,7 +181,7 @@ RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 CONFIGURE_ARGS+=	--with-win32libdir=${LOCALBASE}/lib/win32
 
-CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif # ARCH == i386
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 3bc12ed7166d..9a3fe03201db 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.8.5
-CATEGORIES=	graphics gnome
+CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
 DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/graphics/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/multimedia/ogle
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
+RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 6ad5eaa492ba..4229e3c111b8 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.8.5
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
 MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
-		dvdread.2:${PORTSDIR}/graphics/libdvdread \
+		dvdread.2:${PORTSDIR}/multimedia/libdvdread \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mad.1:${PORTSDIR}/audio/mad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index dc82ee0a95e3..7509dcdf906b 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ogmtools
 PORTVERSION=	0.9.60
 PORTREVISION=	1
-CATEGORIES=	graphics audio
+CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.{2})$/\1/}
 
@@ -45,7 +45,7 @@ WITH_DVDREAD=yes
 .endif
 
 .ifdef(WITH_DVDREAD)
-LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS+=	dvdread.2:${PORTSDIR}/multimedia/libdvdread
 
 CONFIGURE_ARGS+=	--with-dvdread \
 			--with-dvdread-includes=${LOCALBASE} \
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index f96c08d571cf..0e1bbc508012 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	okle
 PORTVERSION=	0.2.3
-CATEGORIES=	graphics kde
+CATEGORIES=	multimedia kde
 MASTER_SITES=	http://okle.sourceforge.net/
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/graphics/ogle
-RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/multimedia/ogle
+RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
 USE_AUTOCONF_VER=	253
 USE_KDELIBS_VER=	3
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index e8abad0e6806..0d0e8305ba7c 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openquicktime
 PORTVERSION=	1.0
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index eee350955b87..0d1f0cd68a5a 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OQTEncoder
 PORTVERSION=	0.1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 5b47ac6e6aaf..17f5c0f200ef 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OQTPlayer
 PORTVERSION=	0.5
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openquicktime
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=    SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
-		openquicktime.0:${PORTSDIR}/graphics/openquicktime
+		openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index 1fef642bac8e..540068b0cd51 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	win32-codecs
 PORTVERSION=	${CODEC_VERSION}.0.${CODEC_MPLAYER_VERSION}
-CATEGORIES=	graphics audio
+CATEGORIES=	multimedia audio
 MASTER_SITES=	http://avifile.sourceforge.net/:binaries \
 		http://ernie.eit.uni-kl.de/avifile/ \
 		http://mplayerhq.hu/MPlayer/releases/:w32codec \
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 3a2ceff9c32d..3eccbdfca1cc 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	roman@xpert.com
 BROKEN=		Maintainer is working on a fix
 
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS=	aviplay-0.7.0:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
 RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 
 SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 1276a42835fb..83f875e7e9a6 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xmms
 PORTVERSION=	1.2.7
 PORTREVISION=	3
-CATEGORIES+=	audio
+CATEGORIES+=	multimedia audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		http://www.xmms.org/files/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
diff --git a/multimedia/xmps-opendivx-plugin/Makefile b/multimedia/xmps-opendivx-plugin/Makefile
index 715329c3c267..4394a69eabe5 100644
--- a/multimedia/xmps-opendivx-plugin/Makefile
+++ b/multimedia/xmps-opendivx-plugin/Makefile
@@ -8,12 +8,12 @@
 PORTNAME=	xmps-opendivx-plugin
 PORTVERSION=	0.0.1
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://download.projectmayo.com/dnload/divx4linux/xmps/
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
+LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/multimedia/libdivxdecore \
 		xmps.0:${PORTSDIR}/graphics/xmps \
 		intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index bc835054bf49..a5510c10e366 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xmps-win32-plugin
 PORTVERSION=	0.0.4
 PORTREVISION=	1
-CATEGORIES=	graphics
+CATEGORIES=	multimedia
 MASTER_SITES=	http://xmps.sourceforge.net/sources/
 
 MAINTAINER=	lioux@FreeBSD.org
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
-#CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+#CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 LIB_VERSION=	0