Update to 1.4.6:

VERSION 1.4.6
  CHANGES:
    * Improved icon theme, kindly provided by Landy DeField
      <lando@revelinux.com>. Big thanks!
    * Playlist now sends notifications to scripts if items are added, removed,
      reordered, or if the playlist is cleared.  Useful for script authors.
      Thanks to Miguel Angel Alvarez <maacruz@gmail.com> for the patch.
    * iPod device plugin now handles RockBox devices.  Thanks to Michael
      Buesch <mb@bu3sch.de> for the patch.
    * Organising files will only delete empty parent folders if the folder
      is within the collection hierarchy. (BR 136757)
    * The default cover image preview size has been increased to 130px.
    * The "hide menubar" option has been removed. It's too dangerous and led
      to countless support requests.
    * Generic media device can now handle any KIO-compatible URL, including
      obex and smb. Manage your bluetooth phone's music collection through
      Amarok!
    * Upgraded SQLite to 3.3.17.
    * Append an album to the playlist by right-clicking on it from within
      the Cover Manager.  Patch by Doug Reich <dreich@hmc.edu>.
    * Faster playlist handling. Patch by Ovy <ovy@alum.mit.edu>. (BR 142255)
    * The moodbar process has been given a higher priority. (BR 136867)
    * Allow for lyrics scripts to specifiy site, site_url, and add_url from
      within the script. This will allow for "meta lyrics" scripts. Patch by
      Sergio Pistone <sergio_pistone@yahoo.com.ar>. (BR 141885)
    * First rating star now lets you toggle between no rating, half a star,
      and one full star.

  BUGFIXES:
    * Uninstalling scripts would in some cases leave files behind. Patch by
      Sergio Pistone <sergio_pistone@yahoo.com.ar>. (BR 143716)
    * Last.fm "Custom Station" stream works again. (BR 146020)
    * Fix regression where the "Show Script Manager" button displayed on the
      Lyrics tab of the Context Browser wouldn't actually show the Script
      Manager.
    * Don't show ratings from the previous track's rating change in the OSD on
      playing the next track.
    * The config dialog is now less tall and fits on widescreen displays.
    * Making a dynamic playlist with the number of previously played tracks to
      show set to zero and attempting to play the first track would cause a
      crash. (BR 145157)
    * If "Stop after current track" was used, the last track would not be
      counted or rated in the user's statistics. (BR 140980)
    * Generic media device wouldn't allow you to drop a folder on the
      viewport, meaning you couldn't move subfolders to the top level of the
      mount point.
    * Made the settings dialog less tall. (BR 141250)
    * Star ratings now update instantly in the Context Browser, OSD, and
      Collection Browser.
    * lyrc script did not work behind proxy due to a stray quote mark. Gentoo
      Bug 166050.
    * Fix compilation on kde-3.3 systems.
    * amarok_live.py now uses popen correctly. Patch by Luke Macken
      <lmacken@fedoraproject.org>. (BR 127804)
    * Make amarok_proxy.rb use HTTP/1.0 as we don't support chunked responses.
      Patch by solsTiCE <solstice.dhiver@laposte.net>. (BR 141819)
    * Fix Quadratic loading in Playlists. Patch by Ovy
      <ovy@alum.mit.edu>. (BR 142255)
    * Correctly set iPod model. Patch by İsmail Dönmez <ismail@kde.org>.
    * Fix detection of vfat devices on FreeBSD. (BR 141614)
    * Right-click on volume slider would change the volume. (BR 141672)

5 files changed, 30 insertions, 34 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index e8c6009869b..cc12f614db8 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2007/06/15 22:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2007/07/01 00:33:52 wiz Exp $
 
-DISTNAME=		amarok-1.4.5
-PKGREVISION=		4
+DISTNAME=		amarok-${VERSION}
+VERSION=		1.4.6
 CATEGORIES=		audio kde
-MASTER_SITES=		${MASTER_SITE_KDE:=amarok/1.4.5/src/}
+MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 2c08a148624..8337afd5934 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2007/02/08 18:04:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2007/07/01 00:33:52 wiz Exp $
 bin/amarok
 bin/amarok_daapserver.rb
 bin/amarok_libvisual
@@ -44,13 +44,11 @@ share/doc/kde/HTML/de/amarok/config_playback.png
 share/doc/kde/HTML/de/amarok/config_scrobbler.png
 share/doc/kde/HTML/de/amarok/context.png
 share/doc/kde/HTML/de/amarok/coverman.png
-share/doc/kde/HTML/de/amarok/develop.docbook
 share/doc/kde/HTML/de/amarok/dynamic_bar.png
 share/doc/kde/HTML/de/amarok/dynamic_settings.png
 share/doc/kde/HTML/de/amarok/equalizer.png
 share/doc/kde/HTML/de/amarok/faq.docbook
 share/doc/kde/HTML/de/amarok/file_browser.png
-share/doc/kde/HTML/de/amarok/hidden.docbook
 share/doc/kde/HTML/de/amarok/index.cache.bz2
 share/doc/kde/HTML/de/amarok/index.docbook
 share/doc/kde/HTML/de/amarok/logo.png
@@ -250,6 +248,7 @@ share/doc/kde/HTML/nl/amarok/context.png
 share/doc/kde/HTML/nl/amarok/coverman.png
 share/doc/kde/HTML/nl/amarok/develop.docbook
 share/doc/kde/HTML/nl/amarok/dynamic_bar.png
+share/doc/kde/HTML/nl/amarok/dynamic_settings.png
 share/doc/kde/HTML/nl/amarok/equalizer.png
 share/doc/kde/HTML/nl/amarok/faq.docbook
 share/doc/kde/HTML/nl/amarok/feature_guide.docbook
@@ -257,8 +256,10 @@ share/doc/kde/HTML/nl/amarok/file_browser.png
 share/doc/kde/HTML/nl/amarok/hidden.docbook
 share/doc/kde/HTML/nl/amarok/index.cache.bz2
 share/doc/kde/HTML/nl/amarok/index.docbook
+share/doc/kde/HTML/nl/amarok/logo.png
 share/doc/kde/HTML/nl/amarok/media_device.png
 share/doc/kde/HTML/nl/amarok/menubar.png
+share/doc/kde/HTML/nl/amarok/musicbrainz.png
 share/doc/kde/HTML/nl/amarok/pl_browser.png
 share/doc/kde/HTML/nl/amarok/pl_tip1.png
 share/doc/kde/HTML/nl/amarok/play_list.png
@@ -460,6 +461,7 @@ share/kde/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/random.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
+share/kde/apps/amarok/icons/crystalsvg/22x22/actions/visualizations.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
@@ -898,8 +900,10 @@ share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
 share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
 share/kde/apps/amarok/scripts/playlist2html/Playlist.py
 share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py
+share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.spec
 share/kde/apps/amarok/scripts/playlist2html/README
 share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
+share/kde/apps/amarok/scripts/playlist2html/playlist2html.spec
 share/kde/apps/amarok/scripts/ruby_debug/debug.rb
 share/kde/apps/amarok/scripts/score_default/COPYING
 share/kde/apps/amarok/scripts/score_default/README
@@ -962,7 +966,9 @@ share/kde/servicetypes/amarok_plugin.desktop
 share/locale/af/LC_MESSAGES/amarok.mo
 share/locale/ar/LC_MESSAGES/amarok.mo
 share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/be/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
+share/locale/bn/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
@@ -971,8 +977,10 @@ share/locale/da/LC_MESSAGES/amarok.mo
 share/locale/de/LC_MESSAGES/amarok.mo
 share/locale/el/LC_MESSAGES/amarok.mo
 share/locale/en_GB/LC_MESSAGES/amarok.mo
+share/locale/eo/LC_MESSAGES/amarok.mo
 share/locale/es/LC_MESSAGES/amarok.mo
 share/locale/et/LC_MESSAGES/amarok.mo
+share/locale/eu/LC_MESSAGES/amarok.mo
 share/locale/fa/LC_MESSAGES/amarok.mo
 share/locale/fi/LC_MESSAGES/amarok.mo
 share/locale/fr/LC_MESSAGES/amarok.mo
@@ -981,15 +989,19 @@ 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/id/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/ka/LC_MESSAGES/amarok.mo
 share/locale/km/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
+share/locale/ku/LC_MESSAGES/amarok.mo
+share/locale/lo/LC_MESSAGES/amarok.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/mk/LC_MESSAGES/amarok.mo
 share/locale/ms/LC_MESSAGES/amarok.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
+share/locale/nds/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
 share/locale/nn/LC_MESSAGES/amarok.mo
 share/locale/pa/LC_MESSAGES/amarok.mo
@@ -1005,6 +1017,7 @@ share/locale/sl/LC_MESSAGES/amarok.mo
 share/locale/sq/LC_MESSAGES/amarok.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
 share/locale/sr@Latn/LC_MESSAGES/amarok.mo
+share/locale/ss/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
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 4de9cf34291..0fc3859e79b 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2007/02/18 00:55:06 wiz Exp $
+$NetBSD: distinfo,v 1.29 2007/07/01 00:33:52 wiz Exp $
 
-SHA1 (amarok-1.4.5.tar.bz2) = 882dec8d30c10f609a1f5e21d2e91342e78304c5
-RMD160 (amarok-1.4.5.tar.bz2) = c2bbfe06f3e613dfc7d3926d086024073390c712
-Size (amarok-1.4.5.tar.bz2) = 18034110 bytes
-SHA1 (patch-aa) = 0b63ca0e118581b820db1c6e5aaeecabe554495b
-SHA1 (patch-ab) = a36c9ca68810c71a95857249b63ff19d4b3f3fbb
+SHA1 (amarok-1.4.6.tar.bz2) = c339315febcaf8930af384c398decde196908cc1
+RMD160 (amarok-1.4.6.tar.bz2) = 993e5a31d814e8c1bdac00683ddb4b4abd35a814
+Size (amarok-1.4.6.tar.bz2) = 13260949 bytes
+SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index b8133a42c29..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/02/18 00:55:06 wiz Exp $
-
-Fix for CVE-2006-6979 based on http://bugs.kde.org/show_bug.cgi?id=138499
-(without the whitespace changes).
-
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp.orig	2007-02-01 18:14:17.000000000 +0000
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
-@@ -89,7 +89,7 @@ void MagnatuneAlbumDownloader::albumDown
- 
-     //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.
- 
--    QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &";
-+    QString unzipString = "unzip " + KProcess::quote( m_tempDir.name() + m_currentAlbumFileName ) + " -d " + KProcess::quote( m_currentAlbumUnpackLocation ) + " &";
- 
-     debug() << "unpacking: " << unzipString << endl;
- 
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 87139c1fd4d..1594c1e0bc9 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/07/24 13:58:11 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/07/01 00:33:53 wiz Exp $
 
---- configure.orig	2006-07-02 20:29:34.000000000 +0000
+--- configure.orig	2007-06-17 19:52:02.000000000 +0000
 +++ configure
-@@ -36047,7 +36047,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
+@@ -37060,7 +37060,7 @@ if test "${ac_cv_lib_tunepimp_tr_GetPUID
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2006/07/24 13:58:11 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36519,7 +36519,7 @@ if test "${ac_cv_lib_konqsidebarplugin__
+@@ -37579,7 +37579,7 @@ if test "${ac_cv_lib_konqsidebarplugin__
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS