Update to 1.2.1:

VERSION 1.2.1:
  FIX: Made the Tag-Editor only operate on visible items. (BR 100268)
  ADD: Database settings added to the first-run wizard.
  FIX: playlist2html generates UTF-8 output now. (BR 100140)
  FIX: Bitrate/length showed random values for untagged mp3 files. (BR 100200)
  FIX: Crash when recoding stream MetaData without CODEC selected. (BR 100077)
  CHG: Show an additional "Compilations with Artist" box in ContextBrowser.
  ADD: Remember collapse-state of boxes in ContextBrowser. (BR 98664)
  ADD: Display an error when unable to connect to MySQL.
  ADD: Konqueror Sidebar now has full drag and drop support.
  CHG: Replaced "Blue Wolf" icon with Nenad Grujicic's amaroK 1.1
       icon, due to legal issues.
  ADD: Parameter "%score" shows the current song's score in OSD.
  CHG: When you delete a song within amaroK, it gets removed from
       the Collection automatically.
  FIX: Directory column in the playlist was eating the first letter.
  ADD: New DCOP call "playlist: setStopAfterCurrent(bool)". (BR 99944)
  FIX: Coverfetcher: Do not crash when no cover was found. (BR 99942)
  FIX: Support for amazon.co.jp was broken.
  CHG: Toolbar items reordered for optimal usability, as suggested by
       Aaron "Tom Green" Seigo.
  FIX: Show covers for albums containing chars '#' or '?'. (BR 96971 99780)
  ADD: Help file for the playlist2html script.
  ADD: New DCOP call "playlist: int getActiveIndex()".
  ADD: New DCOP call "playlist: playByIndex(int)".
  CHG: Upgraded internal SQLite database to 3.1.3.
  FIX: Update the database after editing tags in playlist. (BR 99593)
  ADD: New DCOP function "player: trackPlayCounter". (BR 99575)
  ADD: .ram playlist support with code from Kaffeine. (BR 96101)
  FIX: amaroK can now determine the correct track-length even for formats
       unknown to TagLib. Makes it possible to seek e.g. in m4a tracks.
  ADD: Can now pick from multiple Musicbrainz results. Patch from
       Jonathan Halcrow <gte899j@prism.gatech.edu>. (BR 89701)
  ADD: May now set a custom cover on multiple albums in the Cover-Manager.
  ADD: Support relative path of tracks in writing playlists. (BR 91053)
  FIX: Don't inline-edit tags for the whole playlist's selection.
  FIX: Fix "Recode Tags" crash issues. (BR 95041)
  ADD: "Set Custom Cover" can fetch remote images. (BR 90499)

4 files changed, 55 insertions, 33 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 842c5ce64b1..8f7cd993161 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/02/20 20:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/28 16:54:42 wiz Exp $
 
-DISTNAME=		amarok-1.2
+DISTNAME=		amarok-1.2.1
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index b708537ef31..927f987ac54 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/20 20:41:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/02/28 16:54:42 wiz Exp $
 bin/amarok
 bin/amarok_libvisual
 bin/amarok_xmmswrapper2
@@ -52,14 +52,33 @@ share/doc/kde/HTML/en/amarok/status_bar.png
 share/doc/kde/HTML/en/amarok/using.docbook
 share/doc/kde/HTML/en/amarok/vis_window.png
 share/doc/kde/HTML/ru/amarok/advanced.docbook
+share/doc/kde/HTML/ru/amarok/collection.png
 share/doc/kde/HTML/ru/amarok/common
 share/doc/kde/HTML/ru/amarok/config.docbook
+share/doc/kde/HTML/ru/amarok/config_appearance.png
+share/doc/kde/HTML/ru/amarok/config_collection.png
+share/doc/kde/HTML/ru/amarok/config_engine.png
+share/doc/kde/HTML/ru/amarok/config_general.png
+share/doc/kde/HTML/ru/amarok/config_osd.png
+share/doc/kde/HTML/ru/amarok/config_playback.png
+share/doc/kde/HTML/ru/amarok/config_scrobbler.png
+share/doc/kde/HTML/ru/amarok/context.png
+share/doc/kde/HTML/ru/amarok/coverman.png
+share/doc/kde/HTML/ru/amarok/equalizer.png
 share/doc/kde/HTML/ru/amarok/faq.docbook
 share/doc/kde/HTML/ru/amarok/feature_guide.docbook
+share/doc/kde/HTML/ru/amarok/file_browser.png
 share/doc/kde/HTML/ru/amarok/index.cache.bz2
 share/doc/kde/HTML/ru/amarok/index.docbook
+share/doc/kde/HTML/ru/amarok/menubar.png
+share/doc/kde/HTML/ru/amarok/pl_browser.png
+share/doc/kde/HTML/ru/amarok/pl_tip1.png
+share/doc/kde/HTML/ru/amarok/play_list.png
+share/doc/kde/HTML/ru/amarok/playlist_window.png
 share/doc/kde/HTML/ru/amarok/quick.docbook
 share/doc/kde/HTML/ru/amarok/requirements.docbook
+share/doc/kde/HTML/ru/amarok/rmb_menu.png
+share/doc/kde/HTML/ru/amarok/status_bar.png
 share/doc/kde/HTML/ru/amarok/using.docbook
 share/kde/apps/amarok/amarokui.rc
 share/kde/apps/amarok/amarokui_xmms.rc
@@ -76,6 +95,8 @@ share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/kde/apps/amarok/icons/crystalsvg/32x32/actions/player_playlist_2.png
 share/kde/apps/amarok/icons/crystalsvg/48x48/actions/player_playlist_2.png
+share/kde/apps/amarok/icons/crystalsvg/64x64/actions/random.png
+share/kde/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
 share/kde/apps/amarok/images/amarok_cut.png
 share/kde/apps/amarok/images/amarok_rocks.jpg
 share/kde/apps/amarok/images/audioscrobbler.png
@@ -111,12 +132,31 @@ share/kde/apps/amarok/scripts/alarm/README
 share/kde/apps/amarok/scripts/alarm/alarm.py
 share/kde/apps/amarok/scripts/playlist2html/Playlist.py
 share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py
+share/kde/apps/amarok/scripts/playlist2html/README
 share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
 share/kde/apps/amarok/scripts/templates/amarok.rb
 share/kde/apps/amarok/scripts/templates/python_qt_template.py
 share/kde/apps/amarok/scripts/templates/ruby_qt_template.rb
+share/kde/apps/amarok/scripts/webcontrol/Globals.py
+share/kde/apps/amarok/scripts/webcontrol/Playlist.py
+share/kde/apps/amarok/scripts/webcontrol/README
+share/kde/apps/amarok/scripts/webcontrol/RequestHandler.py
+share/kde/apps/amarok/scripts/webcontrol/WebControl.py
+share/kde/apps/amarok/scripts/webcontrol/amarok_cut.png
+share/kde/apps/amarok/scripts/webcontrol/controlbackground.png
+share/kde/apps/amarok/scripts/webcontrol/main.css
+share/kde/apps/amarok/scripts/webcontrol/main.js
+share/kde/apps/amarok/scripts/webcontrol/player_end.png
+share/kde/apps/amarok/scripts/webcontrol/player_pause.png
+share/kde/apps/amarok/scripts/webcontrol/player_play.png
+share/kde/apps/amarok/scripts/webcontrol/player_start.png
+share/kde/apps/amarok/scripts/webcontrol/player_stop.png
+share/kde/apps/amarok/scripts/webcontrol/template.thtml
+share/kde/apps/amarok/scripts/webcontrol/vol_speaker.png
 share/kde/apps/amarok/themes/flat/stylesheet.css
 share/kde/apps/konqsidebartng/add/amarok.desktop
+share/kde/apps/konqsidebartng/entries/amarok.desktop
+share/kde/apps/konqsidebartng/kicker_entries/amarok.desktop
 share/kde/apps/konqueror/servicemenus/amarok_append.desktop
 share/kde/apps/profiles/amarok.profile.xml
 share/kde/config.kcfg/amarok.kcfg
@@ -128,17 +168,16 @@ share/kde/icons/crystalsvg/22x22/apps/amarok.png
 share/kde/icons/crystalsvg/32x32/apps/amarok.png
 share/kde/icons/crystalsvg/48x48/apps/amarok.png
 share/kde/icons/crystalsvg/64x64/apps/amarok.png
-share/kde/icons/crystalsvg/scalable/apps/amarok.svgz
 share/kde/services/amarok_artsengine_plugin.desktop
 share/kde/services/amarok_gstengine_plugin.desktop
 share/kde/services/amarok_void-engine_plugin.desktop
 share/kde/services/amarok_xine-engine.desktop
-share/kde/services/amarok_xineengine_plugin.desktop
 share/kde/servicetypes/amarok_plugin.desktop
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/br/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/amarok.mo
@@ -149,6 +188,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amarok.mo
@@ -163,6 +203,7 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/amarok.mo
@@ -184,14 +225,19 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/amarok.mo
 @comment in kde: @dirrm share/kde/config
 @comment in kde: @dirrm share/kde/apps/profiles
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
+@comment in kdebase: dirrm share/kde/apps/konqsidebartng/kicker_entries
+@comment in kdebase: dirrm share/kde/apps/konqsidebartng/entries
 @comment in kdebase: dirrm share/kde/apps/konqsidebartng/add
 @dirrm share/kde/apps/amarok/themes/flat
 @dirrm share/kde/apps/amarok/themes
+@dirrm share/kde/apps/amarok/scripts/webcontrol
 @dirrm share/kde/apps/amarok/scripts/templates
 @dirrm share/kde/apps/amarok/scripts/playlist2html
 @dirrm share/kde/apps/amarok/scripts/alarm
 @dirrm share/kde/apps/amarok/scripts
 @dirrm share/kde/apps/amarok/images
+@dirrm share/kde/apps/amarok/icons/crystalsvg/64x64/actions
+@dirrm share/kde/apps/amarok/icons/crystalsvg/64x64
 @dirrm share/kde/apps/amarok/icons/crystalsvg/48x48/actions
 @dirrm share/kde/apps/amarok/icons/crystalsvg/48x48
 @dirrm share/kde/apps/amarok/icons/crystalsvg/32x32/actions
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 651bc923b35..fee91fa4b66 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:43 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/02/28 16:54:42 wiz Exp $
 
-SHA1 (amarok-1.2.tar.bz2) = a5358f2b3ee11b66d60b852553d17eb25c3a8655
-RMD160 (amarok-1.2.tar.bz2) = b13f404e90271d33d91c262de862362af56b8258
-Size (amarok-1.2.tar.bz2) = 5449066 bytes
-SHA1 (patch-aa) = ab5f884612e3e25633c4fab6227849142b960b39
+SHA1 (amarok-1.2.1.tar.bz2) = a0191412028c8bc26be06919d50305a4a65d1395
+RMD160 (amarok-1.2.1.tar.bz2) = 2cb2711f8e915fd05b705d0b31692b1613a3a0e9
+Size (amarok-1.2.1.tar.bz2) = 5815092 bytes
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index a733f4fe3de..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/02/20 20:41:40 wiz Exp $
-
---- amarok/src/amarokcore/crashhandler.cpp.orig	2005-02-13 14:01:30.000000000 +0100
-+++ amarok/src/amarokcore/crashhandler.cpp
-@@ -42,15 +42,15 @@ namespace amaroK
-     runCommand( const QCString &command )
-     {
-         static const uint SIZE = 40960; //40 KiB
--        static char stdout[ SIZE ];
-+        static char amarok_stdout[ SIZE ];
- 
-         debug() << "Running: " << command << endl;
- 
-         FILE *process = ::popen( command, "r" );
--        stdout[ std::fread( (void*)stdout, sizeof(char), SIZE-1, process ) ] = '\0';
-+        amarok_stdout[ std::fread( (void*)amarok_stdout, sizeof(char), SIZE-1, process ) ] = '\0';
-         ::pclose( process );
- 
--        return QString::fromLocal8Bit( stdout );
-+        return QString::fromLocal8Bit( amarok_stdout );
-     }
- 
-     void