Update to 2.3.2:

VERSION 2.3.2
  FEATURES:

  CHANGES:
    * Bumped libMTP dependency to version 1.0.0.
    * Improved response of current track and albums applet on data updates.
    * Use system date/time format for default name when saving user playlists.

  BUGFIXES:
    * Fixed incorrect size of the VideoClip applet. (BR 247097)
    * Comments embedded in files that contained newlines or tabs could be
      skipped entirely. (BR 223502)
    * The equalizer dialog did not discard changes when clicking "Cancel".
      Patch by Anton Gritsay <anton@angri.ru>. (BR 242730)
    * The Last.fm service did not work without KWallet. (BR 235861)
    * Show actual KDE version in the "About Amarok" dialog, instead of the
      version used at compile time.
    * Fixed a crash when trying to save a playlist to a file where the format
      of the playlist was unknown. (BR 246168)
    * Also use podcast channel image for downloaded episodes. (BR 229391)
    * Collection directories that were symlinks could end up storing the wrong
      absolute path, causing those files to be removed during incremental
      scans.
    * Fixed playlist tooltips not showing up, even when enabled in the playlist
      layout (BR 249086)
    * Fixed potential crashes related to Applet loading. (BR 246756)
    * Fixed possible crash in Labels Applet when playing new track. (BR 248538)
    * Fixed incorrect layout of applets on startup.
    * Fixed Collection Browser not properly updating after a full rescan,
      necessitating Amarok to be closed and reopened. Fixes various bugs.
      (BR 172542)
    * Fixed cover found dialog closing when download failed or is cancelled.
    * Fixed failure when fetching cddb info for audio CDs in localized Amarok.
    * Fixed expanding items in collection browser by double-click, in
      double-click mode.
    * Fixed crash when adding new folders repeatedly in podcast/saved playlist
      browsers.
    * Fixed context menu actions acting on wrong indices in the playlist
      browser.
    * Fixed incorrect text about "rpath" argument to collection scanner.
      (BR 236076)
    * Fixed emission of MPRIS StatusChange signal when switching into or out
      of random mode.


VERSION 2.3.2-Beta 1
  FEATURES:
    * Podcasts can now be filtered on provider and grouped in folders. (BR 219519)
    * Amarok 1.4 Database Importer: added support for importing labels.
      Thanks to Matěj Laitl for the patch. (BR 218996)
    * Shortcuts: Added "Replay current track" shortcut. (BR 217081)
    * Edit filter dialog: added "added" and "last played" date filters.
    * File browser: added forward and back buttons for accessing navigate history.
    * Organize Dialog: added a way to save multiple file formats as presets. (BR 122672)
    * Filtering: added default presets to the drop down menu of the collection
      search widget.
    * Filtering: track format can now be used as filter keyword in the
      collection browser, e.g. "format:flac".
    * Filtering: track file size can now be used as filter keyword in the
      collection browser, e.g. "filesize:<12" for tracks under 12Mb;
      "filesize:25" for tracks that are between 25 and 26Mb.
    * Filtering: tracks that were added to the collection since/before a
      certain time can now be filtered using, e.g. "added:<1w".
    * Filtering: added ability to filter last played date in the collection
      browser, e.g. "played:<3d".

  CHANGES:
    * Let scripts access bpm property of tracks (read-only). (BR 245257)
    * Remote Meta+P global shortcut to avoid future problems with new
      keyboard drivers in notebooks. (BR 235204)
    * Fix size of Slim toolbar time labels. Thanks to Tijl Coosemans for the patch.
    * Amarok 1.4 Database Importer: only import tracks that actually belong in the
      collection. Thanks to Matěj Laitl for the patch. (BR 218999)
    * Refresh the albums context applet when the collection is updated.
    * Don't allow the last visible playlist source in User Playlists to be hidden.
    * "Play Media" dialog now remembers the last used directory. (BR 231092)
    * Organize Dialog: tweaked the layout to fit better on smaller resolutions (BR 238000)
    * Filtering: added year suffix for date filters in the collection browser.
    * Last.fm features that require user authentication are now disabled
      by default.
    * Ignore "DJ" prefix when sorting in collection browser. (BR 181955)
      Patch by Richard Longland <rlongland@hotmail.com>.

  BUGFIXES:
    * Tweaked fuzzy numerical comparisons in the APG. (BR 242281)
    * Finally don't truncate the "Label:" label in TagDialog. (BR 235957)
    * Fix crash when right clicking on children of "No labels". NoLabel item is
      now a Data item. (BR 243825)
    * Fix regression in Dynamic Collections. For files that were scanned when
      Dynamic Collections wasn't working, you will need to rescan them to get
      them associated with the proper device.
    * Fix crash on exit with newer KDE versions. Patch by Martin Blumenstingl and Felix
      Geyer. (BR 245513)
    * Fixed playlist bottom toolbar getting to tall when using "Text only"
      button style. (BR 228390)
    * Fixed Amarok layout saving when minized to tray. (BR 244583)
    * Make "No other participants" in the events applet translatable.
      Patch by Jan Janssen. (BR 235311)
    * Fixed track number on DAAP shares. Patch by Silvio Frischknecht. (BR 235030)
    * Fixed filtering by rating in the playlist. (BR 240293)
    * The scripts categories are now translatable. (BR 240563)
    * Fixed Amarok 1.4 Database Importer not importing statistics and lyrics of
      tracks that are not yet in database. Thanks to Matěj Laitl for the patch.
      (see comments on BR 218996)
    * Fixed always playing first track when adding tracks to empty playlist with
      random mode on. Patch by Anton Gritsay <anton@angri.ru> (BR 240452)
    * Directories that were once part of the collection but not anymore may not
      have been properly removed, leading to files outside the collection being
      scanned. (BR 243532)
    * Fixed "genre" and other playlist groupings not working. (BR 243344)
    * Removed track progress effect on TrayIcon as it caused several problems
      (also caused by a bogus implementation of the KSNI class)
      (BR 233506, BR 240463, BR 231539, BR 232578, BR 232312).
    * Fixed track name in main window title incorrectly changing when editing
      tag info for another track. Thanks to Anton Gritsay <anton@angri.ru> for
      the patch (BR 220521)
    * Splitted desktop so mime types can be allocated in a better way
      (BR 242292).
    * Fixed some tracks not being scanned when they had corrupted MusicBrainz
      IDs. Thanks to Matěj Laitl <matej@laitl.cz> for the patch. (BR 236227)
    * Fixed crash when navigating using "Places" in the file browser. (BR 240338)
    * Fixed error dialog popup if the stored directory is no longer accessible
      when using the file browser. (BR 234286)
    * Single clicking a file in the file browser now selects it instead of
      appending to the playlist by default in single-click mode. (BR 233171)
    * Fixed resizing and eliding issues with the file browser breadcrumbs.
      (BR 231366 comment #5)
    * Drop file icons in file browser breadcrumbs. (BR 231366)
    * Fixed keyboard navigation in file browser. (BR 240668)
      Patch thanks to Hannes Koller.
    * Fixed dropping files to playlist from Konqueror. (BR 235722)
    * Fixed keyboard shortcuts of actions from scripts lost after restart.
      Thanks to Martin Blumenstingl <darklight.xdarklight@googlemail.com>.
      (BR 223165)
    * Fixed tracks not changing for "stop after this track" action. (BR 231209)
    * Cleaned up some tooltips/what's this strings in the Organize dialog
      to make it easier to read and, hopefully, understand. (BR 237857)
    * Fixed organize dialog's handling of the year tag. If there is no year
      then the %year token should be an empty string.(BR 237834)
    * The "Ignore 'The'" option in the organize files dialog is now case
      insensitive. (BR 237831)
    * Fixed odd header name when showing "places" in the file browser.
      (BR 238518)
    * Filenames with dots (.) and other special RegEx characters will now be
      parsed correctly when guessing tags from a filename. (BR 225743)
    * Align track details dialog's labels to the right as per KDE4's HIG.
      (BR 234555)
    * The last.fm service will now only open the wallet on startup if the user
      has enabled features that require authentication. (BR 230098)
    * Correctly load the list of labels in tag dialog. (BR 238737)
      Patch by Daniel Faust <hessijames@gmail.com>.
    * Cover manager: fixed crash if closed shortly after opening. (BR 235796)
    * Fixed Last.fm service browser not updating its view if it's open on
      startup. (BR 231044)
    * Fixed clicking on browser categories not honoring mouse settings. (BR 226533)
    * Fixed usability issue with regards to context menu item order when right
      clicking in the playlist widget. (BR 198650)

6 files changed, 169 insertions, 22 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 98062701eb3..5e2989c759e 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2010/09/14 11:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2010/09/20 21:29:15 wiz Exp $
 #
 
 DISTNAME=	amarok-${VERS}
-VERS=		2.3.1
-PKGREVISION=	2
+VERS=		2.3.2
 CATEGORIES=	audio multimedia
 #MASTER_SITES=	http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #		ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 6e24c15311c..e4309dfd4c2 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/06/13 23:39:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/09/20 21:29:15 wiz Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -16,6 +16,7 @@ lib/kde4/amarok_containment_vertical.so
 lib/kde4/amarok_context_applet_albums.so
 lib/kde4/amarok_context_applet_currenttrack.so
 lib/kde4/amarok_context_applet_info.so
+lib/kde4/amarok_context_applet_labels.so
 lib/kde4/amarok_context_applet_lyrics.so
 lib/kde4/amarok_context_applet_photos.so
 lib/kde4/amarok_context_applet_similarArtists.so
@@ -24,6 +25,7 @@ lib/kde4/amarok_context_applet_videoclip.so
 lib/kde4/amarok_context_applet_wikipedia.so
 lib/kde4/amarok_data_engine_current.so
 lib/kde4/amarok_data_engine_info.so
+lib/kde4/amarok_data_engine_labels.so
 lib/kde4/amarok_data_engine_lyrics.so
 lib/kde4/amarok_data_engine_photos.so
 lib/kde4/amarok_data_engine_similarArtists.so
@@ -60,11 +62,129 @@ lib/libamarokpud.so.1.0.0
 lib/strigi/strigita_audible.so
 lib/strigi/strigita_mp4.so
 share/applications/kde4/amarok.desktop
+share/applications/kde4/amarok_containers.desktop
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
 share/dbus-1/interfaces/org.kde.amarok.Collection.xml
 share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
+share/doc/kde/HTML/de/amarok/common
+share/doc/kde/HTML/de/amarok/index.cache.bz2
+share/doc/kde/HTML/de/amarok/index.docbook
+share/doc/kde/HTML/en/amarok/Amarok2.1center.png
+share/doc/kde/HTML/en/amarok/Amarok2.1contextviewconfig.png
+share/doc/kde/HTML/en/amarok/Amarok2.1covermanager.png
+share/doc/kde/HTML/en/amarok/Amarok2.1dynamicplaylist.png
+share/doc/kde/HTML/en/amarok/Amarok2.1internetservices.png
+share/doc/kde/HTML/en/amarok/Amarok2.1ipod.png
+share/doc/kde/HTML/en/amarok/Amarok2.1left.png
+share/doc/kde/HTML/en/amarok/Amarok2.1pleditor.png
+share/doc/kde/HTML/en/amarok/Amarok2.1popup.png
+share/doc/kde/HTML/en/amarok/Amarok2.1rating.png
+share/doc/kde/HTML/en/amarok/Amarok2.1right.png
+share/doc/kde/HTML/en/amarok/Amarok2.1scriptmanager.png
+share/doc/kde/HTML/en/amarok/Amarok2.1svn965006.png
+share/doc/kde/HTML/en/amarok/common
+share/doc/kde/HTML/en/amarok/index.cache.bz2
+share/doc/kde/HTML/en/amarok/index.docbook
+share/doc/kde/HTML/es/amarok/add_dynamic.png
+share/doc/kde/HTML/es/amarok/advanced.docbook
+share/doc/kde/HTML/es/amarok/amarok_playlist.png
+share/doc/kde/HTML/es/amarok/analyzer.png
+share/doc/kde/HTML/es/amarok/buttons.png
+share/doc/kde/HTML/es/amarok/collection.png
+share/doc/kde/HTML/es/amarok/common
+share/doc/kde/HTML/es/amarok/config.docbook
+share/doc/kde/HTML/es/amarok/config_appearance.png
+share/doc/kde/HTML/es/amarok/config_collection.png
+share/doc/kde/HTML/es/amarok/config_engine.png
+share/doc/kde/HTML/es/amarok/config_general.png
+share/doc/kde/HTML/es/amarok/config_osd.png
+share/doc/kde/HTML/es/amarok/config_playback.png
+share/doc/kde/HTML/es/amarok/config_scrobbler.png
+share/doc/kde/HTML/es/amarok/coverman.png
+share/doc/kde/HTML/es/amarok/dynamic_bar.png
+share/doc/kde/HTML/es/amarok/dynamic_settings.png
+share/doc/kde/HTML/es/amarok/equalizer.png
+share/doc/kde/HTML/es/amarok/faq.docbook
+share/doc/kde/HTML/es/amarok/file_browser.png
+share/doc/kde/HTML/es/amarok/index.cache.bz2
+share/doc/kde/HTML/es/amarok/index.docbook
+share/doc/kde/HTML/es/amarok/logo.png
+share/doc/kde/HTML/es/amarok/media_device.png
+share/doc/kde/HTML/es/amarok/menubar.png
+share/doc/kde/HTML/es/amarok/musicbrainz.png
+share/doc/kde/HTML/es/amarok/pl_tip1.png
+share/doc/kde/HTML/es/amarok/play_list.png
+share/doc/kde/HTML/es/amarok/player_window.png
+share/doc/kde/HTML/es/amarok/playlist_browser.png
+share/doc/kde/HTML/es/amarok/playlist_window.png
+share/doc/kde/HTML/es/amarok/queue_manager.png
+share/doc/kde/HTML/es/amarok/quick.docbook
+share/doc/kde/HTML/es/amarok/requirements.docbook
+share/doc/kde/HTML/es/amarok/rmb_menu.png
+share/doc/kde/HTML/es/amarok/script_manager.png
+share/doc/kde/HTML/es/amarok/status_bar.png
+share/doc/kde/HTML/es/amarok/tab_lyrics.png
+share/doc/kde/HTML/es/amarok/tab_music.png
+share/doc/kde/HTML/es/amarok/tab_wiki.png
+share/doc/kde/HTML/es/amarok/using.docbook
+share/doc/kde/HTML/es/amarok/vis_window.png
+share/doc/kde/HTML/fr/amarok/advanced.docbook
+share/doc/kde/HTML/fr/amarok/common
+share/doc/kde/HTML/fr/amarok/config.docbook
+share/doc/kde/HTML/fr/amarok/faq.docbook
+share/doc/kde/HTML/fr/amarok/index.cache.bz2
+share/doc/kde/HTML/fr/amarok/index.docbook
+share/doc/kde/HTML/fr/amarok/quick.docbook
+share/doc/kde/HTML/fr/amarok/requirements.docbook
+share/doc/kde/HTML/fr/amarok/using.docbook
+share/doc/kde/HTML/it/amarok/advanced.docbook
+share/doc/kde/HTML/it/amarok/common
+share/doc/kde/HTML/it/amarok/config.docbook
+share/doc/kde/HTML/it/amarok/faq.docbook
+share/doc/kde/HTML/it/amarok/index.cache.bz2
+share/doc/kde/HTML/it/amarok/index.docbook
+share/doc/kde/HTML/it/amarok/quick.docbook
+share/doc/kde/HTML/it/amarok/requirements.docbook
+share/doc/kde/HTML/it/amarok/using.docbook
+share/doc/kde/HTML/pt/amarok/common
+share/doc/kde/HTML/pt/amarok/index.cache.bz2
+share/doc/kde/HTML/pt/amarok/index.docbook
+share/doc/kde/HTML/pt_BR/amarok/advanced.docbook
+share/doc/kde/HTML/pt_BR/amarok/common
+share/doc/kde/HTML/pt_BR/amarok/config.docbook
+share/doc/kde/HTML/pt_BR/amarok/faq.docbook
+share/doc/kde/HTML/pt_BR/amarok/index.cache.bz2
+share/doc/kde/HTML/pt_BR/amarok/index.docbook
+share/doc/kde/HTML/pt_BR/amarok/quick.docbook
+share/doc/kde/HTML/pt_BR/amarok/requirements.docbook
+share/doc/kde/HTML/pt_BR/amarok/using.docbook
+share/doc/kde/HTML/sv/amarok/advanced.docbook
+share/doc/kde/HTML/sv/amarok/common
+share/doc/kde/HTML/sv/amarok/config.docbook
+share/doc/kde/HTML/sv/amarok/faq.docbook
+share/doc/kde/HTML/sv/amarok/index.cache.bz2
+share/doc/kde/HTML/sv/amarok/index.docbook
+share/doc/kde/HTML/sv/amarok/quick.docbook
+share/doc/kde/HTML/sv/amarok/requirements.docbook
+share/doc/kde/HTML/sv/amarok/using.docbook
+share/doc/kde/HTML/uk/amarok/Amarok2.1center.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1contextviewconfig.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1covermanager.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1dynamicplaylist.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1internetservices.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1ipod.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1left.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1pleditor.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1popup.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1rating.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1right.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1scriptmanager.png
+share/doc/kde/HTML/uk/amarok/Amarok2.1svn965006.png
+share/doc/kde/HTML/uk/amarok/common
+share/doc/kde/HTML/uk/amarok/index.cache.bz2
+share/doc/kde/HTML/uk/amarok/index.docbook
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
 share/icons/hicolor/22x22/apps/amarok.png
@@ -77,6 +197,7 @@ share/kde/apps/amarok/data/InfoAppletCustomStyle.css
 share/kde/apps/amarok/data/InfoParserLoading.html
 share/kde/apps/amarok/data/WikipediaCustomStyle.css
 share/kde/apps/amarok/data/bullet.gif
+share/kde/apps/amarok/data/first_run_jingle.ogg
 share/kde/apps/amarok/data/hover_info_template.html
 share/kde/apps/amarok/data/info_frontpage.html
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png
@@ -123,9 +244,6 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-track-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-loved-radio-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-friends-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-neighbours-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-tags-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-recommended-radio-amarok.png
@@ -226,6 +344,9 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-magnatune-amarok
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-mp3tunes-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-opml-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-scripted-amarok.png
+share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-friends-amarok.png
+share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-neighbours-amarok.png
+share/kde/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-tags-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
@@ -480,6 +601,7 @@ share/kde4/services/amarok-containment-vertical.desktop
 share/kde4/services/amarok-context-applet-albums.desktop
 share/kde4/services/amarok-context-applet-currenttrack.desktop
 share/kde4/services/amarok-context-applet-info.desktop
+share/kde4/services/amarok-context-applet-labels.desktop
 share/kde4/services/amarok-context-applet-lyrics.desktop
 share/kde4/services/amarok-context-applet-photos.desktop
 share/kde4/services/amarok-context-applet-similarArtists.desktop
@@ -488,6 +610,7 @@ share/kde4/services/amarok-context-applet-videoclip.desktop
 share/kde4/services/amarok-context-applet-wikipedia.desktop
 share/kde4/services/amarok-data-engine-current.desktop
 share/kde4/services/amarok-data-engine-info.desktop
+share/kde4/services/amarok-data-engine-labels.desktop
 share/kde4/services/amarok-data-engine-lyrics.desktop
 share/kde4/services/amarok-data-engine-photos.desktop
 share/kde4/services/amarok-data-engine-similarArtists.desktop
@@ -547,6 +670,9 @@ share/locale/de/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/de/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/de/LC_MESSAGES/amarokpkg.mo
 share/locale/el/LC_MESSAGES/amarok.mo
+share/locale/el/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/el/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/el/LC_MESSAGES/amarokpkg.mo
 share/locale/en_GB/LC_MESSAGES/amarok.mo
 share/locale/en_GB/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/en_GB/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -563,6 +689,10 @@ share/locale/fr/LC_MESSAGES/amarok.mo
 share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/fr/LC_MESSAGES/amarokpkg.mo
+share/locale/ga/LC_MESSAGES/amarok.mo
+share/locale/ga/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ga/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ga/LC_MESSAGES/amarokpkg.mo
 share/locale/hu/LC_MESSAGES/amarok.mo
 share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -572,6 +702,9 @@ share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/it/LC_MESSAGES/amarokpkg.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/ja/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ja/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ja/LC_MESSAGES/amarokpkg.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
 share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -588,6 +721,10 @@ share/locale/nds/LC_MESSAGES/amarok.mo
 share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/nds/LC_MESSAGES/amarokpkg.mo
+share/locale/nl/LC_MESSAGES/amarok.mo
+share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/nl/LC_MESSAGES/amarokpkg.mo
 share/locale/pa/LC_MESSAGES/amarok.mo
 share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pa/LC_MESSAGES/amarokpkg.mo
@@ -637,10 +774,6 @@ share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sv/LC_MESSAGES/amarokpkg.mo
 share/locale/th/LC_MESSAGES/amarok.mo
 share/locale/th/LC_MESSAGES/amarokpkg.mo
-share/locale/tr/LC_MESSAGES/amarok.mo
-share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/tr/LC_MESSAGES/amarokpkg.mo
 share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -649,7 +782,3 @@ share/locale/zh_CN/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo
-share/locale/zh_TW/LC_MESSAGES/amarok.mo
-share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index ec76cbbb63f..92add65105e 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.41 2010/06/13 23:39:26 wiz Exp $
+$NetBSD: distinfo,v 1.42 2010/09/20 21:29:15 wiz Exp $
 
-SHA1 (amarok-2.3.1.tar.bz2) = 00a596384df8d155b91b40bb2484ec0a7f51da80
-RMD160 (amarok-2.3.1.tar.bz2) = 70e581bd681361d7837f1ed295191174e92e9f8f
-Size (amarok-2.3.1.tar.bz2) = 9823411 bytes
-SHA1 (patch-ab) = 7ce50979a50448ffc645a281083105aa8b7fd723
+SHA1 (amarok-2.3.2.tar.bz2) = 594d6d3ad57832fb80ba4387459356132d37ace2
+RMD160 (amarok-2.3.2.tar.bz2) = 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390
+Size (amarok-2.3.2.tar.bz2) = 13948250 bytes
+SHA1 (patch-aa) = 981882a42a2857c8950ee6be3507fbdf33467747
+SHA1 (patch-ab) = 152a6c0516dcab316c4f90480f1bb7fb46eabfbe
diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk
index 6eb6fca5c52..6a7b05f4b52 100644
--- a/audio/amarok/options.mk
+++ b/audio/amarok/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2010/02/16 09:18:23 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2010/09/20 21:29:15 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amarok
 PKG_SUPPORTED_OPTIONS=	libgpod libmp4v2 libmtp libvisual mp3tunes
@@ -22,6 +22,7 @@ BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.6.0nb1
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibmtp)
+BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=1.0
 .include "../../devel/libmtp/buildlink3.mk"
 .endif
 
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
new file mode 100644
index 00000000000..3ef8bdd5245
--- /dev/null
+++ b/audio/amarok/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.19 2010/09/20 21:29:15 wiz Exp $
+
+BPM bugfix for FLAC fils, amarok commit ce57e426.
+
+--- utilities/collectionscanner/CollectionScanner.cpp.orig	2010-09-15 21:24:13.000000000 +0000
++++ utilities/collectionscanner/CollectionScanner.cpp
+@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QStri
+                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
+ 
+                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
+-                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
++                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
+ 
+                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
+                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 78b5feefb8b..600722af197 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2010/06/13 23:39:26 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2010/09/20 21:29:15 wiz Exp $
+
+Add rpath for embedded mySQL library.
 
 --- src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt.orig	2010-03-10 23:12:15.000000000 +0000
 +++ src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt