Upgrade to 2.2.1.

Submitted by:		SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
(with slight modifications)

6 files changed, 36 insertions, 16 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index ac1250032cce..8cb9b4b99b3a 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 3b36c9dea404..ab43ed67b80f 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-2.2.tar.bz2) = 530a05d3671aaf093805083658dd8030
+MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index b730fad9d692..20b9d083eece 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -109,6 +109,8 @@ lib/libnoatunkaiman.la
 lib/libnoatunkaiman.so
 lib/libnoatunkeyz.la
 lib/libnoatunkeyz.so
+lib/libnoatunmain.la
+lib/libnoatunmain.so
 lib/libnoatunmarquis.la
 lib/libnoatunmarquis.so
 lib/libnoatunmonoscope.la
@@ -208,8 +210,6 @@ lib/mcop/noatunarts.mcopclass
 lib/mcop/noatunarts.mcoptype
 %%OGGVORBIS%%lib/mcop/oggarts.mcopclass
 %%OGGVORBIS%%lib/mcop/oggarts.mcoptype
-lib/noatun.la
-lib/noatun.so
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -800,6 +800,18 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/noatun/eq.preset
 @dirrm share/apps/noatun
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
@@ -820,6 +832,7 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
 @dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
 @dirrm share/apps/artsbuilder/examples/todo
@@ -827,14 +840,11 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm share/apps
 @dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia
 @dirrm lib/mcop/Noatun
 @dirrm lib/mcop/Arts
 @dirrm lib/mcop
-@dirrm lib
 @dirrm include/noatun
 @dirrm include/arts
-@dirrm include
-@dirrm bin
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index ac1250032cce..8cb9b4b99b3a 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdemultimedia
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 3b36c9dea404..ab43ed67b80f 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-2.2.tar.bz2) = 530a05d3671aaf093805083658dd8030
+MD5 (KDE/kdemultimedia-2.2.1.tar.bz2) = c4724c00c6d2c69ccc923de944cf7983
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index b730fad9d692..20b9d083eece 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -109,6 +109,8 @@ lib/libnoatunkaiman.la
 lib/libnoatunkaiman.so
 lib/libnoatunkeyz.la
 lib/libnoatunkeyz.so
+lib/libnoatunmain.la
+lib/libnoatunmain.so
 lib/libnoatunmarquis.la
 lib/libnoatunmarquis.so
 lib/libnoatunmonoscope.la
@@ -208,8 +210,6 @@ lib/mcop/noatunarts.mcopclass
 lib/mcop/noatunarts.mcoptype
 %%OGGVORBIS%%lib/mcop/oggarts.mcopclass
 %%OGGVORBIS%%lib/mcop/oggarts.mcoptype
-lib/noatun.la
-lib/noatun.so
 share/applnk/Multimedia/aktion.desktop
 share/applnk/Multimedia/artsbuilder.desktop
 share/applnk/Multimedia/artscontrol.desktop
@@ -800,6 +800,18 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/noatun/eq.preset
 @dirrm share/apps/noatun
 @dirrm share/apps/kscd/pics
+@dirrm share/apps/kscd/cddb/soundtrack
+@dirrm share/apps/kscd/cddb/rock
+@dirrm share/apps/kscd/cddb/reggae
+@dirrm share/apps/kscd/cddb/newage
+@dirrm share/apps/kscd/cddb/misc
+@dirrm share/apps/kscd/cddb/jazz
+@dirrm share/apps/kscd/cddb/folk
+@dirrm share/apps/kscd/cddb/data
+@dirrm share/apps/kscd/cddb/country
+@dirrm share/apps/kscd/cddb/classical
+@dirrm share/apps/kscd/cddb/blues
+@dirrm share/apps/kscd/cddb
 @dirrm share/apps/kscd
 @dirrm share/apps/kmix/pics
 @dirrm share/apps/kmix
@@ -820,6 +832,7 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/kmid/fm
 @dirrm share/apps/kmid
 @dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
 @dirrm share/apps/artscontrol
 @dirrm share/apps/artsbuilder/pics
 @dirrm share/apps/artsbuilder/examples/todo
@@ -827,14 +840,11 @@ share/servicetypes/audiomidi.desktop
 @dirrm share/apps/artsbuilder
 @dirrm share/apps/aktion/toolbar
 @dirrm share/apps/aktion
-@dirrm share/apps
 @dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Multimedia
 @dirrm lib/mcop/Noatun
 @dirrm lib/mcop/Arts
 @dirrm lib/mcop
-@dirrm lib
 @dirrm include/noatun
 @dirrm include/arts
-@dirrm include
-@dirrm bin