Update KDE to the latest official release, KDE 3.1.3

Official KDE 3.1.3 announcement:
http://www.kde.org/announcements/announce-3.1.3.php

(may not work until a few hours after this commit - we jumped the gun a little
 in order to have the update in place at the time the security notifications for
 KDE 3.1.2 will be released together with the announcement of KDE 3.1.3).

Changelog from 3.1.2 to 3.1.3 release:
http://www.kde.org/announcements/changelogs/changelog3_1_2to3_1_3.php

Thanks and credits need to go to the whole KDE-FreeBSD team, as well
as everyone on kde@freebsd.org for providing feedback, reporting bugs
and just using the KDE ports.

Approved by: will (real mentor asleep)

4 files changed, 23 insertions, 3 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 64953c58296e..bc025f8ad8b4 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Multimedia utilities for the KDE integrated X11 desktop
 
 RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
 LIB_DEPENDS+=	cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+		mp3lame:${PORTSDIR}/audio/lame \
 		ogg.4:${PORTSDIR}/audio/libogg \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
@@ -28,17 +29,20 @@ KDE_BUILD_PLIST=yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	esound
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+=	--without-lame \
-			--with-vorbis="${LOCALBASE}" \
+CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" \
 			--enable-audio=oss,esd
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .if defined(WITH_MIDI) || defined(WITH_KMIDI)
 PLIST_APPEND+=	plist.midi
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 00febe86a632..12423271664a 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.2.tar.bz2) = 63ffa8b3c6b3151acdaaa22afd7e55ea
+MD5 (KDE/kdemultimedia-3.1.3.tar.bz2) = da1e05b8284976359cab32f0abf4b87b
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index f4c98b77d631..09f8a950f996 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -2,6 +2,7 @@ bin/aktion
 bin/artsbuilder
 bin/artscontrol
 bin/kaboodle
+bin/kaudiocreator
 bin/kmid
 bin/kmix
 bin/kmixctrl
@@ -373,6 +374,7 @@ share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
 share/applnk/Multimedia/kaboodle.desktop
+share/applnk/Multimedia/kaudiocreator.desktop
 share/applnk/Multimedia/kmid.desktop
 share/applnk/Multimedia/kmix.desktop
 share/applnk/Multimedia/krec.desktop
@@ -486,6 +488,8 @@ share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
 share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 share/apps/kaboodle/kaboodlepartui.rc
 share/apps/kaboodle/kaboodleui.rc
+share/apps/kaudiocreator/kaudiocreatorui.rc
+share/apps/kaudiocreator/pics/check.png
 share/apps/kconf_update/noatun.upd
 share/apps/kconf_update/noatun20update
 share/apps/kicker/applets/kmixapplet.desktop
@@ -895,6 +899,7 @@ share/icons/crystalsvg/16x16/apps/aktion.png
 share/icons/crystalsvg/16x16/apps/artsbuilder.png
 share/icons/crystalsvg/16x16/apps/artscontrol.png
 share/icons/crystalsvg/16x16/apps/kaboodle.png
+share/icons/crystalsvg/16x16/apps/kaudiocreator.png
 share/icons/crystalsvg/16x16/apps/kmid.png
 share/icons/crystalsvg/16x16/apps/kmix.png
 share/icons/crystalsvg/16x16/apps/kscd.png
@@ -904,6 +909,7 @@ share/icons/crystalsvg/22x22/apps/kaboodle.png
 share/icons/crystalsvg/22x22/apps/noatun.png
 share/icons/crystalsvg/32x32/apps/aktion.png
 share/icons/crystalsvg/32x32/apps/kaboodle.png
+share/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/icons/crystalsvg/32x32/apps/kmid.png
 share/icons/crystalsvg/32x32/apps/kmix.png
 share/icons/crystalsvg/32x32/apps/kscd.png
@@ -918,12 +924,15 @@ share/icons/crystalsvg/64x64/apps/kaboodle.png
 share/icons/crystalsvg/64x64/apps/kmix.png
 share/icons/crystalsvg/64x64/apps/kscd.png
 share/icons/crystalsvg/64x64/apps/noatun.png
+share/icons/locolor/16x16/apps/kaudiocreator.png
+share/icons/locolor/32x32/apps/kaudiocreator.png
 share/mimelnk/application/x-artsbuilder.desktop
 share/mimelnk/audio/x-karaoke.desktop
 share/mimelnk/interface/x-winamp-skin.desktop
 share/mimelnk/text/xmcd.desktop
 share/services/audiocd.protocol
 share/services/kaboodle_component.desktop
+share/services/kaboodleengine.desktop
 share/services/kfile_au.desktop
 share/services/kfile_avi.desktop
 share/services/kfile_m3u.desktop
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index efcb40656fbc..fec00ab682b3 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -5,6 +5,11 @@
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@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/64x64/apps
 @dirrm share/icons/crystalsvg/64x64
 @dirrm share/icons/crystalsvg/48x48/apps
@@ -88,6 +93,8 @@
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/kconf_update
+@dirrm share/apps/kaudiocreator/pics
+@dirrm share/apps/kaudiocreator
 @dirrm share/apps/kaboodle/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kaboodle/icons/crystalsvg/22x22
 @dirrm share/apps/kaboodle/icons/crystalsvg/16x16/actions