5 files changed, 30 insertions, 41 deletions

diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 871927da03a9..86bf7c8924a6 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdemultimedia-3.3.1.tar.bz2) = 4a3462ba7b37e0057eadd24541908f95
-SIZE (KDE/kdemultimedia-3.3.1.tar.bz2) = 5362949
+MD5 (KDE/kdemultimedia-3.3.2.tar.bz2) = 2f393da809542dab5bf75bf7a91d1ec0
+SIZE (KDE/kdemultimedia-3.3.2.tar.bz2) = 5384470
diff --git a/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h b/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h
new file mode 100644
index 000000000000..e1fad24c49fb
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-akode-lib-localfile.h
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /home/kde/kdemultimedia/akode/lib/localfile.h,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- akode/lib/localfile.h	2004/07/29 14:45:13	1.6
++++ akode/lib/localfile.h	2004/09/19 19:16:50	1.7
+@@ -23,6 +23,15 @@
+ 
+ #include "file.h"
+ 
++#ifdef __FreeBSD__
++// There is an unfortunate #define in some obscure FBSD system
++// header that turns fileno into a macro to account for threading
++// issues; we undef it in this case.
++#ifdef fileno
++#undef fileno
++#endif
++#endif
++
+ namespace aKode {
+ 
+ //! An implementation of the File interface for local-file access
diff --git a/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in b/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in
deleted file mode 100644
index 6fc28e6b5cb4..000000000000
--- a/multimedia/kdemultimedia4/files/patch-arts-midi-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- arts/midi/Makefile.in.orig	Mon Aug 16 12:41:44 2004
-+++ arts/midi/Makefile.in	Thu Oct  7 23:04:57 2004
-@@ -687,10 +687,10 @@
- 	done
- midisend$(EXEEXT): $(midisend_OBJECTS) $(midisend_DEPENDENCIES) 
- 	@rm -f midisend$(EXEEXT)
--	$(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS)
-+	$(CXXLINK) $(midisend_LDFLAGS) $(midisend_OBJECTS) $(midisend_LDADD) $(LIBS) $(LIBPTHREAD)
- midisynctest$(EXEEXT): $(midisynctest_OBJECTS) $(midisynctest_DEPENDENCIES) 
- 	@rm -f midisynctest$(EXEEXT)
--	$(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS)
-+	$(CXXLINK) $(midisynctest_LDFLAGS) $(midisynctest_OBJECTS) $(midisynctest_LDADD) $(LIBS) $(LIBPTHREAD)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in b/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in
deleted file mode 100644
index b42c27d9226b..000000000000
--- a/multimedia/kdemultimedia4/files/patch-noatun-library-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- noatun/library/Makefile.in.orig	Thu Jan 29 01:38:34 2004
-+++ noatun/library/Makefile.in	Thu Jan 29 01:39:01 2004
-@@ -638,7 +638,7 @@
- 	done
- gentable$(EXEEXT): $(gentable_OBJECTS) $(gentable_DEPENDENCIES) 
- 	@rm -f gentable$(EXEEXT)
--	$(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS)
-+	$(CXXLINK) $(gentable_LDFLAGS) $(gentable_OBJECTS) $(gentable_LDADD) $(LIBS) $(USE_THREADS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 6359bd89d533..39e1068a90ce 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -554,6 +554,11 @@ share/apps/kmid/maps/YamahaPSS790.map
 share/apps/kmid/maps/YamahaQY10.map
 share/apps/kmid/maps/gm.map
 share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/Listener.png
+share/apps/kmix/pics/SpeakerFrontLeft.png
+share/apps/kmix/pics/SpeakerFrontRight.png
+share/apps/kmix/pics/SpeakerRearLeft.png
+share/apps/kmix/pics/SpeakerRearRight.png
 share/apps/kmix/pics/kmixdocked.png
 share/apps/kmix/pics/kmixdocked_error.png
 share/apps/kmix/pics/kmixdocked_mute.png
@@ -1056,26 +1061,17 @@ share/services/krec_exportwave.desktop
 share/servicetypes/audiomidi.desktop
 share/servicetypes/krec_exportitem.desktop
 @dirrm share/mimelnk/interface
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/doc/HTML/en/noatun
 @dirrm share/doc/HTML/en/kscd
 @dirrm share/doc/HTML/en/krec
 @dirrm share/doc/HTML/en/kmix
 @dirrm share/doc/HTML/en/kmid
 @dirrm share/doc/HTML/en/kcontrol/kmixcfg
-@dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en/kaboodle
 @dirrm share/doc/HTML/en/juk
 @dirrm share/doc/HTML/en/artsbuilder/images
 @dirrm share/doc/HTML/en/artsbuilder
 @dirrm share/desktop-directories
-@dirrm share/config.kcfg
 @dirrm share/apps/profiles
 @dirrm share/apps/noatun/skins/winamp/Winamp
 @dirrm share/apps/noatun/skins/winamp
@@ -1120,8 +1116,6 @@ share/servicetypes/krec_exportitem.desktop
 @dirrm share/apps/krec/icons/crystalsvg
 @dirrm share/apps/krec/icons
 @dirrm share/apps/krec
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
 @dirrm share/apps/kmid/maps
@@ -1135,8 +1129,6 @@ share/servicetypes/krec_exportitem.desktop
 @dirrm share/apps/kmid/icons
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
 @dirrm share/apps/kaudiocreator/pics
 @dirrm share/apps/kaudiocreator
 @dirrm share/apps/kappfinder/apps/Multimedia