Factor out all but one of the build switches of the KDE main module ports

into separate ports. The OPTIONS will remain as of yet and trigger dependencies
now, for easy transition.

Update KOffice to version 1.3.2.

Add patches to fix a number of issues, including:

- fix kxkb on Xorg
- fix kdemultimedia WITH_MPEGLIB (now mpeglib_artsplug) compilation on gcc 3.4.2
  with optimizations greater than -O

Add security related patches and entries to portaudit.txt.

32 files changed, 68 insertions, 543 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index e2a7cbf427d8..0d501741bbea 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -129,6 +129,7 @@
     SUBDIR += xdvshow
     SUBDIR += xfce4-xmms-plugin
     SUBDIR += xine
+    SUBDIR += xine_artsplugin
     SUBDIR += xmms
     SUBDIR += xmms-avi
     SUBDIR += xmms-status-plugin
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index f57f32872965..9c1b4dfb15b5 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -39,9 +40,10 @@ GNU_CONFIGURE=	yes
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
+CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" --disable-xinetest
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+DO_NOT_COMPILE+=mpeglib mpeglib_artsplug xine_artsplugin
 
 OPTIONS=	LAME "Enable support for mp3 encoding using LAME" off \
 		MPEGLIB "Use mpeglib for audio playback" on \
@@ -58,19 +60,14 @@ CONFIGURE_ARGS+=	--without-lame --disable-lametest
 .endif
 
 .if defined(WITH_XINE)
-PLIST_APPEND+=	plist.xine
-LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
-BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
-CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.elseif defined(WITHOUT_XINE)
-DO_NOT_COMPILE+=	xine_artsplugin
-CONFIGURE_ARGS+=	--disable-xinetest
+RUN_DEPENDS=	${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin
 .endif
 
 .if !defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.mpeglib
+RUN_DEPENDS+=		mpeglibartsplay:${PORTSDIR}/audio/mpeglib_artsplug
 .elseif defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.no-mpeglib
+# Use the KFile plugins. Those can't do streaming, but work better with
+# some buggy(?) sound drivers in -STABLE.
 .endif
 
 .if defined(DO_NOT_COMPILE)
@@ -78,21 +75,7 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 pre-configure:
-.if defined(WITHOUT_MPEGLIB)
-	${REINPLACE_CMD} -e \
-	'/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e '/union semun/,/;$$/s/.*//g' \
-		${WRKSRC}/oggvorbis_artsplugin/oggPlayObject_impl.h
-.endif
-	${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' \
-		-e 's/-lxine.*$$LIBS/-lxine $$LIBS ${PTHREAD_LIBS}/g' \
-			${WRKSRC}/configure
-
-post-configure:
-	${REINPLACE_CMD} -e '/^XINE_CFLAGS/s/-D_THREAD_SAFE//g' \
-			-e 's/-pthread/${PTHREAD_LIBS}/g' \
-		${WRKSRC}/xine_artsplugin/Makefile
+	${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/kdemultimedia3/files/patch-mpeglibartsplay.cpp b/multimedia/kdemultimedia3/files/patch-mpeglibartsplay.cpp
deleted file mode 100644
index 955c1e52bd1e..000000000000
--- a/multimedia/kdemultimedia3/files/patch-mpeglibartsplay.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib_artsplug/mpeglibartsplay.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/mpeglibartsplay.cpp,v
-retrieving revision 1.13
-diff -u -3 -p -r1.13 mpeglibartsplay.cpp
---- mpeglib_artsplug/mpeglibartsplay.cpp	2002/06/15 00:17:11	1.13
-+++ mpeglib_artsplug/mpeglibartsplay.cpp	2002/11/28 10:09:03
-@@ -26,7 +26,7 @@
- 
- using namespace std;
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/patch-mpg_control.cpp b/multimedia/kdemultimedia3/files/patch-mpg_control.cpp
deleted file mode 100644
index 4e6dd1307a11..000000000000
--- a/multimedia/kdemultimedia3/files/patch-mpg_control.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: mpeglib/example/yaf/yafmpgplay/mpg_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafmpgplay/mpg_control.cpp,v
-retrieving revision 1.5
-diff -u -3 -p -r1.5 mpg_control.cpp
---- mpeglib/example/yaf/yafmpgplay/mpg_control.cpp	2002/11/22 21:52:53	1.5
-+++ mpeglib/example/yaf/yafmpgplay/mpg_control.cpp	2002/11/28 08:54:03
-@@ -29,14 +29,14 @@ using namespace std;
- #include <stdlib.h>
- #include <math.h>
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
- // we include our plugin here
- #include "../../../lib/decoder/mpgPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/patch-splay_control.cpp b/multimedia/kdemultimedia3/files/patch-splay_control.cpp
deleted file mode 100644
index 380957b19d3c..000000000000
--- a/multimedia/kdemultimedia3/files/patch-splay_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafsplay/splay_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafsplay/splay_control.cpp,v
-retrieving revision 1.6
-diff -u -3 -p -r1.6 splay_control.cpp
---- mpeglib/example/yaf/yafsplay/splay_control.cpp	2002/11/22 21:52:54	1.6
-+++ mpeglib/example/yaf/yafsplay/splay_control.cpp	2002/11/28 08:51:50
-@@ -28,7 +28,7 @@ using namespace std;
- // we include our plugin here
- #include "../../../lib/decoder/splayPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/patch-tplay_control.cpp b/multimedia/kdemultimedia3/files/patch-tplay_control.cpp
deleted file mode 100644
index 4ea68a80a8c7..000000000000
--- a/multimedia/kdemultimedia3/files/patch-tplay_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yaftplay/tplay_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yaftplay/tplay_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 tplay_control.cpp
---- mpeglib/example/yaf/yaftplay/tplay_control.cpp	2002/11/22 21:52:54	1.3
-+++ mpeglib/example/yaf/yaftplay/tplay_control.cpp	2002/11/28 08:55:41
-@@ -29,7 +29,7 @@ using namespace std;
- #include "../../../lib/decoder/tplayPlugin.h"
- 
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/patch-vorbis_control.cpp b/multimedia/kdemultimedia3/files/patch-vorbis_control.cpp
deleted file mode 100644
index e0f00a745105..000000000000
--- a/multimedia/kdemultimedia3/files/patch-vorbis_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafvorbis/vorbis_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafvorbis/vorbis_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 vorbis_control.cpp
---- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2000/12/03 22:05:05	1.3
-+++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2002/11/28 08:56:38
-@@ -29,7 +29,7 @@
- 
- #include "../../../lib/decoder/vorbisPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/patch-yuv_control.cpp b/multimedia/kdemultimedia3/files/patch-yuv_control.cpp
deleted file mode 100644
index e6117c0252d7..000000000000
--- a/multimedia/kdemultimedia3/files/patch-yuv_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafyuv/yuv_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafyuv/yuv_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 yuv_control.cpp
---- mpeglib/example/yaf/yafyuv/yuv_control.cpp	2002/11/22 21:52:54	1.3
-+++ mpeglib/example/yaf/yafyuv/yuv_control.cpp	2002/11/28 08:58:03
-@@ -28,7 +28,7 @@ using namespace std;
- // we include our plugin here
- #include "../../../lib/yuv/yuvPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index 6eda298b92bf..0c94fb51987c 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -11,12 +11,6 @@ bin/kscd
 bin/midisend
 bin/noatun
 bin/workman2cddb.pl
-bin/yaf-cdda
-bin/yaf-mpgplay
-bin/yaf-splay
-bin/yaf-tplay
-bin/yaf-vorbis
-bin/yaf-yuv
 include/arts/artsbuilder.h
 include/arts/artsbuilder.idl
 include/arts/artsgui.h
@@ -51,79 +45,6 @@ include/libkcddb/configbase.h
 include/libwm/wm_cdrom.h
 include/libwm/wm_cdtext.h
 include/mimetypetree.h
-include/mpeglib/decoder/cddaPlugin.h
-include/mpeglib/decoder/command.h
-include/mpeglib/decoder/commandPipe.h
-include/mpeglib/decoder/decoderPlugin.h
-include/mpeglib/decoder/mpegPlugin.h
-include/mpeglib/decoder/mpgPlugin.h
-include/mpeglib/decoder/nukePlugin.h
-include/mpeglib/decoder/splayPlugin.h
-include/mpeglib/decoder/tplayPlugin.h
-include/mpeglib/decoder/vorbisPlugin.h
-include/mpeglib/decoder/yuvPlugin.h
-include/mpeglib/frame/IOFrameQueue.h
-include/mpeglib/frame/audioFrame.h
-include/mpeglib/frame/audioFrameQueue.h
-include/mpeglib/frame/floatFrame.h
-include/mpeglib/frame/frame.h
-include/mpeglib/frame/frameQueue.h
-include/mpeglib/frame/framer.h
-include/mpeglib/frame/pcmFrame.h
-include/mpeglib/frame/rawDataBuffer.h
-include/mpeglib/frame/rawFrame.h
-include/mpeglib/input/bufferInputStream.h
-include/mpeglib/input/cddaInputStream.h
-include/mpeglib/input/cdromInputStream.h
-include/mpeglib/input/fileInputStream.h
-include/mpeglib/input/httpInputStream.h
-include/mpeglib/input/inputDetector.h
-include/mpeglib/input/inputPlugin.h
-include/mpeglib/input/inputStream.h
-include/mpeglib/input/threadSafeInputStream.h
-include/mpeglib/mpegutil/mpegStreamPlayer.h
-include/mpeglib/mpegutil/mpegSystemHeader.h
-include/mpeglib/mpegutil/mpegSystemStream.h
-include/mpeglib/mpegutil/mpegVideoLength.h
-include/mpeglib/mpegutil/pesSystemStream.h
-include/mpeglib/mpegutil/psSystemStream.h
-include/mpeglib/mpegutil/tsSystemStream.h
-include/mpeglib/oggvorbis/oggFrame.h
-include/mpeglib/oggvorbis/ovFramer.h
-include/mpeglib/oggvorbis/vorbisDecoder.h
-include/mpeglib/oggvorbis/vorbisInfo.h
-include/mpeglib/output/artsOutputStream.h
-include/mpeglib/output/audioTime.h
-include/mpeglib/output/avSyncer.h
-include/mpeglib/output/dspX11OutputStream.h
-include/mpeglib/output/outPlugin.h
-include/mpeglib/output/outputStream.h
-include/mpeglib/output/pluginInfo.h
-include/mpeglib/output/threadSafeOutputStream.h
-include/mpeglib/splay/mpegAudioFrame.h
-include/mpeglib/splay/mpegAudioInfo.h
-include/mpeglib/splay/splayDecoder.h
-include/mpeglib/util/abstract/abs_thread.h
-include/mpeglib/util/abstract/threadQueue.h
-include/mpeglib/util/dynBuffer.h
-include/mpeglib/util/file/fileAccess.h
-include/mpeglib/util/mmx/mm_accel.h
-include/mpeglib/util/mmx/mmx.h
-include/mpeglib/util/mmx/mmx_asm.h
-include/mpeglib/util/render/pictureArray.h
-include/mpeglib/util/render/yuvPicture.h
-include/mpeglib/util/syncClock.h
-include/mpeglib/util/timeStamp.h
-include/mpeglib/util/timeStampArray.h
-include/mpeglib/util/timeWrapper.h
-include/mpeglib/util/yaf/yafcore/buffer.h
-include/mpeglib/util/yaf/yafcore/inputDecoder.h
-include/mpeglib/util/yaf/yafcore/inputInterface.h
-include/mpeglib/util/yaf/yafcore/outputInterface.h
-include/mpeglib/util/yaf/yafcore/yaf_control.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
 include/noatun/app.h
 include/noatun/controls.h
 include/noatun/conversion.h
@@ -281,9 +202,6 @@ lib/libkdeinit_noatun.so
 lib/libkmidlib.la
 lib/libkmidlib.so
 lib/libkmidlib.so.0
-lib/libmpeg-0.3.0.so
-lib/libmpeg.la
-lib/libmpeg.so
 lib/libnoatun.la
 lib/libnoatun.so
 lib/libnoatun.so.3
@@ -300,12 +218,6 @@ lib/libwinskinvis.so
 lib/libworkman.la
 lib/libworkman.so
 lib/libworkman.so.6
-lib/libyafcore.la
-lib/libyafcore.so
-lib/libyafcore.so.0
-lib/libyafxplayer.la
-lib/libyafxplayer.so
-lib/libyafxplayer.so.0
 lib/mcop/Arts/ArtsBuilderLoader.mcopclass
 lib/mcop/Arts/Button.mcopclass
 lib/mcop/Arts/EffectRackGuiFactory.mcopclass
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index f314aaeb4941..23395317c269 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -130,22 +130,6 @@
 @dirrm lib/mcop
 @dirrm lib/kde3
 @dirrm include/noatun
-@dirrm include/mpeglib/util/yaf/yafxplayer
-@dirrm include/mpeglib/util/yaf/yafcore
-@dirrm include/mpeglib/util/yaf
-@dirrm include/mpeglib/util/render
-@dirrm include/mpeglib/util/mmx
-@dirrm include/mpeglib/util/file
-@dirrm include/mpeglib/util/abstract
-@dirrm include/mpeglib/util
-@dirrm include/mpeglib/splay
-@dirrm include/mpeglib/output
-@dirrm include/mpeglib/oggvorbis
-@dirrm include/mpeglib/mpegutil
-@dirrm include/mpeglib/input
-@dirrm include/mpeglib/frame
-@dirrm include/mpeglib/decoder
-@dirrm include/mpeglib
 @dirrm include/libwm
 @dirrm include/libkcddb
 @dirrm include/arts
diff --git a/multimedia/kdemultimedia3/files/plist.mpeglib b/multimedia/kdemultimedia3/files/plist.mpeglib
deleted file mode 100644
index 8240d5667987..000000000000
--- a/multimedia/kdemultimedia3/files/plist.mpeglib
+++ /dev/null
@@ -1,20 +0,0 @@
-bin/mpeglibartsplay
-include/mpeglib_artsplug/decoderBaseObject.h
-include/mpeglib_artsplug/decoderBaseObject.idl
-include/mpeglib_artsplug/decoderBaseObject_impl.h
-include/mpeglib_artsplug/splayPlayObject.h
-include/mpeglib_artsplug/splayPlayObject.idl
-include/mpeglib_artsplug/splayPlayObject_impl.h
-lib/libarts_mpeglib-0.3.0.so
-lib/libarts_mpeglib-0.3.0.so.0
-lib/libarts_mpeglib.la
-lib/libarts_mpeglib.so
-lib/libarts_splay.la
-lib/libarts_splay.so
-lib/libarts_splay.so.0
-lib/mcop/CDDAPlayObject.mcopclass
-lib/mcop/MP3PlayObject.mcopclass
-lib/mcop/NULLPlayObject.mcopclass
-lib/mcop/OGGPlayObject.mcopclass
-lib/mcop/SplayPlayObject.mcopclass
-lib/mcop/WAVPlayObject.mcopclass
diff --git a/multimedia/kdemultimedia3/files/plist.mpeglib.rm b/multimedia/kdemultimedia3/files/plist.mpeglib.rm
deleted file mode 100644
index b3ae0f3a7787..000000000000
--- a/multimedia/kdemultimedia3/files/plist.mpeglib.rm
+++ /dev/null
@@ -1 +0,0 @@
-@dirrm include/mpeglib_artsplug
diff --git a/multimedia/kdemultimedia3/files/plist.no-mpeglib b/multimedia/kdemultimedia3/files/plist.no-mpeglib
deleted file mode 100644
index 3f0f9089ef5c..000000000000
--- a/multimedia/kdemultimedia3/files/plist.no-mpeglib
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/libmpg123.la
-lib/libmpg123.so
-lib/libmpg123arts.la
-lib/libmpg123arts.so
-lib/liboggarts.la
-lib/liboggarts.so
-lib/mcop/Arts/mpg123PlayObject.mcopclass
-lib/mcop/Arts/oggPlayObject.mcopclass
-lib/mcop/mpg123arts.mcopclass
-lib/mcop/mpg123arts.mcoptype
-lib/mcop/oggarts.mcopclass
-lib/mcop/oggarts.mcoptype
diff --git a/multimedia/kdemultimedia3/files/plist.xine.rm b/multimedia/kdemultimedia3/files/plist.xine.rm
deleted file mode 100644
index 4cc7252178e6..000000000000
--- a/multimedia/kdemultimedia3/files/plist.xine.rm
+++ /dev/null
@@ -1 +0,0 @@
-@dirrm share/apps/videothumbnail
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index f57f32872965..9c1b4dfb15b5 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -39,9 +40,10 @@ GNU_CONFIGURE=	yes
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
+CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" --disable-xinetest
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+DO_NOT_COMPILE+=mpeglib mpeglib_artsplug xine_artsplugin
 
 OPTIONS=	LAME "Enable support for mp3 encoding using LAME" off \
 		MPEGLIB "Use mpeglib for audio playback" on \
@@ -58,19 +60,14 @@ CONFIGURE_ARGS+=	--without-lame --disable-lametest
 .endif
 
 .if defined(WITH_XINE)
-PLIST_APPEND+=	plist.xine
-LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
-BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
-CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.elseif defined(WITHOUT_XINE)
-DO_NOT_COMPILE+=	xine_artsplugin
-CONFIGURE_ARGS+=	--disable-xinetest
+RUN_DEPENDS=	${LOCALBASE}/lib/libarts_xine.la:${PORTSDIR}/multimedia/xine_artsplugin
 .endif
 
 .if !defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.mpeglib
+RUN_DEPENDS+=		mpeglibartsplay:${PORTSDIR}/audio/mpeglib_artsplug
 .elseif defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.no-mpeglib
+# Use the KFile plugins. Those can't do streaming, but work better with
+# some buggy(?) sound drivers in -STABLE.
 .endif
 
 .if defined(DO_NOT_COMPILE)
@@ -78,21 +75,7 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
 pre-configure:
-.if defined(WITHOUT_MPEGLIB)
-	${REINPLACE_CMD} -e \
-	'/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e '/union semun/,/;$$/s/.*//g' \
-		${WRKSRC}/oggvorbis_artsplugin/oggPlayObject_impl.h
-.endif
-	${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' \
-		-e 's/-lxine.*$$LIBS/-lxine $$LIBS ${PTHREAD_LIBS}/g' \
-			${WRKSRC}/configure
-
-post-configure:
-	${REINPLACE_CMD} -e '/^XINE_CFLAGS/s/-D_THREAD_SAFE//g' \
-			-e 's/-pthread/${PTHREAD_LIBS}/g' \
-		${WRKSRC}/xine_artsplugin/Makefile
+	${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/kdemultimedia4/files/patch-mpeglibartsplay.cpp b/multimedia/kdemultimedia4/files/patch-mpeglibartsplay.cpp
deleted file mode 100644
index 955c1e52bd1e..000000000000
--- a/multimedia/kdemultimedia4/files/patch-mpeglibartsplay.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib_artsplug/mpeglibartsplay.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/mpeglibartsplay.cpp,v
-retrieving revision 1.13
-diff -u -3 -p -r1.13 mpeglibartsplay.cpp
---- mpeglib_artsplug/mpeglibartsplay.cpp	2002/06/15 00:17:11	1.13
-+++ mpeglib_artsplug/mpeglibartsplay.cpp	2002/11/28 10:09:03
-@@ -26,7 +26,7 @@
- 
- using namespace std;
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/patch-mpg_control.cpp b/multimedia/kdemultimedia4/files/patch-mpg_control.cpp
deleted file mode 100644
index 4e6dd1307a11..000000000000
--- a/multimedia/kdemultimedia4/files/patch-mpg_control.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: mpeglib/example/yaf/yafmpgplay/mpg_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafmpgplay/mpg_control.cpp,v
-retrieving revision 1.5
-diff -u -3 -p -r1.5 mpg_control.cpp
---- mpeglib/example/yaf/yafmpgplay/mpg_control.cpp	2002/11/22 21:52:53	1.5
-+++ mpeglib/example/yaf/yafmpgplay/mpg_control.cpp	2002/11/28 08:54:03
-@@ -29,14 +29,14 @@ using namespace std;
- #include <stdlib.h>
- #include <math.h>
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
- // we include our plugin here
- #include "../../../lib/decoder/mpgPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/patch-splay_control.cpp b/multimedia/kdemultimedia4/files/patch-splay_control.cpp
deleted file mode 100644
index 380957b19d3c..000000000000
--- a/multimedia/kdemultimedia4/files/patch-splay_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafsplay/splay_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafsplay/splay_control.cpp,v
-retrieving revision 1.6
-diff -u -3 -p -r1.6 splay_control.cpp
---- mpeglib/example/yaf/yafsplay/splay_control.cpp	2002/11/22 21:52:54	1.6
-+++ mpeglib/example/yaf/yafsplay/splay_control.cpp	2002/11/28 08:51:50
-@@ -28,7 +28,7 @@ using namespace std;
- // we include our plugin here
- #include "../../../lib/decoder/splayPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/patch-tplay_control.cpp b/multimedia/kdemultimedia4/files/patch-tplay_control.cpp
deleted file mode 100644
index 4ea68a80a8c7..000000000000
--- a/multimedia/kdemultimedia4/files/patch-tplay_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yaftplay/tplay_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yaftplay/tplay_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 tplay_control.cpp
---- mpeglib/example/yaf/yaftplay/tplay_control.cpp	2002/11/22 21:52:54	1.3
-+++ mpeglib/example/yaf/yaftplay/tplay_control.cpp	2002/11/28 08:55:41
-@@ -29,7 +29,7 @@ using namespace std;
- #include "../../../lib/decoder/tplayPlugin.h"
- 
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/patch-vorbis_control.cpp b/multimedia/kdemultimedia4/files/patch-vorbis_control.cpp
deleted file mode 100644
index e0f00a745105..000000000000
--- a/multimedia/kdemultimedia4/files/patch-vorbis_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafvorbis/vorbis_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafvorbis/vorbis_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 vorbis_control.cpp
---- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2000/12/03 22:05:05	1.3
-+++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp	2002/11/28 08:56:38
-@@ -29,7 +29,7 @@
- 
- #include "../../../lib/decoder/vorbisPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/patch-yuv_control.cpp b/multimedia/kdemultimedia4/files/patch-yuv_control.cpp
deleted file mode 100644
index e6117c0252d7..000000000000
--- a/multimedia/kdemultimedia4/files/patch-yuv_control.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mpeglib/example/yaf/yafyuv/yuv_control.cpp
-===================================================================
-RCS file: /home/kde/kdemultimedia/mpeglib/example/yaf/yafyuv/yuv_control.cpp,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 yuv_control.cpp
---- mpeglib/example/yaf/yafyuv/yuv_control.cpp	2002/11/22 21:52:54	1.3
-+++ mpeglib/example/yaf/yafyuv/yuv_control.cpp	2002/11/28 08:58:03
-@@ -28,7 +28,7 @@ using namespace std;
- // we include our plugin here
- #include "../../../lib/yuv/yuvPlugin.h"
- 
--#if defined(HAVE_GETOPT_H) 
-+#if defined(HAVE_GETOPT_H) && !defined(__FreeBSD__)
- #include <getopt.h>
- #endif
- 
diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base
index 6eda298b92bf..0c94fb51987c 100644
--- a/multimedia/kdemultimedia4/files/plist.base
+++ b/multimedia/kdemultimedia4/files/plist.base
@@ -11,12 +11,6 @@ bin/kscd
 bin/midisend
 bin/noatun
 bin/workman2cddb.pl
-bin/yaf-cdda
-bin/yaf-mpgplay
-bin/yaf-splay
-bin/yaf-tplay
-bin/yaf-vorbis
-bin/yaf-yuv
 include/arts/artsbuilder.h
 include/arts/artsbuilder.idl
 include/arts/artsgui.h
@@ -51,79 +45,6 @@ include/libkcddb/configbase.h
 include/libwm/wm_cdrom.h
 include/libwm/wm_cdtext.h
 include/mimetypetree.h
-include/mpeglib/decoder/cddaPlugin.h
-include/mpeglib/decoder/command.h
-include/mpeglib/decoder/commandPipe.h
-include/mpeglib/decoder/decoderPlugin.h
-include/mpeglib/decoder/mpegPlugin.h
-include/mpeglib/decoder/mpgPlugin.h
-include/mpeglib/decoder/nukePlugin.h
-include/mpeglib/decoder/splayPlugin.h
-include/mpeglib/decoder/tplayPlugin.h
-include/mpeglib/decoder/vorbisPlugin.h
-include/mpeglib/decoder/yuvPlugin.h
-include/mpeglib/frame/IOFrameQueue.h
-include/mpeglib/frame/audioFrame.h
-include/mpeglib/frame/audioFrameQueue.h
-include/mpeglib/frame/floatFrame.h
-include/mpeglib/frame/frame.h
-include/mpeglib/frame/frameQueue.h
-include/mpeglib/frame/framer.h
-include/mpeglib/frame/pcmFrame.h
-include/mpeglib/frame/rawDataBuffer.h
-include/mpeglib/frame/rawFrame.h
-include/mpeglib/input/bufferInputStream.h
-include/mpeglib/input/cddaInputStream.h
-include/mpeglib/input/cdromInputStream.h
-include/mpeglib/input/fileInputStream.h
-include/mpeglib/input/httpInputStream.h
-include/mpeglib/input/inputDetector.h
-include/mpeglib/input/inputPlugin.h
-include/mpeglib/input/inputStream.h
-include/mpeglib/input/threadSafeInputStream.h
-include/mpeglib/mpegutil/mpegStreamPlayer.h
-include/mpeglib/mpegutil/mpegSystemHeader.h
-include/mpeglib/mpegutil/mpegSystemStream.h
-include/mpeglib/mpegutil/mpegVideoLength.h
-include/mpeglib/mpegutil/pesSystemStream.h
-include/mpeglib/mpegutil/psSystemStream.h
-include/mpeglib/mpegutil/tsSystemStream.h
-include/mpeglib/oggvorbis/oggFrame.h
-include/mpeglib/oggvorbis/ovFramer.h
-include/mpeglib/oggvorbis/vorbisDecoder.h
-include/mpeglib/oggvorbis/vorbisInfo.h
-include/mpeglib/output/artsOutputStream.h
-include/mpeglib/output/audioTime.h
-include/mpeglib/output/avSyncer.h
-include/mpeglib/output/dspX11OutputStream.h
-include/mpeglib/output/outPlugin.h
-include/mpeglib/output/outputStream.h
-include/mpeglib/output/pluginInfo.h
-include/mpeglib/output/threadSafeOutputStream.h
-include/mpeglib/splay/mpegAudioFrame.h
-include/mpeglib/splay/mpegAudioInfo.h
-include/mpeglib/splay/splayDecoder.h
-include/mpeglib/util/abstract/abs_thread.h
-include/mpeglib/util/abstract/threadQueue.h
-include/mpeglib/util/dynBuffer.h
-include/mpeglib/util/file/fileAccess.h
-include/mpeglib/util/mmx/mm_accel.h
-include/mpeglib/util/mmx/mmx.h
-include/mpeglib/util/mmx/mmx_asm.h
-include/mpeglib/util/render/pictureArray.h
-include/mpeglib/util/render/yuvPicture.h
-include/mpeglib/util/syncClock.h
-include/mpeglib/util/timeStamp.h
-include/mpeglib/util/timeStampArray.h
-include/mpeglib/util/timeWrapper.h
-include/mpeglib/util/yaf/yafcore/buffer.h
-include/mpeglib/util/yaf/yafcore/inputDecoder.h
-include/mpeglib/util/yaf/yafcore/inputInterface.h
-include/mpeglib/util/yaf/yafcore/outputInterface.h
-include/mpeglib/util/yaf/yafcore/yaf_control.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-include/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-include/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
 include/noatun/app.h
 include/noatun/controls.h
 include/noatun/conversion.h
@@ -281,9 +202,6 @@ lib/libkdeinit_noatun.so
 lib/libkmidlib.la
 lib/libkmidlib.so
 lib/libkmidlib.so.0
-lib/libmpeg-0.3.0.so
-lib/libmpeg.la
-lib/libmpeg.so
 lib/libnoatun.la
 lib/libnoatun.so
 lib/libnoatun.so.3
@@ -300,12 +218,6 @@ lib/libwinskinvis.so
 lib/libworkman.la
 lib/libworkman.so
 lib/libworkman.so.6
-lib/libyafcore.la
-lib/libyafcore.so
-lib/libyafcore.so.0
-lib/libyafxplayer.la
-lib/libyafxplayer.so
-lib/libyafxplayer.so.0
 lib/mcop/Arts/ArtsBuilderLoader.mcopclass
 lib/mcop/Arts/Button.mcopclass
 lib/mcop/Arts/EffectRackGuiFactory.mcopclass
diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm
index f314aaeb4941..23395317c269 100644
--- a/multimedia/kdemultimedia4/files/plist.base.rm
+++ b/multimedia/kdemultimedia4/files/plist.base.rm
@@ -130,22 +130,6 @@
 @dirrm lib/mcop
 @dirrm lib/kde3
 @dirrm include/noatun
-@dirrm include/mpeglib/util/yaf/yafxplayer
-@dirrm include/mpeglib/util/yaf/yafcore
-@dirrm include/mpeglib/util/yaf
-@dirrm include/mpeglib/util/render
-@dirrm include/mpeglib/util/mmx
-@dirrm include/mpeglib/util/file
-@dirrm include/mpeglib/util/abstract
-@dirrm include/mpeglib/util
-@dirrm include/mpeglib/splay
-@dirrm include/mpeglib/output
-@dirrm include/mpeglib/oggvorbis
-@dirrm include/mpeglib/mpegutil
-@dirrm include/mpeglib/input
-@dirrm include/mpeglib/frame
-@dirrm include/mpeglib/decoder
-@dirrm include/mpeglib
 @dirrm include/libwm
 @dirrm include/libkcddb
 @dirrm include/arts
diff --git a/multimedia/kdemultimedia4/files/plist.mpeglib b/multimedia/kdemultimedia4/files/plist.mpeglib
deleted file mode 100644
index 8240d5667987..000000000000
--- a/multimedia/kdemultimedia4/files/plist.mpeglib
+++ /dev/null
@@ -1,20 +0,0 @@
-bin/mpeglibartsplay
-include/mpeglib_artsplug/decoderBaseObject.h
-include/mpeglib_artsplug/decoderBaseObject.idl
-include/mpeglib_artsplug/decoderBaseObject_impl.h
-include/mpeglib_artsplug/splayPlayObject.h
-include/mpeglib_artsplug/splayPlayObject.idl
-include/mpeglib_artsplug/splayPlayObject_impl.h
-lib/libarts_mpeglib-0.3.0.so
-lib/libarts_mpeglib-0.3.0.so.0
-lib/libarts_mpeglib.la
-lib/libarts_mpeglib.so
-lib/libarts_splay.la
-lib/libarts_splay.so
-lib/libarts_splay.so.0
-lib/mcop/CDDAPlayObject.mcopclass
-lib/mcop/MP3PlayObject.mcopclass
-lib/mcop/NULLPlayObject.mcopclass
-lib/mcop/OGGPlayObject.mcopclass
-lib/mcop/SplayPlayObject.mcopclass
-lib/mcop/WAVPlayObject.mcopclass
diff --git a/multimedia/kdemultimedia4/files/plist.mpeglib.rm b/multimedia/kdemultimedia4/files/plist.mpeglib.rm
deleted file mode 100644
index b3ae0f3a7787..000000000000
--- a/multimedia/kdemultimedia4/files/plist.mpeglib.rm
+++ /dev/null
@@ -1 +0,0 @@
-@dirrm include/mpeglib_artsplug
diff --git a/multimedia/kdemultimedia4/files/plist.no-mpeglib b/multimedia/kdemultimedia4/files/plist.no-mpeglib
deleted file mode 100644
index 3f0f9089ef5c..000000000000
--- a/multimedia/kdemultimedia4/files/plist.no-mpeglib
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/libmpg123.la
-lib/libmpg123.so
-lib/libmpg123arts.la
-lib/libmpg123arts.so
-lib/liboggarts.la
-lib/liboggarts.so
-lib/mcop/Arts/mpg123PlayObject.mcopclass
-lib/mcop/Arts/oggPlayObject.mcopclass
-lib/mcop/mpg123arts.mcopclass
-lib/mcop/mpg123arts.mcoptype
-lib/mcop/oggarts.mcopclass
-lib/mcop/oggarts.mcoptype
diff --git a/multimedia/kdemultimedia4/files/plist.xine b/multimedia/kdemultimedia4/files/plist.xine
deleted file mode 100644
index dbc6263a97c6..000000000000
--- a/multimedia/kdemultimedia4/files/plist.xine
+++ /dev/null
@@ -1,9 +0,0 @@
-lib/kde3/videothumbnail.la
-lib/kde3/videothumbnail.so
-lib/libarts_xine.la
-lib/libarts_xine.so
-lib/mcop/xinePlayObject.mcopclass
-share/apps/videothumbnail/sprocket-large.png
-share/apps/videothumbnail/sprocket-medium.png
-share/apps/videothumbnail/sprocket-small.png
-share/services/videothumbnail.desktop
diff --git a/multimedia/kdemultimedia4/files/plist.xine.rm b/multimedia/kdemultimedia4/files/plist.xine.rm
deleted file mode 100644
index 4cc7252178e6..000000000000
--- a/multimedia/kdemultimedia4/files/plist.xine.rm
+++ /dev/null
@@ -1 +0,0 @@
-@dirrm share/apps/videothumbnail
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
new file mode 100644
index 000000000000..338ae17eca66
--- /dev/null
+++ b/multimedia/xine_artsplugin/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	xine_artsplugin
+# Date created:				July 09 2004
+# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xine_artsplugin
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	multimedia kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+PKGNAMEPREFIX=	kdemultimedia-
+DISTNAME=	kdemultimedia-${PORTVERSION}
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Xine-based multimedia backend for KDE
+
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
+
+CONFLICTS=	kdemultimedia-3.1.* kdemultimedia-3.2.[0-3]
+
+USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
+INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+pre-configure:
+	${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' \
+		-e 's/-lxine.*$$LIBS/-lxine $$LIBS ${PTHREAD_LIBS}/g' \
+		-e 's|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	${ECHO_CMD} "xine_artsplugin" > ${WRKSRC}/inst-apps
+
+post-configure:
+	${REINPLACE_CMD} -e '/^XINE_CFLAGS/s/-D_THREAD_SAFE//g' \
+			-e 's/-pthread/${PTHREAD_LIBS}/g' \
+					${WRKSRC}/xine_artsplugin/Makefile
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.mk>
diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo
new file mode 100644
index 000000000000..95e28daa1852
--- /dev/null
+++ b/multimedia/xine_artsplugin/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kdemultimedia-3.2.3.tar.bz2) = f49a1cf9c5d405aed791808b4bbf035d
+SIZE (KDE/kdemultimedia-3.2.3.tar.bz2) = 4847891
diff --git a/multimedia/xine_artsplugin/pkg-descr b/multimedia/xine_artsplugin/pkg-descr
new file mode 100644
index 000000000000..fc7303492879
--- /dev/null
+++ b/multimedia/xine_artsplugin/pkg-descr
@@ -0,0 +1,2 @@
+Xine-based IO slave for KDE, enables playback of various video formats in
+noatun and kaboodle.
diff --git a/multimedia/kdemultimedia3/files/plist.xine b/multimedia/xine_artsplugin/pkg-plist
index dbc6263a97c6..0dad8ebe2839 100644
--- a/multimedia/kdemultimedia3/files/plist.xine
+++ b/multimedia/xine_artsplugin/pkg-plist
@@ -7,3 +7,4 @@ share/apps/videothumbnail/sprocket-large.png
 share/apps/videothumbnail/sprocket-medium.png
 share/apps/videothumbnail/sprocket-small.png
 share/services/videothumbnail.desktop
+@dirrm share/apps/videothumbnail