6 files changed, 334 insertions, 99 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index d56271083c96..1734d9f677fe 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,11 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	lauri@kde.org
 COMMENT=	Media player for KDE
 
-LIB_DEPENDS=    tag.4:${PORTSDIR}/audio/taglib
-
-BROKEN=		Incomplete pkg-plist
-
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
+LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
@@ -27,13 +22,15 @@ GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_SDL=	sdl
 
-OPTIONS=	ARTS "aRts support" off \
-		GSTREAMER "GStreamer support" on \
-		XINE "xine support" off \
-		XMMS "XMMS visualizations" on \
-		LIBVISUAL "libvisual support" on \
+OPTIONS=	ARTS "aRts playback engine" off \
+		GSTREAMER "GStreamer playback engine" on \
+		XINE "Xine playback engine" off \
+		XMMS "XMMS visualizations" off \
+		LIBVISUAL "libvisual support" off \
 		OPENGL "OpenGL support" on \
-		AMAZON "Amazon cover fetching support" on
+		AMAZON "Amazon cover fetching support" on \
+		MYSQL "Use MySQL as collection backend" off \
+		AKODE "Akode playback engine" off
 
 .include <bsd.port.pre.mk>
 
@@ -49,16 +46,16 @@ PLIST_SUB+=	ARTS=""
 CONFIGURE_ARGS+=--without-gstreamer
 PLIST_SUB+=	GSTREAMER="@comment "
 .else
-LIB_DEPENDS+=	gstplay-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
+USE_GSTREAMER+=	core
 PLIST_SUB+=	GSTREAMER=""
 .endif
 
 .if defined(WITHOUT_XINE)
 CONFIGURE_ARGS+=--without-xine
-PLIST_SUB+=     XINE="@comment "
+PLIST_SUB+=	XINE="@comment "
 .else
-LIB_DEPENDS+=   xine.12:${PORTSDIR}/multimedia/libxine
-PLIST_SUB+=     XINE=""
+LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
+PLIST_SUB+=	XINE=""
 .endif
 
 .if defined(WITHOUT_XMMS)
@@ -70,11 +67,10 @@ PLIST_SUB+=	XMMS=""
 .endif
 
 .if defined(WITHOUT_LIBVISUAL)
-PLIST_SUB+=     LIBVISUAL="@comment "
+PLIST_SUB+=	LIBVISUAL="@comment "
 .else
-LIB_DEPENDS+=   visual.0:${PORTSDIR}/graphics/libvisual
-PLIST_SUB+=     LIBVISUAL=""
-
+LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
+PLIST_SUB+=	LIBVISUAL=""
 .endif
 
 .if defined(WITHOUT_OPENGL)
@@ -85,6 +81,20 @@ CONFIGURE_ARGS+=--without-opengl
 CONFIGURE_ARGS+=--without-amazon
 .endif
 
+.if !defined(WITHOUT_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--enable-mysql
+.endif
+
+.if defined(WITHOUT_AKODE)
+CONFIGURE_ARGS+=--without-akode
+PLIST_SUB+=	AKODE="@comment "
+.else
+CONFIGURE_ARGS+=--with-akode
+LIB_DEPENDS+=	akode:${PORTSDIR}/audio/akode
+PLIST_SUB+=	AKODE=""
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index ec5b45273208..87380b4ce2c4 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (amarok-1.1.1.tar.bz2) = 6c0cccd4c8b508a2e0c9b0f187a907cf
-SIZE (amarok-1.1.1.tar.bz2) = 2888815
+MD5 (amarok-1.2.3.tar.bz2) = 0082f47cb4503afc7d8e671cfd5cb983
+SIZE (amarok-1.2.3.tar.bz2) = 6061235
diff --git a/audio/amarok-kde4/files/patch-amarok-src-vis-libvisual-libvisual.cpp b/audio/amarok-kde4/files/patch-amarok-src-vis-libvisual-libvisual.cpp
deleted file mode 100644
index 9519f6aa7a1f..000000000000
--- a/audio/amarok-kde4/files/patch-amarok-src-vis-libvisual-libvisual.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- amarok/src/vis/libvisual/libvisual.cpp.orig	Sun Nov 28 16:51:39 2004
-+++ amarok/src/vis/libvisual/libvisual.cpp	Sun Nov 28 16:52:56 2004
-@@ -267,11 +267,11 @@
-                 break;
- 
-             case SDL_MOUSEBUTTONDOWN:
--                visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_DOWN);
-+                visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_DOWN, 0, 0);
-                 break;
- 
-             case SDL_MOUSEBUTTONUP:
--                visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_UP);
-+                visual_event_queue_add_mousebutton (vevent, event.button.button, VISUAL_MOUSE_UP, 0, 0);
-                 break;
- 
-             case SDL_QUIT:
diff --git a/audio/amarok-kde4/files/patch-amarok-src-vis-xmmswrapper-xmmswrapper.cpp b/audio/amarok-kde4/files/patch-amarok-src-vis-xmmswrapper-xmmswrapper.cpp
deleted file mode 100644
index aecb7339c438..000000000000
--- a/audio/amarok-kde4/files/patch-amarok-src-vis-xmmswrapper-xmmswrapper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- amarok/src/vis/xmmswrapper/xmmswrapper.cpp.orig	Mon Oct 18 13:37:03 2004
-+++ amarok/src/vis/xmmswrapper/xmmswrapper.cpp	Mon Oct 18 13:37:36 2004
-@@ -8,6 +8,7 @@
- #include <dirent.h>
- #include <dlfcn.h>           //dlopen etc.
- #include <stdlib.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/un.h>
diff --git a/audio/amarok-kde4/files/patch-configure b/audio/amarok-kde4/files/patch-configure
new file mode 100644
index 000000000000..16f93f652e08
--- /dev/null
+++ b/audio/amarok-kde4/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Mon Mar 28 21:16:17 2005
++++ configure	Mon Apr 11 02:44:50 2005
+@@ -35871,15 +35871,15 @@
+ fi
+ 
+ 
+-if test x$SDL_CONFIG = xyes; then
+-    sdl_cflags=`sdl-config --cflags`
+-    sdl_libs=`sdl-config --libs`
++if test -n $SDL_CONFIG ; then
++    sdl_cflags=`$SDL_CONFIG --cflags`
++    sdl_libs=`$SDL_CONFIG --libs`
+ fi
+ 
+ 
+ 
+ 
+-if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
++if test x$PKGCONFIGFOUND = xyes -a -n $SDL_CONFIG ; then
+ 
+ 
+   succeeded=no
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 68a1fcaaf8ef..200eefe315fd 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -1,16 +1,19 @@
 bin/amarok
+bin/amarokapp
 %%LIBVISUAL%%bin/amarok_libvisual
 %%XMMS%%bin/amarok_xmmswrapper2
-bin/amarokapp
-bin/release_amarok
+lib/kde3/konqsidebar_universalamarok.la
+lib/kde3/konqsidebar_universalamarok.so
+%%AKODE%%lib/kde3/libamarok_aKode-engine.la
+%%AKODE%%lib/kde3/libamarok_aKode-engine.so
 %%ARTS%%lib/kde3/libamarok_artsengine_plugin.la
 %%ARTS%%lib/kde3/libamarok_artsengine_plugin.so
 %%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.la
 %%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.so
-lib/kde3/libamarok_void-engine_plugin.la
-lib/kde3/libamarok_void-engine_plugin.so
 %%XINE%%lib/kde3/libamarok_xine-engine.la
 %%XINE%%lib/kde3/libamarok_xine-engine.so
+lib/kde3/libamarok_void-engine_plugin.la
+lib/kde3/libamarok_void-engine_plugin.so
 %%ARTS%%lib/libamarokarts.la
 %%ARTS%%lib/libamarokarts.so
 %%ARTS%%lib/mcop/Amarok/RawScope.mcopclass
@@ -26,17 +29,31 @@ share/apps/amarok/data/dot.png
 share/apps/amarok/data/grid.png
 share/apps/amarok/data/wirl1.png
 share/apps/amarok/data/wirl2.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/random.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/32x32/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/48x48/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/random.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
 share/apps/amarok/images/amarok_cut.png
 share/apps/amarok/images/amarok_rocks.jpg
+share/apps/amarok/images/audioscrobbler.png
 share/apps/amarok/images/b_next.png
 share/apps/amarok/images/b_pause.png
 share/apps/amarok/images/b_play.png
 share/apps/amarok/images/b_prev.png
 share/apps/amarok/images/b_stop.png
+share/apps/amarok/images/babelfish.png
 share/apps/amarok/images/bucky.png
-share/apps/amarok/images/context_gradient.png
 share/apps/amarok/images/covermanager.png
+share/apps/amarok/images/currenttrack_pause.png
 share/apps/amarok/images/currenttrack_play.png
+share/apps/amarok/images/currenttrack_repeat.png
 share/apps/amarok/images/description.png
 share/apps/amarok/images/eq_active2.png
 share/apps/amarok/images/eq_inactive2.png
@@ -54,42 +71,122 @@ share/apps/amarok/images/time_plus.png
 share/apps/amarok/images/vol_speaker.png
 share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
+share/apps/amarok/scripts/alarm/README
+share/apps/amarok/scripts/alarm/alarm.py
+share/apps/amarok/scripts/graphequalizer/README
+share/apps/amarok/scripts/graphequalizer/graphequalizer
+share/apps/amarok/scripts/playlist2html/Playlist.py
+share/apps/amarok/scripts/playlist2html/PlaylistServer.py
+share/apps/amarok/scripts/playlist2html/README
+share/apps/amarok/scripts/playlist2html/playlist2html.py
+share/apps/amarok/scripts/templates/amarok.rb
+share/apps/amarok/scripts/templates/python_qt_template.py
+share/apps/amarok/scripts/templates/ruby_qt_template.rb
+share/apps/amarok/scripts/webcontrol/Globals.py
+share/apps/amarok/scripts/webcontrol/Playlist.py
+share/apps/amarok/scripts/webcontrol/README
+share/apps/amarok/scripts/webcontrol/RequestHandler.py
+share/apps/amarok/scripts/webcontrol/WebControl.py
+share/apps/amarok/scripts/webcontrol/amarok_cut.png
+share/apps/amarok/scripts/webcontrol/controlbackground.png
+share/apps/amarok/scripts/webcontrol/main.css
+share/apps/amarok/scripts/webcontrol/main.js
+share/apps/amarok/scripts/webcontrol/player_end.png
+share/apps/amarok/scripts/webcontrol/player_pause.png
+share/apps/amarok/scripts/webcontrol/player_play.png
+share/apps/amarok/scripts/webcontrol/player_start.png
+share/apps/amarok/scripts/webcontrol/player_stop.png
+share/apps/amarok/scripts/webcontrol/template.thtml
+share/apps/amarok/scripts/webcontrol/vol_speaker.png
+share/apps/amarok/themes/default/stylesheet.css
+share/apps/amarok/themes/reinhardt/images/background.png
+share/apps/amarok/themes/reinhardt/images/transparency.png
+share/apps/amarok/themes/reinhardt/stylesheet.css
+share/apps/konqsidebartng/add/amarok.desktop
+share/apps/konqsidebartng/entries/amarok.desktop
+share/apps/konqsidebartng/kicker_entries/amarok.desktop
 share/apps/konqueror/servicemenus/amarok_append.desktop
+share/apps/profiles/amarok.profile.xml
 share/config.kcfg/amarok.kcfg
 %%GSTREAMER%%share/config.kcfg/gstconfig.kcfg
 share/config/amarokrc
+share/doc/HTML/da/amarok/advanced.docbook
 share/doc/HTML/da/amarok/common
+share/doc/HTML/da/amarok/config.docbook
+share/doc/HTML/da/amarok/develop.docbook
+share/doc/HTML/da/amarok/faq.docbook
+share/doc/HTML/da/amarok/feature_guide.docbook
+share/doc/HTML/da/amarok/hidden.docbook
 share/doc/HTML/da/amarok/index.cache.bz2
 share/doc/HTML/da/amarok/index.docbook
+share/doc/HTML/da/amarok/quick.docbook
+share/doc/HTML/da/amarok/requirements.docbook
+share/doc/HTML/da/amarok/using.docbook
+share/doc/HTML/de/amarok/advanced.docbook
+share/doc/HTML/de/amarok/analyzer.png
+share/doc/HTML/de/amarok/buttons.png
+share/doc/HTML/de/amarok/collection.png
+share/doc/HTML/de/amarok/common
+share/doc/HTML/de/amarok/config.docbook
+share/doc/HTML/de/amarok/config_appearance.png
+share/doc/HTML/de/amarok/config_engine.png
+share/doc/HTML/de/amarok/config_general.png
+share/doc/HTML/de/amarok/config_osd.png
+share/doc/HTML/de/amarok/config_playback.png
+share/doc/HTML/de/amarok/context.png
+share/doc/HTML/de/amarok/coverman.png
+share/doc/HTML/de/amarok/develop.docbook
+share/doc/HTML/de/amarok/faq.docbook
+share/doc/HTML/de/amarok/file_browser.png
+share/doc/HTML/de/amarok/hidden.docbook
+share/doc/HTML/de/amarok/index.cache.bz2
+share/doc/HTML/de/amarok/index.docbook
+share/doc/HTML/de/amarok/menubar.png
+share/doc/HTML/de/amarok/pl_browser.png
+share/doc/HTML/de/amarok/pl_tip1.png
+share/doc/HTML/de/amarok/play_list.png
+share/doc/HTML/de/amarok/player_window.png
+share/doc/HTML/de/amarok/playlist_window.png
+share/doc/HTML/de/amarok/quick.docbook
+share/doc/HTML/de/amarok/requirements.docbook
+share/doc/HTML/de/amarok/rmb_menu.png
+share/doc/HTML/de/amarok/search.png
+share/doc/HTML/de/amarok/status_bar.png
+share/doc/HTML/de/amarok/using.docbook
+share/doc/HTML/de/amarok/vis_window.png
 share/doc/HTML/en/amarok/advanced.docbook
 share/doc/HTML/en/amarok/analyzer.png
 share/doc/HTML/en/amarok/buttons.png
 share/doc/HTML/en/amarok/collection.png
 share/doc/HTML/en/amarok/common
 share/doc/HTML/en/amarok/config.docbook
-share/doc/HTML/en/amarok/config_colors.png
+share/doc/HTML/en/amarok/config_appearance.png
+share/doc/HTML/en/amarok/config_collection.png
 share/doc/HTML/en/amarok/config_engine.png
-share/doc/HTML/en/amarok/config_fonts.png
 share/doc/HTML/en/amarok/config_general.png
 share/doc/HTML/en/amarok/config_osd.png
 share/doc/HTML/en/amarok/config_playback.png
+share/doc/HTML/en/amarok/config_scrobbler.png
 share/doc/HTML/en/amarok/context.png
 share/doc/HTML/en/amarok/coverman.png
-share/doc/HTML/en/amarok/develop.docbook
+share/doc/HTML/en/amarok/equalizer.png
 share/doc/HTML/en/amarok/faq.docbook
+share/doc/HTML/en/amarok/feature_guide.docbook
 share/doc/HTML/en/amarok/file_browser.png
-share/doc/HTML/en/amarok/hidden.docbook
 share/doc/HTML/en/amarok/index.cache.bz2
 share/doc/HTML/en/amarok/index.docbook
 share/doc/HTML/en/amarok/logo.png
+share/doc/HTML/en/amarok/media_device.png
+share/doc/HTML/en/amarok/menubar.png
+share/doc/HTML/en/amarok/musicbrainz.png
 share/doc/HTML/en/amarok/pl_browser.png
 share/doc/HTML/en/amarok/pl_tip1.png
 share/doc/HTML/en/amarok/play_list.png
 share/doc/HTML/en/amarok/player_window.png
 share/doc/HTML/en/amarok/playlist_window.png
+share/doc/HTML/en/amarok/quick.docbook
 share/doc/HTML/en/amarok/requirements.docbook
 share/doc/HTML/en/amarok/rmb_menu.png
-share/doc/HTML/en/amarok/search.png
 share/doc/HTML/en/amarok/status_bar.png
 share/doc/HTML/en/amarok/using.docbook
 share/doc/HTML/en/amarok/vis_window.png
@@ -98,61 +195,191 @@ share/doc/HTML/et/amarok/common
 share/doc/HTML/et/amarok/config.docbook
 share/doc/HTML/et/amarok/develop.docbook
 share/doc/HTML/et/amarok/faq.docbook
+share/doc/HTML/et/amarok/feature_guide.docbook
+share/doc/HTML/et/amarok/hidden.docbook
 share/doc/HTML/et/amarok/howto.docbook
 share/doc/HTML/et/amarok/index.cache.bz2
 share/doc/HTML/et/amarok/index.docbook
 share/doc/HTML/et/amarok/plugin.docbook
+share/doc/HTML/et/amarok/quick.docbook
 share/doc/HTML/et/amarok/requirements.docbook
 share/doc/HTML/et/amarok/using.docbook
+share/doc/HTML/fr/amarok/advanced.docbook
 share/doc/HTML/fr/amarok/common
+share/doc/HTML/fr/amarok/config.docbook
+share/doc/HTML/fr/amarok/faq.docbook
+share/doc/HTML/fr/amarok/feature_guide.docbook
 share/doc/HTML/fr/amarok/index.cache.bz2
 share/doc/HTML/fr/amarok/index.docbook
+share/doc/HTML/fr/amarok/quick.docbook
+share/doc/HTML/fr/amarok/requirements.docbook
+share/doc/HTML/fr/amarok/using.docbook
 share/doc/HTML/it/amarok/advanced.docbook
 share/doc/HTML/it/amarok/common
 share/doc/HTML/it/amarok/config.docbook
 share/doc/HTML/it/amarok/develop.docbook
 share/doc/HTML/it/amarok/faq.docbook
+share/doc/HTML/it/amarok/feature_guide.docbook
 share/doc/HTML/it/amarok/hidden.docbook
 share/doc/HTML/it/amarok/index.cache.bz2
 share/doc/HTML/it/amarok/index.docbook
 share/doc/HTML/it/amarok/plugin.docbook
+share/doc/HTML/it/amarok/quick.docbook
 share/doc/HTML/it/amarok/requirements.docbook
 share/doc/HTML/it/amarok/using.docbook
+share/doc/HTML/nl/amarok/advanced.docbook
+share/doc/HTML/nl/amarok/analyzer.png
+share/doc/HTML/nl/amarok/buttons.png
+share/doc/HTML/nl/amarok/collection.png
+share/doc/HTML/nl/amarok/common
+share/doc/HTML/nl/amarok/config.docbook
+share/doc/HTML/nl/amarok/config_appearance.png
+share/doc/HTML/nl/amarok/config_collection.png
+share/doc/HTML/nl/amarok/config_colors.png
+share/doc/HTML/nl/amarok/config_engine.png
+share/doc/HTML/nl/amarok/config_fonts.png
+share/doc/HTML/nl/amarok/config_general.png
+share/doc/HTML/nl/amarok/config_osd.png
+share/doc/HTML/nl/amarok/config_playback.png
+share/doc/HTML/nl/amarok/config_scrobbler.png
+share/doc/HTML/nl/amarok/context.png
+share/doc/HTML/nl/amarok/coverman.png
+share/doc/HTML/nl/amarok/develop.docbook
+share/doc/HTML/nl/amarok/equalizer.png
+share/doc/HTML/nl/amarok/faq.docbook
+share/doc/HTML/nl/amarok/feature_guide.docbook
+share/doc/HTML/nl/amarok/file_browser.png
+share/doc/HTML/nl/amarok/hidden.docbook
+share/doc/HTML/nl/amarok/index.cache.bz2
+share/doc/HTML/nl/amarok/index.docbook
+share/doc/HTML/nl/amarok/media_device.png
+share/doc/HTML/nl/amarok/menubar.png
+share/doc/HTML/nl/amarok/pl_browser.png
+share/doc/HTML/nl/amarok/pl_tip1.png
+share/doc/HTML/nl/amarok/play_list.png
+share/doc/HTML/nl/amarok/player_window.png
+share/doc/HTML/nl/amarok/playlist_window.png
+share/doc/HTML/nl/amarok/plugin.docbook
+share/doc/HTML/nl/amarok/quick.docbook
+share/doc/HTML/nl/amarok/requirements.docbook
+share/doc/HTML/nl/amarok/rmb_menu.png
+share/doc/HTML/nl/amarok/search.png
+share/doc/HTML/nl/amarok/status_bar.png
+share/doc/HTML/nl/amarok/using.docbook
+share/doc/HTML/nl/amarok/vis_window.png
 share/doc/HTML/pt/amarok/advanced.docbook
 share/doc/HTML/pt/amarok/common
 share/doc/HTML/pt/amarok/config.docbook
 share/doc/HTML/pt/amarok/develop.docbook
 share/doc/HTML/pt/amarok/faq.docbook
+share/doc/HTML/pt/amarok/feature_guide.docbook
 share/doc/HTML/pt/amarok/hidden.docbook
 share/doc/HTML/pt/amarok/index.cache.bz2
 share/doc/HTML/pt/amarok/index.docbook
 share/doc/HTML/pt/amarok/plugin.docbook
+share/doc/HTML/pt/amarok/quick.docbook
 share/doc/HTML/pt/amarok/requirements.docbook
 share/doc/HTML/pt/amarok/using.docbook
+share/doc/HTML/pt_BR/amarok/advanced.docbook
+share/doc/HTML/pt_BR/amarok/analyzer.png
+share/doc/HTML/pt_BR/amarok/buttons.png
+share/doc/HTML/pt_BR/amarok/collection.png
+share/doc/HTML/pt_BR/amarok/common
+share/doc/HTML/pt_BR/amarok/config.docbook
+share/doc/HTML/pt_BR/amarok/config_appearance.png
+share/doc/HTML/pt_BR/amarok/config_collection.png
+share/doc/HTML/pt_BR/amarok/config_engine.png
+share/doc/HTML/pt_BR/amarok/config_general.png
+share/doc/HTML/pt_BR/amarok/config_osd.png
+share/doc/HTML/pt_BR/amarok/config_playback.png
+share/doc/HTML/pt_BR/amarok/config_scrobbler.png
+share/doc/HTML/pt_BR/amarok/context.png
+share/doc/HTML/pt_BR/amarok/coverman.png
+share/doc/HTML/pt_BR/amarok/equalizer.png
+share/doc/HTML/pt_BR/amarok/faq.docbook
+share/doc/HTML/pt_BR/amarok/feature_guide.docbook
+share/doc/HTML/pt_BR/amarok/file_browser.png
+share/doc/HTML/pt_BR/amarok/index.cache.bz2
+share/doc/HTML/pt_BR/amarok/index.docbook
+share/doc/HTML/pt_BR/amarok/logo.png
+share/doc/HTML/pt_BR/amarok/media_device.png
+share/doc/HTML/pt_BR/amarok/menubar.png
+share/doc/HTML/pt_BR/amarok/musicbrainz.png
+share/doc/HTML/pt_BR/amarok/pl_browser.png
+share/doc/HTML/pt_BR/amarok/pl_tip1.png
+share/doc/HTML/pt_BR/amarok/play_list.png
+share/doc/HTML/pt_BR/amarok/player_window.png
+share/doc/HTML/pt_BR/amarok/playlist_window.png
+share/doc/HTML/pt_BR/amarok/quick.docbook
+share/doc/HTML/pt_BR/amarok/requirements.docbook
+share/doc/HTML/pt_BR/amarok/rmb_menu.png
+share/doc/HTML/pt_BR/amarok/status_bar.png
+share/doc/HTML/pt_BR/amarok/using.docbook
+share/doc/HTML/pt_BR/amarok/vis_window.png
+share/doc/HTML/ru/amarok/advanced.docbook
+share/doc/HTML/ru/amarok/collection.png
+share/doc/HTML/ru/amarok/common
+share/doc/HTML/ru/amarok/config.docbook
+share/doc/HTML/ru/amarok/config_appearance.png
+share/doc/HTML/ru/amarok/config_collection.png
+share/doc/HTML/ru/amarok/config_engine.png
+share/doc/HTML/ru/amarok/config_general.png
+share/doc/HTML/ru/amarok/config_osd.png
+share/doc/HTML/ru/amarok/config_playback.png
+share/doc/HTML/ru/amarok/config_scrobbler.png
+share/doc/HTML/ru/amarok/context.png
+share/doc/HTML/ru/amarok/coverman.png
+share/doc/HTML/ru/amarok/equalizer.png
+share/doc/HTML/ru/amarok/faq.docbook
+share/doc/HTML/ru/amarok/feature_guide.docbook
+share/doc/HTML/ru/amarok/file_browser.png
+share/doc/HTML/ru/amarok/index.cache.bz2
+share/doc/HTML/ru/amarok/index.docbook
+share/doc/HTML/ru/amarok/menubar.png
+share/doc/HTML/ru/amarok/pl_browser.png
+share/doc/HTML/ru/amarok/pl_tip1.png
+share/doc/HTML/ru/amarok/play_list.png
+share/doc/HTML/ru/amarok/playlist_window.png
+share/doc/HTML/ru/amarok/quick.docbook
+share/doc/HTML/ru/amarok/requirements.docbook
+share/doc/HTML/ru/amarok/rmb_menu.png
+share/doc/HTML/ru/amarok/status_bar.png
+share/doc/HTML/ru/amarok/using.docbook
 share/doc/HTML/sv/amarok/advanced.docbook
 share/doc/HTML/sv/amarok/buttons.png
 share/doc/HTML/sv/amarok/collection.png
 share/doc/HTML/sv/amarok/common
 share/doc/HTML/sv/amarok/config.docbook
+share/doc/HTML/sv/amarok/config_appearance.png
 share/doc/HTML/sv/amarok/config_colors.png
+share/doc/HTML/sv/amarok/config_engine.png
 share/doc/HTML/sv/amarok/config_fonts.png
 share/doc/HTML/sv/amarok/config_general.png
+share/doc/HTML/sv/amarok/config_mysql.png
 share/doc/HTML/sv/amarok/config_osd.png
 share/doc/HTML/sv/amarok/config_playback.png
+share/doc/HTML/sv/amarok/config_scrobbler.png
 share/doc/HTML/sv/amarok/context.png
+share/doc/HTML/sv/amarok/coverman.png
 share/doc/HTML/sv/amarok/develop.docbook
+share/doc/HTML/sv/amarok/equalizer.png
 share/doc/HTML/sv/amarok/faq.docbook
+share/doc/HTML/sv/amarok/feature_guide.docbook
 share/doc/HTML/sv/amarok/file_browser.png
 share/doc/HTML/sv/amarok/hidden.docbook
 share/doc/HTML/sv/amarok/index.cache.bz2
 share/doc/HTML/sv/amarok/index.docbook
+share/doc/HTML/sv/amarok/media_device.png
+share/doc/HTML/sv/amarok/menubar.png
 share/doc/HTML/sv/amarok/pl_browser.png
 share/doc/HTML/sv/amarok/pl_tip1.png
 share/doc/HTML/sv/amarok/play_list.png
 share/doc/HTML/sv/amarok/player_window.png
 share/doc/HTML/sv/amarok/playlist_window.png
 share/doc/HTML/sv/amarok/plugin.docbook
+share/doc/HTML/sv/amarok/quick.docbook
 share/doc/HTML/sv/amarok/requirements.docbook
+share/doc/HTML/sv/amarok/rmb_menu.png
 share/doc/HTML/sv/amarok/scripts_window.png
 share/doc/HTML/sv/amarok/search.png
 share/doc/HTML/sv/amarok/status_bar.png
@@ -160,18 +387,17 @@ share/doc/HTML/sv/amarok/streams.png
 share/doc/HTML/sv/amarok/using.docbook
 share/doc/HTML/sv/amarok/vis_window.png
 share/doc/HTML/sv/amarok/welcome.png
-share/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/icons/crystalsvg/128x128/apps/amarok.png
 share/icons/crystalsvg/16x16/apps/amarok.png
-share/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/icons/crystalsvg/22x22/apps/amarok.png
-share/icons/crystalsvg/32x32/actions/player_playlist_2.png
 share/icons/crystalsvg/32x32/apps/amarok.png
-share/icons/crystalsvg/48x48/actions/player_playlist_2.png
 share/icons/crystalsvg/48x48/apps/amarok.png
 share/icons/crystalsvg/64x64/apps/amarok.png
 share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/bg/LC_MESSAGES/amarok.mo
 share/locale/br/LC_MESSAGES/amarok.mo
 share/locale/ca/LC_MESSAGES/amarok.mo
+share/locale/cs/LC_MESSAGES/amarok.mo
 share/locale/cy/LC_MESSAGES/amarok.mo
 share/locale/da/LC_MESSAGES/amarok.mo
 share/locale/de/LC_MESSAGES/amarok.mo
@@ -182,71 +408,74 @@ share/locale/fr/LC_MESSAGES/amarok.mo
 share/locale/ga/LC_MESSAGES/amarok.mo
 share/locale/gl/LC_MESSAGES/amarok.mo
 share/locale/he/LC_MESSAGES/amarok.mo
+share/locale/hi/LC_MESSAGES/amarok.mo
 share/locale/hu/LC_MESSAGES/amarok.mo
 share/locale/is/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/nb/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
 share/locale/pl/LC_MESSAGES/amarok.mo
 share/locale/pt/LC_MESSAGES/amarok.mo
 share/locale/pt_BR/LC_MESSAGES/amarok.mo
 share/locale/ro/LC_MESSAGES/amarok.mo
 share/locale/ru/LC_MESSAGES/amarok.mo
+share/locale/sl/LC_MESSAGES/amarok.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
+share/locale/sr@Latn/LC_MESSAGES/amarok.mo
 share/locale/sv/LC_MESSAGES/amarok.mo
 share/locale/ta/LC_MESSAGES/amarok.mo
+share/locale/tg/LC_MESSAGES/amarok.mo
 share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uz/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+%%AKODE%%share/services/amarok_aKode-engine.desktop
 %%ARTS%%share/services/amarok_artsengine_plugin.desktop
 %%GSTREAMER%%share/services/amarok_gstengine_plugin.desktop
-share/services/amarok_void-engine_plugin.desktop
 %%XINE%%share/services/amarok_xine-engine.desktop
-%%XINE%%share/services/amarok_xineengine_plugin.desktop
+share/services/amarok_void-engine_plugin.desktop
 share/servicetypes/amarok_plugin.desktop
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/locale/uz/LC_MESSAGES
+@dirrm share/locale/uz
 @dirrm share/doc/HTML/sv/amarok
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrm share/doc/HTML/ru/amarok
+@dirrm share/doc/HTML/pt_BR/amarok
 @dirrm share/doc/HTML/pt/amarok
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrm share/doc/HTML/nl/amarok
 @dirrm share/doc/HTML/it/amarok
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
 @dirrm share/doc/HTML/fr/amarok
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
 @dirrm share/doc/HTML/et/amarok
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
 @dirrm share/doc/HTML/en/amarok
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrm share/doc/HTML/de/amarok
 @dirrm share/doc/HTML/da/amarok
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrm share/apps/amarok/themes/reinhardt/images
+@dirrm share/apps/amarok/themes/reinhardt
+@dirrm share/apps/amarok/themes/default
+@dirrm share/apps/amarok/themes
+@dirrm share/apps/amarok/scripts/webcontrol
+@dirrm share/apps/amarok/scripts/templates
+@dirrm share/apps/amarok/scripts/playlist2html
+@dirrm share/apps/amarok/scripts/graphequalizer
+@dirrm share/apps/amarok/scripts/alarm
+@dirrm share/apps/amarok/scripts
 @dirrm share/apps/amarok/images
+@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
+@dirrm share/apps/amarok/icons/crystalsvg/64x64
+@dirrm share/apps/amarok/icons/crystalsvg/48x48/actions
+@dirrm share/apps/amarok/icons/crystalsvg/48x48
+@dirrm share/apps/amarok/icons/crystalsvg/32x32/actions
+@dirrm share/apps/amarok/icons/crystalsvg/32x32
+@dirrm share/apps/amarok/icons/crystalsvg/22x22/actions
+@dirrm share/apps/amarok/icons/crystalsvg/22x22
+@dirrm share/apps/amarok/icons/crystalsvg/16x16/actions
+@dirrm share/apps/amarok/icons/crystalsvg/16x16
+@dirrm share/apps/amarok/icons/crystalsvg
+@dirrm share/apps/amarok/icons
 @dirrm share/apps/amarok/data
 @dirrm share/apps/amarok
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
 %%ARTS%%@dirrm lib/mcop/Amarok
-%%ARTS%%@unexec rmdir %D/lib/mcop 2>/dev/null || true