summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--audio/flac/Makefile4
-rw-r--r--audio/gkrellmms/Makefile2
-rw-r--r--audio/gkrellmms2/Makefile2
-rw-r--r--audio/p5-Xmms/Makefile2
-rw-r--r--audio/py-xmms/Makefile4
-rw-r--r--audio/rebler/Makefile4
-rw-r--r--audio/ruby-xmms/Makefile2
-rw-r--r--audio/teknap/Makefile2
-rw-r--r--audio/uade/Makefile2
-rw-r--r--audio/wmusic/Makefile4
-rw-r--r--audio/xmms-a52dec/Makefile2
-rw-r--r--audio/xmms-bonk/Makefile2
-rw-r--r--audio/xmms-crossfade/Makefile2
-rw-r--r--audio/xmms-crystality/Makefile2
-rw-r--r--audio/xmms-fc/Makefile4
-rw-r--r--audio/xmms-kde/Makefile2
-rw-r--r--audio/xmms-ladspa/Makefile2
-rw-r--r--audio/xmms-liveice/Makefile2
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-mailnotify/Makefile2
-rw-r--r--audio/xmms-midi/Makefile2
-rw-r--r--audio/xmms-musepack/Makefile2
-rw-r--r--audio/xmms-osssurround/Makefile2
-rw-r--r--audio/xmms-pipe/Makefile4
-rw-r--r--audio/xmms-quix3dn/Makefile2
-rw-r--r--audio/xmms-shn/Makefile4
-rw-r--r--audio/xmms-sid/Makefile4
-rw-r--r--audio/xmms-sndfile/Makefile2
-rw-r--r--audio/xmms-sndstretch/Makefile2
-rw-r--r--audio/xmms-speex/Makefile4
-rw-r--r--audio/xmms-tfmx/Makefile2
-rw-r--r--audio/xmms-uade/Makefile2
-rw-r--r--audio/xmms-volnorm/Makefile2
-rw-r--r--chinese/mplayer-fonts/Makefile4
-rw-r--r--chinese/xmms/Makefile4
-rw-r--r--graphics/ImageMagick/Makefile2
-rw-r--r--graphics/avidemux/Makefile2
-rw-r--r--graphics/gopchop/Makefile4
-rw-r--r--graphics/libdvdnav/Makefile2
-rw-r--r--graphics/libquicktime/Makefile2
-rw-r--r--graphics/libxine/Makefile2
-rw-r--r--graphics/smpeg-xmms/Makefile2
-rw-r--r--graphics/tosvcd/Makefile2
-rw-r--r--graphics/transcode/Makefile12
-rw-r--r--graphics/vlc/Makefile4
-rw-r--r--graphics/xine/Makefile2
-rw-r--r--graphics/xine_d5d_plugin/Makefile2
-rw-r--r--graphics/xmms-blursk/Makefile4
-rw-r--r--graphics/xmms-finespectrum/Makefile4
-rw-r--r--graphics/xmms-fishmatic/Makefile4
-rw-r--r--graphics/xmms-gdancer/Makefile2
-rw-r--r--graphics/xmms-gforce/Makefile4
-rw-r--r--graphics/xmms-goom/Makefile4
-rw-r--r--graphics/xmms-infinity/Makefile4
-rw-r--r--graphics/xmms-iris/Makefile4
-rw-r--r--graphics/xmms-jess/Makefile4
-rw-r--r--graphics/xmms-nebulus/Makefile4
-rw-r--r--graphics/xmms-paranormal/Makefile4
-rw-r--r--graphics/xmms-xvs/Makefile4
-rw-r--r--irc/bitchx/Makefile2
-rw-r--r--japanese/srd-fpw-package/Makefile2
-rw-r--r--korean/mplayer-fonts/Makefile2
-rw-r--r--misc/xosd/Makefile2
-rw-r--r--multimedia/avidemux/Makefile2
-rw-r--r--multimedia/gopchop/Makefile4
-rw-r--r--multimedia/libdvdnav/Makefile2
-rw-r--r--multimedia/libquicktime/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/smpeg-xmms/Makefile2
-rw-r--r--multimedia/tosvcd/Makefile2
-rw-r--r--multimedia/transcode/Makefile12
-rw-r--r--multimedia/vlc-devel/Makefile4
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/xine/Makefile2
-rw-r--r--multimedia/xine_d5d_plugin/Makefile2
-rw-r--r--net-p2p/teknap/Makefile2
-rw-r--r--net/gabber/Makefile2
-rw-r--r--science/flounder/Makefile2
-rw-r--r--sysutils/vobcopy/Makefile2
-rw-r--r--www/plugger/Makefile4
-rw-r--r--x11-clocks/xmms-alarm/Makefile4
81 files changed, 121 insertions, 121 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 7d8e19b36050..e6c7bbd2f058 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
.if defined(WITH_XMMS)
# id3lib is only used by the XMMS plugin
-BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS+= id3-3.7.13:${PORTSDIR}/audio/id3lib \
- xmms.3:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/multimedia/xmms
CONFIGURE_ARGS+=--with-id3lib="${LOCALBASE}"
PLIST_SUB= XMMS=""
.else
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index cba297066c6c..312a79e6c664 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= ume@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index b6621bc00c8a..70ab5b2b3179 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= ume@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
diff --git a/audio/p5-Xmms/Makefile b/audio/p5-Xmms/Makefile
index 121d94ecd5c8..0ae851f15704 100644
--- a/audio/p5-Xmms/Makefile
+++ b/audio/p5-Xmms/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= jeremy@external.org
-BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms \
+BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \
${site_perl}/MPEG/MP3Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
${site_perl}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor \
${site_perl}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 3f888d4c6650..e71e446a73e9 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -14,8 +14,8 @@ DISTNAME= pyxmms-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
-BUILD_DEPENDS= ${XMMS_CONFIG}:${PORTSDIR}/audio/xmms
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= ${XMMS_CONFIG}:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/audio/rebler/Makefile b/audio/rebler/Makefile
index a5725f4b0503..13562f8afa0d 100644
--- a/audio/rebler/Makefile
+++ b/audio/rebler/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= mpeg2:${PORTSDIR}/graphics/libmpeg2 \
- aviplay-0.7:${PORTSDIR}/graphics/avifile \
+LIB_DEPENDS= mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
+ aviplay-0.7:${PORTSDIR}/multimedia/avifile \
popt:${PORTSDIR}/devel/popt
USE_BZIP2= yes
diff --git a/audio/ruby-xmms/Makefile b/audio/ruby-xmms/Makefile
index d5964a8a2d2f..4065a8ea46e4 100644
--- a/audio/ruby-xmms/Makefile
+++ b/audio/ruby-xmms/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile
index d82f5ee076a5..a966df18164d 100644
--- a/audio/teknap/Makefile
+++ b/audio/teknap/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= calle.madestrand@norrgarden.se
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
.endif
.if defined(WITH_XMMS)
-BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
.endif
WRKSRC= ${WRKDIR}/TekNap
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index 5f7dad6edc8c..1846b524b043 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -13,7 +13,7 @@ DISTFILES= uade-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mbr@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
USE_X_PREFIX= yes
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index e7011ab44c17..d8188f791988 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES= http://home.jtan.com/~john/wmusic/downloads/
MAINTAINER= eric@FreeBSD.org
-BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index c42ed061912d..d07e4a0a8604 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= xmms-a52dec
MAINTAINER= verm@drunkmonk.net
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms \
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms \
a52.0:${PORTSDIR}/audio/liba52
RUN_DEPENDS= ${X11BASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround
diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index aa42d903ac8c..57fcc4166351 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -12,7 +12,7 @@ DISTNAME= bonk-xmms-${PORTVERSION}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
ALL_TARGET=
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 3c56271ae0cd..26ad9b578f48 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
MAINTAINER= pat@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_LIBTOOL= yes
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 14b51cd05ce2..dc13f1413d5e 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-plugin-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/xmms-fc/Makefile b/audio/xmms-fc/Makefile
index afe13133de01..679e338e9d75 100644
--- a/audio/xmms-fc/Makefile
+++ b/audio/xmms-fc/Makefile
@@ -13,8 +13,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index 4c0efa6660c4..655af50209fc 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -14,7 +14,7 @@ DISTNAME= xmmskde-${PORTVERSION}
MAINTAINER= jan@jungnickel.com
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_KDELIBS_VER=3
WRKSRC= ${WRKDIR}/${DISTNAME:S/0.0/0/}
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index 6f41e5496848..4575ddc167ba 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -13,7 +13,7 @@ DISTNAME= xmms_ladspa-${PORTVERSION}
MAINTAINER= arved@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
WRKSRC= ${WRKDIR}/xmms_ladspa
USE_X_PREFIX= yes
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 26d3a4875be9..38ba5f0c1101 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -13,7 +13,7 @@ DISTNAME= liveice-xmms
MAINTAINER= esk@ira.uka.de
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= lame:${PORTSDIR}/audio/lame
WRKSRC= ${WRKDIR}/LiveIce-1.0.0
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index e22d0a9c7b5d..0aa4c449ee4d 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -14,8 +14,8 @@ MASTER_SITE_SUBDIR= xmms-mad
MAINTAINER= dyeske@yahoo.com
LIB_DEPENDS= mad.1:${PORTSDIR}/audio/mad
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 47bb7f9a5694..9518bc29acd4 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= arved
MAINTAINER= arved@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_LIBTOOL= yes
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 7af5f51d5fb7..a0c000a0b73d 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://ban.joh.cam.ac.uk/~cr212/xmms-midi/
MAINTAINER= hendrik@scholz.net
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GNOMENG= yes
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index e7a99ad12d73..a51abd3888f7 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.musepack.info/dl/
MAINTAINER= walter@binity.com
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/audio/xmms-osssurround/Makefile b/audio/xmms-osssurround/Makefile
index cf834114c58d..9a66257dd7bf 100644
--- a/audio/xmms-osssurround/Makefile
+++ b/audio/xmms-osssurround/Makefile
@@ -14,7 +14,7 @@ DISTNAME= xmms-a52dec-1.0
MAINTAINER= verm@drunkmonk.net
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/xmms-pipe/Makefile b/audio/xmms-pipe/Makefile
index 97738f832339..12dd46f0da59 100644
--- a/audio/xmms-pipe/Makefile
+++ b/audio/xmms-pipe/Makefile
@@ -14,8 +14,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/audio/xmms-quix3dn/Makefile b/audio/xmms-quix3dn/Makefile
index 1ff3ef6ac388..7eb102bc06ea 100644
--- a/audio/xmms-quix3dn/Makefile
+++ b/audio/xmms-quix3dn/Makefile
@@ -13,7 +13,7 @@ DISTNAME= quix3dn-${PORTVERSION}-freebsd
MAINTAINER= alex@FreeBSD.org
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
NO_BUILD= yes
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 66d913b7304e..54eca1d58d3a 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -12,8 +12,8 @@ MASTER_SITES= http://shnutils.freeshell.org/xmms-shn/source/
MAINTAINER= naddy@FreeBSD.Org
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 3cc7739fa979..51f3d7f4081b 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://www.tnsp.org/xs-files/
MAINTAINER= dyeske@yahoo.com
LIB_DEPENDS= sidplay.1:${PORTSDIR}/audio/libsidplay
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index 3f4dfac52892..85a1f14a0cf6 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -14,7 +14,7 @@ DISTNAME= xmms_sndfile-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
- xmms.3:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/multimedia/xmms
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index f5d7ac19bb41..027d3867567f 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -14,7 +14,7 @@ DISTNAME= sndstretch_xmms-${PORTVERSION}
MAINTAINER= ports@edwinm.ik.nu
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
WRKSRC= ${WRKDIR}/sndstretch_xmms
diff --git a/audio/xmms-speex/Makefile b/audio/xmms-speex/Makefile
index 7e808dc788ff..1d981982006a 100644
--- a/audio/xmms-speex/Makefile
+++ b/audio/xmms-speex/Makefile
@@ -13,9 +13,9 @@ DISTNAME= speex-xmms-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS= speex.0:${PORTSDIR}/audio/speex
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
WRKSRC= ${WRKDIR}/speex-xmms
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index 22ec6cb7a393..105358766144 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index 5f7dad6edc8c..1846b524b043 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -13,7 +13,7 @@ DISTFILES= uade-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mbr@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
USE_X_PREFIX= yes
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index 9e00ed8cd84f..56498b7d3b50 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= xmms-
MAINTAINER= pat@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/chinese/mplayer-fonts/Makefile b/chinese/mplayer-fonts/Makefile
index 3b422d5cf1a0..0f6575902e8a 100644
--- a/chinese/mplayer-fonts/Makefile
+++ b/chinese/mplayer-fonts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mplayer-fonts
PORTVERSION= 0.50
-CATEGORIES= chinese graphics
+CATEGORIES= chinese multimedia
MASTER_SITES= ftp://ftp.mplayerhq.hu/MPlayer/contrib/fonts/chinesefonts/ \
ftp://freebsd.sinica.edu.tw/pub/statue/mplayer/
DISTFILES= big5-kai.tar.bz big5-ming.tar.bz \
@@ -15,7 +15,7 @@ DISTFILES= big5-kai.tar.bz big5-ming.tar.bz \
MAINTAINER= statue@freebsd.sinica.edu.tw
-RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
+RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/chinese/xmms/Makefile b/chinese/xmms/Makefile
index 32ca4cc3f8e5..09fd6f72cc87 100644
--- a/chinese/xmms/Makefile
+++ b/chinese/xmms/Makefile
@@ -5,9 +5,9 @@
# $FreeBSD$
#
-CATEGORIES= chinese
+CATEGORIES= chinese multimedia
-MASTERDIR= ${.CURDIR}/../../audio/xmms
+MASTERDIR= ${.CURDIR}/../../multimedia/xmms
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= sobomax
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5824dcd6fa21..593f1933664c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -107,7 +107,7 @@ RUN_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu-nox11
CONFIGURE_ARGS+= --without-x --without-mpeg2
PLIST_SUB+= X11='@comment '
.else
-LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/graphics/libmpeg2
+LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
BUILD_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu
RUN_DEPENDS+= gs:${PORTSDIR}/print/ghostscript-gnu
USE_XLIB= yes
diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile
index 2a2d7d5b1cb5..933d5e8dedf0 100644
--- a/graphics/avidemux/Makefile
+++ b/graphics/avidemux/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xvidcore.0:${PORTSDIR}/graphics/xvid \
mp3lame.0:${PORTSDIR}/audio/lame \
mad.1:${PORTSDIR}/audio/mad
BUILD_DEPENDS= \
- ${LINUXBASE}/usr/include/divx/decore.h:${PORTSDIR}/graphics/divx4linux \
+ ${LINUXBASE}/usr/include/divx/decore.h:${PORTSDIR}/multimedia/divx4linux \
${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
WRKSRC= ${WRKDIR}/avidemux-0.9pre16
diff --git a/graphics/gopchop/Makefile b/graphics/gopchop/Makefile
index be0d1144609f..46b5540151d9 100644
--- a/graphics/gopchop/Makefile
+++ b/graphics/gopchop/Makefile
@@ -17,9 +17,9 @@ DISTNAME= GOPchop-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/lib/libvo.a:${PORTSDIR}/graphics/libmpeg2
+BUILD_DEPENDS= ${LOCALBASE}/lib/libvo.a:${PORTSDIR}/multimedia/libmpeg2
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- mpeg2.0:${PORTSDIR}/graphics/libmpeg2
+ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
USE_GNOMENG= yes
USE_GNOME= gtk12
diff --git a/graphics/libdvdnav/Makefile b/graphics/libdvdnav/Makefile
index 090a37826efd..ee145f9fc62b 100644
--- a/graphics/libdvdnav/Makefile
+++ b/graphics/libdvdnav/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= dvd
MAINTAINER= nobutaka@FreeBSD.org
-LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS= dvdread.2:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/graphics/libquicktime/Makefile b/graphics/libquicktime/Makefile
index 37f5f2a94b46..ce37b80794bb 100644
--- a/graphics/libquicktime/Makefile
+++ b/graphics/libquicktime/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- dv.2:${PORTSDIR}/graphics/libdv \
+ dv.2:${PORTSDIR}/multimedia/libdv \
png.5:${PORTSDIR}/graphics/png
USE_MESA= yes
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 94aa49edfcc9..b6edd9f3bc1f 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg \
+BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/multimedia/ffmpeg \
${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index ae1e67b6adb9..e97b57f4fc78 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg \
- xmms.3:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/graphics/tosvcd/Makefile b/graphics/tosvcd/Makefile
index 61279544b655..9834157c1017 100644
--- a/graphics/tosvcd/Makefile
+++ b/graphics/tosvcd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://muse.seh.de/tosvcd/
MAINTAINER= ports@FreeBSD.org
-RUN_DEPNDS= mpeg2enc:${PORTSDIR}/graphics/mjpegtools \
+RUN_DEPNDS= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
vcdimager:${PORTSDIR}/graphics/vcdimager
USE_BZIP2= yes
diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
index 380bc457e4cb..a6d91e5c0619 100644
--- a/graphics/transcode/Makefile
+++ b/graphics/transcode/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pr
MAINTAINER= hendrik@scholz.net
-LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread \
+LIB_DEPENDS= dvdread.2:${PORTSDIR}/multimedia/libdvdread \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -108,7 +108,7 @@ ONLY_FOR_ARCHS= i386
.endif
.if defined(WITH_AVIFILE)
-LIB_DEPENDS+= aviplay:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile
PLIST_SUB+= WITH_AVIFILE=""
.else
CONFIGURE_ARGS+= --with-avifile-mods=no \
@@ -133,14 +133,14 @@ PLIST_SUB+= WITH_LIBXML2="@comment "
.endif
.if defined(WITH_FFMPEG) && !defined(WITHOUT_FFMPEG)
-BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/graphics/ffmpeg
+BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= WITH_FFMPEG=""
.else
PLIST_SUB+= WITH_FFMPEG="@comment "
.endif
.if defined(WITH_LIBDV)
-LIB_DEPENDS+= dv.2:${PORTSDIR}/graphics/libdv
+LIB_DEPENDS+= dv.2:${PORTSDIR}/multimedia/libdv
PLIST_SUB+= WITH_LIBDV=""
CONFIGURE_ARGS+= --with-pal-yuv=YV12
.else
@@ -149,7 +149,7 @@ PLIST_SUB+= WITH_LIBDV="@comment "
.endif
.if defined(WITH_OPENQUICKTIME)
-LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime
.else
CONFIGURE_ARGS+= --with-openqt=no
.endif
@@ -197,7 +197,7 @@ PLIST_SUB+= WITH_OGG="@comment "
.endif
.if defined(WITH_MJPEG)
-LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/graphics/mjpegtools
+LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/multimedia/mjpegtools
PLIST_SUB+= WITH_MJPEG=""
.else
PLIST_SUB+= WITH_MJPEG="@comment "
diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile
index 3c0a9671e7f9..99a5dd41df9b 100644
--- a/graphics/vlc/Makefile
+++ b/graphics/vlc/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
MAINTAINER= brian@FreeBSD.org
-LIB_DEPENDS= dvdcss.2:${PORTSDIR}/graphics/libdvdcss \
- dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
+ dvdread.2:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index 8d2014f04fbd..354404c7fb1d 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -41,7 +41,7 @@ MAN1= aaxine.1 xine.1 xine-bugreport.1 xine-check.1 xine-remote.1
.if !defined(WITHOUT_WIN32_CODECS)
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
-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
diff --git a/graphics/xine_d5d_plugin/Makefile b/graphics/xine_d5d_plugin/Makefile
index 068768b3bc01..8b52c12a6bc5 100644
--- a/graphics/xine_d5d_plugin/Makefile
+++ b/graphics/xine_d5d_plugin/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= nobutaka@FreeBSD.org
LIB_DEPENDS= xine.2:${PORTSDIR}/graphics/libxine \
- dvdread.2:${PORTSDIR}/graphics/libdvdread
+ dvdread.2:${PORTSDIR}/multimedia/libdvdread
USE_AUTOMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/xmms-blursk/Makefile b/graphics/xmms-blursk/Makefile
index 2499120afe89..f274611d66b9 100644
--- a/graphics/xmms-blursk/Makefile
+++ b/graphics/xmms-blursk/Makefile
@@ -14,8 +14,8 @@ DISTNAME= Blursk-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/graphics/xmms-finespectrum/Makefile b/graphics/xmms-finespectrum/Makefile
index e19b1cf7d919..bcf9eb1de692 100644
--- a/graphics/xmms-finespectrum/Makefile
+++ b/graphics/xmms-finespectrum/Makefile
@@ -14,8 +14,8 @@ DISTNAME= finespectrum-1.0.1alpha
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile
index 23eb8c9b4ed1..7a9507ed3fcf 100644
--- a/graphics/xmms-fishmatic/Makefile
+++ b/graphics/xmms-fishmatic/Makefile
@@ -13,8 +13,8 @@ DISTNAME= fishmatic
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/graphics/xmms-gdancer/Makefile b/graphics/xmms-gdancer/Makefile
index 9ea4ccc58558..6ff13886b306 100644
--- a/graphics/xmms-gdancer/Makefile
+++ b/graphics/xmms-gdancer/Makefile
@@ -13,7 +13,7 @@ DISTNAME= gdancer-$(PORTVERSION)
MAINTAINER= netchild@FreeBSD.org
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms \
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
USE_X_PREFIX= yes
diff --git a/graphics/xmms-gforce/Makefile b/graphics/xmms-gforce/Makefile
index 4a10540631b3..9280552e8fc1 100644
--- a/graphics/xmms-gforce/Makefile
+++ b/graphics/xmms-gforce/Makefile
@@ -13,8 +13,8 @@ DISTNAME= gforce-1.1.6xp3
MAINTAINER= erwin@lansing.dk
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile
index 45880ec6c2ce..4b81720e0359 100644
--- a/graphics/xmms-goom/Makefile
+++ b/graphics/xmms-goom/Makefile
@@ -16,9 +16,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms \
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms \
nasm:${PORTSDIR}/devel/nasm
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/xmms-infinity/Makefile b/graphics/xmms-infinity/Makefile
index b94f55e93015..a6cb991cf370 100644
--- a/graphics/xmms-infinity/Makefile
+++ b/graphics/xmms-infinity/Makefile
@@ -13,9 +13,9 @@ DISTNAME= infinity-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
-LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms \
+LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms \
SDL-1.1.4:${PORTSDIR}/devel/sdl12
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/graphics/xmms-iris/Makefile b/graphics/xmms-iris/Makefile
index 57cd06fe7be8..921fa1b063bc 100644
--- a/graphics/xmms-iris/Makefile
+++ b/graphics/xmms-iris/Makefile
@@ -13,8 +13,8 @@ PKGNAMEPREFIX= xmms-
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
USE_GNOMENG= yes
diff --git a/graphics/xmms-jess/Makefile b/graphics/xmms-jess/Makefile
index cf4a956d5024..51f0873ead8d 100644
--- a/graphics/xmms-jess/Makefile
+++ b/graphics/xmms-jess/Makefile
@@ -13,9 +13,9 @@ DISTNAME= JESS-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile
index af5f7801e755..01441b249411 100644
--- a/graphics/xmms-nebulus/Makefile
+++ b/graphics/xmms-nebulus/Makefile
@@ -12,9 +12,9 @@ MASTER_SITES= http://nebulus.tuxfamily.org/
MAINTAINER= dyeske@yahoo.com
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/graphics/xmms-paranormal/Makefile b/graphics/xmms-paranormal/Makefile
index 9f3417950cd3..2154c34775e4 100644
--- a/graphics/xmms-paranormal/Makefile
+++ b/graphics/xmms-paranormal/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= dyeske@yahoo.com
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
SDL-1.1.4:${PORTSDIR}/devel/sdl12
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
CONFIGURE_ENV+= CFLAGS="-I${LOCALBASE}/include/libxml2/libxml" SDL_CONFIG="${SDL_CONFIG}"
diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index 5c25f1899155..e7ffff629af3 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -14,9 +14,9 @@ DISTNAME= xvs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
XML2_CONFIG?= ${LOCALBASE}/bin/xml2-config
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index c502e932d336..884fd6d24f93 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -24,7 +24,7 @@ EXTRACT_ONLY= ircii-pana-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER?= arved@FreeBSD.org
.if defined(WITH_XMMS)
-LIB_DEPENDS+= xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS+= xmms.3:${PORTSDIR}/multimedia/xmms
.endif
WRKSRC= ${WRKDIR}/BitchX
diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile
index 9510f8b69f8d..81f5c4fb2f5f 100644
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= taoka@FreeBSD.org
RUN_DEPENDS= display:${PORTSDIR}/graphics/ImageMagick
# Your PC does not have an audio card always.
-# realplay:${PORTSDIR}/audio/linux-realplayer
+# realplay:${PORTSDIR}/multimedia/linux-realplayer
NO_BUILD= yes
PLIST_SUB= PKGNAME=${PKGNAME}
diff --git a/korean/mplayer-fonts/Makefile b/korean/mplayer-fonts/Makefile
index e2219694085d..c86396793343 100644
--- a/korean/mplayer-fonts/Makefile
+++ b/korean/mplayer-fonts/Makefile
@@ -6,7 +6,7 @@
PORTNAME= mplayer-fonts
PORTVERSION= 1.0
-CATEGORIES= korean graphics
+CATEGORIES= korean multimedia
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.freebsd.org/~perky/distfiles/ \
http://www.yonsei.ac.kr/yu/intro/symbol/:yonsei
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 36fa351f574b..b344ded668c6 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.ignavus.net/
MAINTAINER= perky@FreeBSD.org
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- xmms.3:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/multimedia/xmms
XMMS_CONFIG?= ${X11BASE}/bin/xmms-config
USE_X_PREFIX= yes
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 2a2d7d5b1cb5..933d5e8dedf0 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= xvidcore.0:${PORTSDIR}/graphics/xvid \
mp3lame.0:${PORTSDIR}/audio/lame \
mad.1:${PORTSDIR}/audio/mad
BUILD_DEPENDS= \
- ${LINUXBASE}/usr/include/divx/decore.h:${PORTSDIR}/graphics/divx4linux \
+ ${LINUXBASE}/usr/include/divx/decore.h:${PORTSDIR}/multimedia/divx4linux \
${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
WRKSRC= ${WRKDIR}/avidemux-0.9pre16
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index be0d1144609f..46b5540151d9 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -17,9 +17,9 @@ DISTNAME= GOPchop-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/lib/libvo.a:${PORTSDIR}/graphics/libmpeg2
+BUILD_DEPENDS= ${LOCALBASE}/lib/libvo.a:${PORTSDIR}/multimedia/libmpeg2
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- mpeg2.0:${PORTSDIR}/graphics/libmpeg2
+ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
USE_GNOMENG= yes
USE_GNOME= gtk12
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 090a37826efd..ee145f9fc62b 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= dvd
MAINTAINER= nobutaka@FreeBSD.org
-LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS= dvdread.2:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 37f5f2a94b46..ce37b80794bb 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- dv.2:${PORTSDIR}/graphics/libdv \
+ dv.2:${PORTSDIR}/multimedia/libdv \
png.5:${PORTSDIR}/graphics/png
USE_MESA= yes
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 94aa49edfcc9..b6edd9f3bc1f 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg \
+BUILD_DEPENDS= ${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/multimedia/ffmpeg \
${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index ae1e67b6adb9..e97b57f4fc78 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg \
- xmms.3:${PORTSDIR}/audio/xmms
+ xmms.3:${PORTSDIR}/multimedia/xmms
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/multimedia/tosvcd/Makefile b/multimedia/tosvcd/Makefile
index 61279544b655..9834157c1017 100644
--- a/multimedia/tosvcd/Makefile
+++ b/multimedia/tosvcd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://muse.seh.de/tosvcd/
MAINTAINER= ports@FreeBSD.org
-RUN_DEPNDS= mpeg2enc:${PORTSDIR}/graphics/mjpegtools \
+RUN_DEPNDS= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
vcdimager:${PORTSDIR}/graphics/vcdimager
USE_BZIP2= yes
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 380bc457e4cb..a6d91e5c0619 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pr
MAINTAINER= hendrik@scholz.net
-LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread \
+LIB_DEPENDS= dvdread.2:${PORTSDIR}/multimedia/libdvdread \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -108,7 +108,7 @@ ONLY_FOR_ARCHS= i386
.endif
.if defined(WITH_AVIFILE)
-LIB_DEPENDS+= aviplay:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile
PLIST_SUB+= WITH_AVIFILE=""
.else
CONFIGURE_ARGS+= --with-avifile-mods=no \
@@ -133,14 +133,14 @@ PLIST_SUB+= WITH_LIBXML2="@comment "
.endif
.if defined(WITH_FFMPEG) && !defined(WITHOUT_FFMPEG)
-BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/graphics/ffmpeg
+BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= WITH_FFMPEG=""
.else
PLIST_SUB+= WITH_FFMPEG="@comment "
.endif
.if defined(WITH_LIBDV)
-LIB_DEPENDS+= dv.2:${PORTSDIR}/graphics/libdv
+LIB_DEPENDS+= dv.2:${PORTSDIR}/multimedia/libdv
PLIST_SUB+= WITH_LIBDV=""
CONFIGURE_ARGS+= --with-pal-yuv=YV12
.else
@@ -149,7 +149,7 @@ PLIST_SUB+= WITH_LIBDV="@comment "
.endif
.if defined(WITH_OPENQUICKTIME)
-LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/graphics/openquicktime
+LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime
.else
CONFIGURE_ARGS+= --with-openqt=no
.endif
@@ -197,7 +197,7 @@ PLIST_SUB+= WITH_OGG="@comment "
.endif
.if defined(WITH_MJPEG)
-LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/graphics/mjpegtools
+LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/multimedia/mjpegtools
PLIST_SUB+= WITH_MJPEG=""
.else
PLIST_SUB+= WITH_MJPEG="@comment "
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 3c0a9671e7f9..99a5dd41df9b 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
MAINTAINER= brian@FreeBSD.org
-LIB_DEPENDS= dvdcss.2:${PORTSDIR}/graphics/libdvdcss \
- dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
+ dvdread.2:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 3c0a9671e7f9..99a5dd41df9b 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
MAINTAINER= brian@FreeBSD.org
-LIB_DEPENDS= dvdcss.2:${PORTSDIR}/graphics/libdvdcss \
- dvdread.2:${PORTSDIR}/graphics/libdvdread
+LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
+ dvdread.2:${PORTSDIR}/multimedia/libdvdread
GNU_CONFIGURE= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 8d2014f04fbd..354404c7fb1d 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -41,7 +41,7 @@ MAN1= aaxine.1 xine.1 xine-bugreport.1 xine-check.1 xine-remote.1
.if !defined(WITHOUT_WIN32_CODECS)
RUN_DEPENDS= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
-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
diff --git a/multimedia/xine_d5d_plugin/Makefile b/multimedia/xine_d5d_plugin/Makefile
index 068768b3bc01..8b52c12a6bc5 100644
--- a/multimedia/xine_d5d_plugin/Makefile
+++ b/multimedia/xine_d5d_plugin/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= nobutaka@FreeBSD.org
LIB_DEPENDS= xine.2:${PORTSDIR}/graphics/libxine \
- dvdread.2:${PORTSDIR}/graphics/libdvdread
+ dvdread.2:${PORTSDIR}/multimedia/libdvdread
USE_AUTOMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
index d82f5ee076a5..a966df18164d 100644
--- a/net-p2p/teknap/Makefile
+++ b/net-p2p/teknap/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= calle.madestrand@norrgarden.se
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
.endif
.if defined(WITH_XMMS)
-BUILD_DEPENDS= xmms:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
.endif
WRKSRC= ${WRKDIR}/TekNap
diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index e34c14a67158..6378136d05c9 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
.if defined(WITH_XMMS)
-BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
.endif
LIB_DEPENDS= gnomemm.9:${PORTSDIR}/x11-toolkits/gnome--
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index 5993ce3e9ed1..e5204d952a29 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
USE_GMAKE= yes
.if !defined(WITHOUT_AVIFILE)
-LIB_DEPENDS+= aviplay:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile
CONFIGURE_ARGS+= --enable-avifile
.endif
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index 07c07862416e..92ba25a11f33 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://lpn.rnbhq.org/download/
MAINTAINER= lioux@FreeBSD.org
-LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread \
+LIB_DEPENDS= dvdread.2:${PORTSDIR}/multimedia/libdvdread \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
HAS_CONFIGURE= yes
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 6815b05249cf..97b3520247ce 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -8,7 +8,7 @@
PORTNAME= plugger
PORTVERSION= 4.0
PORTREVISION= 2
-CATEGORIES= www audio graphics
+CATEGORIES= www audio graphics multimedia
MASTER_SITES= http://fredrik.hubbe.net/plugger/ \
${MASTER_SITE_NETSCAPE}
MASTER_SITE_SUBDIR= sdk/plugin/unix
@@ -50,7 +50,7 @@ WITH_GNOME2 = yes
.endif
.if defined(WITH_MPLAYER)
-RUN_DEPENDS+= ${LOCALBASE}/bin/mplayer:${PORTSDIR}/graphics/mplayer
+RUN_DEPENDS+= ${LOCALBASE}/bin/mplayer:${PORTSDIR}/multimedia/mplayer
.endif
.if defined(WITH_MTV)
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index 875e68865a6e..abf3ff41237d 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= http://www.snika.uklinux.net/xmms-alarm/ \
MAINTAINER= chris@unixpages.org
-BUILD_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS= xmms-config:${PORTSDIR}/audio/xmms
+BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
USE_X_PREFIX= yes
USE_GNOMENG= yes