Update to 1.2:

VERSION 1.2:
  ADD: "Repeat Track" status is reflected by an icon in the playlist.
  ADD: New icons from tightcode for statusbar and repeatTrack.
  ADD: New Smart-Playlist "Ever Played".
  CHG: Bumped GStreamer version requirement to 0.8.4.
  CHG: Made it possible to use artsdsink with GStreamer again.
  CHG: Don't read m3u files recursively when dropping a folder on the
       playlist. No more doubled entries.
  FIX: Shoutcast radio with GStreamer is improved, no more dropouts when
       starting a stream.
  ADD: The "Similar Artists" feature (using Audioscrobbler) can now be
       switched off. (BR 95280)
  FIX: Error in Shoutcast http-request, which made it impossible to play
       many radio streams with GStreamer and aRts. (BR 97211, 98569)
  CHG: Better default directory for selecting a custom cover.
  FIX: ContextBrowser reloads after setting a custom cover. (BR 96548)
  FIX: Cover-Manager's full-screen view works with Bughira (brushed metal).
  ADD: Script-Manager can auto-run scripts on application startup.
  ADD: aKode engine, depends on KDE 3.4. No configure check yet.
  FIX: Don't add non-audio files to the Collection.
  CHG: We now use the SqlLoader, which greatly improves the performance of
       adding stuff to the playlist from SmartPlaylists and the Collection.

VERSION 1.2-beta4:
  ADD: It is now possible to select the right image if there are multiple
       results from Amazon. Patch from Gregory Isabelli <g_isabelli@yahoo.fr>.
       (BR 93287)
  CHG: Reorganized the DCOP interface. We used to have all DCOP functions in the
       "player" group. Now it's splitted up into several categories. Attention
       script writers: Adjust your DCOP calls!
  FIX: The loader is now more robust and should always find amarokapp.
  CHG: The search-browser has been integrated into the file-browser.
  CHG: OSD can have fake transparency and new fancy shadow.
  ADD: DCOP function "shortStatusMessage", shows a temporary message on the
       application's statusbar.
  FIX: Frequent crashes when writing tags. (BR 95344)
  FIX: CoverManager updates its status display correctly.
  FIX: "isPlaying" DCOP function now works correctly. (BR 90894)
  ADD: Automatic crash report generator, sends backtraces to amaroK HQ.
  ADD: DCOP function "saveCurrentPlaylist". Writes the playlist to current.xml,
       for scripts that need to access the playlist contents.
  ADD: Playlist2html, a script for playlist exporting. (BR 96199)
  ADD: Improved statusbar, with animated error notification widget.
  ADD: New progress display system, can show multiple expandable progress
       widgets in the statusbar.
  ADD: Alarm script, starts playing music at specified alarm time.
  ADD: Script-Manager for DCOP script extensions is now functional. Refer to the
       amaroK Wiki for information on script writing.
  ADD: Collection-Browser shows a help message in flat-mode when filter is
       empty. (BR 97000)
  CHG: It is possible to select the Database Engine (SQLite, MySQL) runtime,
       without amaroK restart. New Database Engines can be added, they need to
       inherit DbConnection and implement its' virtual methods (see
       SqliteConnection and MySqlConnection).
  CHG: New amaroK icon "Blue Wolf", made by Da-Flow.
  FIX: Possible crash when enabling Player-Window. (BR 94668)

VERSION 1.2-beta3:
  ADD: Smart Playlists can have a random order or a score weighted random order
       (BR 90861)
  ADD: Show total length of selected songs in statusbar. (BR 90284)
  ADD: Context-Browser now caches the tab widgets. Patch from Matias Costa
       <mcc3@alu.um.es>. (BR 95999)
  FIX: RAND and REP buttons were always enabled at startup. (BR 95861)
  ADD: Implemented "Append Suggestions" functionality. It means that when
       enabled, amaroK will append a couple of suggested songs to playlist when
       you play a track. This produces a continuous playlist, something similar
       to listening to radio.
  ADD: Implemented "Play Media..." functionality.
  FIX: Playlist-Browser was appending to playlist when clicking "Load". Now it
       replaces the current playlist again, as intended.
  ADD: Profile for KDELIRC (Remote Controls). Patch by Dirk Ziegelmeier
       <dziegel@gmx.de>.
  ADD: Remove Duplicates now also removes dead entries from playlist.
  FIX: Accept album-dragging from the ContextBrowser. (BR 86020)
  FIX: Configure check was missing for the Konqueror Sidebar (depends on
       KDE-Base).
  FIX: Browser splitter was drawn incorrectly with some styles. (BR 95333)
  ADD: DCOP call for relative seek. Patch by Andreas Pfaller. (BR 84989)
  CHG: Bumped TagLib dependency to 1.3.1. (1.3 is too damn buggy)
  FIX: CTRL-M can show the menubar again after hiding. (BR 94139)
  ADD: Support for last.fm streams.
  FIX: amaroK icon shows correctly in window decoration under GNOME.
  ADD: Support for ID3v2 cover images. (Thanks to M. Thiesen!) (BR 88492)
  ADD: DCOP calls for the status of Random Mode, Repeat Playlist and Repeat
       Track.
  ADD: DCOP call to return the sample rate.
  ADD: DCOP call to return the track number. (BR 94825)
  FIX: GStreamer-engine provides better scope synchronisation.
  ADD: Save current track position and play queue on exit. (BR 90379)
  FIX: Fix Directory column on playlist, show absolute directory path instead of
       empty string. (BR 90361)
  ADD: DCOP call to scan your collection. (BR 84621)
  FIX: When an engine fails to load, respect the rank while choosing the next
       engine.

VERSION 1.2-beta2:
  FIX: Classic amaroK theme looks better.
  ADD: Context Browser has CSS styling.
  FIX: Cover fetching improvements/fixes.
  ADD: Last played: yesterday, etc. in ContextBrowser.
  FIX: Big speedup for PlaylistLoader, when adding many items.
  ADD: Show songs you once played, but didn't play for the longest time on
       ContextBrowser's Home-page. (least played) (BR 89479)
  FIX: Don't crash on song switch, when there's only one visible playlist item
       and repeat-list is activated. (BR 94030)
  CHG: Add and queue tracks after the current track. (BR 94121)
  ADD: DCOP call to raise the equalizer configuration dialog.
  ADD: Konqueror sidebar to view playing info and control amaroK.
  ADD: DCOP call to clear the playlist. (BR 90149)
  ADD: DCOP call to enable/disable the equalizer.
  ADD: DCOP call to return the score of the currently playing track.
  ADD: Audioscrobbler submit queue stored on disk. Tracks that are listened when
       offline will be available for submitting later.
  CHG: "Start Scan" button was renamed to "Update". Now it starts an incremental
       scan instead of a full rescan.
  FIX: Lyrics parsing failed for certain songs. (BR 94269)
  ADD: xine-engine saves config, and implements crossfade, bug fixed too.
  ADD: Player-Window can also show the BlockAnalyzer.
  CHG: Run incremental scanning once a minute instead of every 30 seconds.
  FIX: When collection scanning was interrupted with Cancel, incremental
       scanning didn't work any longer.
  CHG: Handle incremental file scanning in a thread. Now the GUI doesn't get
       blocked every 30 seconds, anymore. (BR 93564)
  ADD: CollectionBrowser now offers two operation modes:
       The classical TreeView and a new FlatView (like the WinAmp Library).
  FIX: Caching of local cover images was broken for non-unique filenames.
       (BR 94068)
  FIX: "Visualizations" menu entry was always disabled.
  FIX: Play button was sometimes stuck in disabled state.
  FIX: OSD was showing "%artist - %track" instead of "%artist - %title".
  FIX: Forward command line option --engine to amarokapp.
  FIX: CoverFetcher was always looking for "album - album".

VERSION 1.2-beta1:
  ADD: Full support for Audioscrobbler, including submission of tracks.
  FIX: Arts engine resumes from position when session is restored.
  ADD: Vorbis stream metadata support (GStreamer-engine). (BR 82378)
  ADD: Cover image and lyric fetchers include filters for common extensions,
       such as (Disc 1). (BR 90630)
  ADD: Ability to choose from four different Amazon locales. (BR 90664)
  ADD: OSD now draws gradient instead of solid colour.
  ADD: 'Stop after current song' functionality. (BR 88652)
  FIX: Queue function from context/collection browsers actually properly queues
       tracks. (BR 90319)
  ADD: MySQL database support. Patch by Andreas Mair <am_ml@linogate.com>.
       Please refer to mailing list for detailed instructions.
  ADD: Metadata history for streams in Context-Browser. (BR 89839)
  ADD: Command line option --engine.
  ADD: OSD text is now configurable, and it displays the album cover.
  FIX: Remote folders are read recursively when dropped on the playlist.
  FIX: Audiocd protocol in filebrowser had empty folders.
  ADD: Cache system for current-track animation in playlist. Reduces CPU load
       when the playlist is visible.
  ADD: 10-band IIR equalizer for GStreamer and xine engines.
  FIX: The background gradient effect in Context-Browser is now much faster. The
       gradient also looks nicer. (BR 91276)
  FIX: Password-protected streams did not work correctly. (BR 91184). Patch by
       <javapojken@yahoo.se>.
  ADD: NMM-engine was rewritten and updated for the latest NMM release. Supports
       audio and video playback.
  ADD: Cover-Manager supports drag-and-drop.
  ADD: Tags are now read from the Collection database if they are already
       stored. This speeds up adding items to the playlist. (BR 90137)
  ADD: Context-browser shows "Suggested Tracks", utilizing audioscrobbler.
  FIX: Configure does no longer print "Good - Configure has finished" when a
       dependency is missing.
  ADD: Intelligent automatic resize for playlist columns
  ADD: Shaded current-track marker in playlist.
  ADD: Automatic song lyrics display.
  CHG: Internal SQLite upgraded to 3.0.8.

4 files changed, 101 insertions, 120 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 0a726c03cf4..842c5ce64b1 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/17 09:45:44 seb Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/20 20:41:40 wiz Exp $
 
-DISTNAME=		amarok-1.1.1
+DISTNAME=		amarok-1.2
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,9 +20,9 @@ CONFIGURE_ARGS+=	--without-mas
 
 LIBS+=			${LIBOSSAUDIO}
 
-BUILDLINK_DEPENDS.taglib+=	taglib>=1.3
-BUILDLINK_DEPENDS.gst-plugins+=	gst-plugins>=0.8.1
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.1
+BUILDLINK_DEPENDS.taglib+=	taglib>=1.3.1
+BUILDLINK_DEPENDS.gst-plugins+=	gst-plugins>=0.8.4
+BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.4
 BUILDLINK_DEPENDS.arts+=	arts>=1.2
 
 .include "../../audio/arts/buildlink3.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 59caa306aa6..b708537ef31 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/17 09:45:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/20 20:41:40 wiz Exp $
 bin/amarok
 bin/amarok_libvisual
 bin/amarok_xmmswrapper2
 bin/amarokapp
 bin/release_amarok
+lib/kde3/konqsidebar_universalamarok.la
 lib/kde3/libamarok_artsengine_plugin.la
 lib/kde3/libamarok_gstengine_plugin.la
 lib/kde3/libamarok_void-engine_plugin.la
@@ -14,108 +15,52 @@ lib/mcop/Amarok/Synth_STEREO_XFADE.mcopclass
 lib/mcop/amarokarts.mcopclass
 lib/mcop/amarokarts.mcoptype
 share/applications/kde/amarok.desktop
-share/doc/kde/HTML/da/amarok/common
-share/doc/kde/HTML/da/amarok/index.cache.bz2
-share/doc/kde/HTML/da/amarok/index.docbook
 share/doc/kde/HTML/en/amarok/advanced.docbook
 share/doc/kde/HTML/en/amarok/analyzer.png
 share/doc/kde/HTML/en/amarok/buttons.png
 share/doc/kde/HTML/en/amarok/collection.png
 share/doc/kde/HTML/en/amarok/common
 share/doc/kde/HTML/en/amarok/config.docbook
-share/doc/kde/HTML/en/amarok/config_colors.png
+share/doc/kde/HTML/en/amarok/config_appearance.png
+share/doc/kde/HTML/en/amarok/config_collection.png
 share/doc/kde/HTML/en/amarok/config_engine.png
-share/doc/kde/HTML/en/amarok/config_fonts.png
 share/doc/kde/HTML/en/amarok/config_general.png
 share/doc/kde/HTML/en/amarok/config_osd.png
 share/doc/kde/HTML/en/amarok/config_playback.png
+share/doc/kde/HTML/en/amarok/config_scrobbler.png
 share/doc/kde/HTML/en/amarok/context.png
 share/doc/kde/HTML/en/amarok/coverman.png
-share/doc/kde/HTML/en/amarok/develop.docbook
+share/doc/kde/HTML/en/amarok/equalizer.png
 share/doc/kde/HTML/en/amarok/faq.docbook
+share/doc/kde/HTML/en/amarok/feature_guide.docbook
 share/doc/kde/HTML/en/amarok/file_browser.png
-share/doc/kde/HTML/en/amarok/hidden.docbook
 share/doc/kde/HTML/en/amarok/index.cache.bz2
 share/doc/kde/HTML/en/amarok/index.docbook
 share/doc/kde/HTML/en/amarok/logo.png
+share/doc/kde/HTML/en/amarok/media_device.png
+share/doc/kde/HTML/en/amarok/menubar.png
+share/doc/kde/HTML/en/amarok/musicbrainz.png
 share/doc/kde/HTML/en/amarok/pl_browser.png
 share/doc/kde/HTML/en/amarok/pl_tip1.png
 share/doc/kde/HTML/en/amarok/play_list.png
 share/doc/kde/HTML/en/amarok/player_window.png
 share/doc/kde/HTML/en/amarok/playlist_window.png
+share/doc/kde/HTML/en/amarok/quick.docbook
 share/doc/kde/HTML/en/amarok/requirements.docbook
 share/doc/kde/HTML/en/amarok/rmb_menu.png
-share/doc/kde/HTML/en/amarok/search.png
 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/et/amarok/advanced.docbook
-share/doc/kde/HTML/et/amarok/common
-share/doc/kde/HTML/et/amarok/config.docbook
-share/doc/kde/HTML/et/amarok/develop.docbook
-share/doc/kde/HTML/et/amarok/faq.docbook
-share/doc/kde/HTML/et/amarok/howto.docbook
-share/doc/kde/HTML/et/amarok/index.cache.bz2
-share/doc/kde/HTML/et/amarok/index.docbook
-share/doc/kde/HTML/et/amarok/plugin.docbook
-share/doc/kde/HTML/et/amarok/requirements.docbook
-share/doc/kde/HTML/et/amarok/using.docbook
-share/doc/kde/HTML/fr/amarok/common
-share/doc/kde/HTML/fr/amarok/index.cache.bz2
-share/doc/kde/HTML/fr/amarok/index.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/develop.docbook
-share/doc/kde/HTML/it/amarok/faq.docbook
-share/doc/kde/HTML/it/amarok/hidden.docbook
-share/doc/kde/HTML/it/amarok/index.cache.bz2
-share/doc/kde/HTML/it/amarok/index.docbook
-share/doc/kde/HTML/it/amarok/plugin.docbook
-share/doc/kde/HTML/it/amarok/requirements.docbook
-share/doc/kde/HTML/it/amarok/using.docbook
-share/doc/kde/HTML/pt/amarok/advanced.docbook
-share/doc/kde/HTML/pt/amarok/common
-share/doc/kde/HTML/pt/amarok/config.docbook
-share/doc/kde/HTML/pt/amarok/develop.docbook
-share/doc/kde/HTML/pt/amarok/faq.docbook
-share/doc/kde/HTML/pt/amarok/hidden.docbook
-share/doc/kde/HTML/pt/amarok/index.cache.bz2
-share/doc/kde/HTML/pt/amarok/index.docbook
-share/doc/kde/HTML/pt/amarok/plugin.docbook
-share/doc/kde/HTML/pt/amarok/requirements.docbook
-share/doc/kde/HTML/pt/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/advanced.docbook
-share/doc/kde/HTML/sv/amarok/buttons.png
-share/doc/kde/HTML/sv/amarok/collection.png
-share/doc/kde/HTML/sv/amarok/common
-share/doc/kde/HTML/sv/amarok/config.docbook
-share/doc/kde/HTML/sv/amarok/config_colors.png
-share/doc/kde/HTML/sv/amarok/config_fonts.png
-share/doc/kde/HTML/sv/amarok/config_general.png
-share/doc/kde/HTML/sv/amarok/config_osd.png
-share/doc/kde/HTML/sv/amarok/config_playback.png
-share/doc/kde/HTML/sv/amarok/context.png
-share/doc/kde/HTML/sv/amarok/develop.docbook
-share/doc/kde/HTML/sv/amarok/faq.docbook
-share/doc/kde/HTML/sv/amarok/file_browser.png
-share/doc/kde/HTML/sv/amarok/hidden.docbook
-share/doc/kde/HTML/sv/amarok/index.cache.bz2
-share/doc/kde/HTML/sv/amarok/index.docbook
-share/doc/kde/HTML/sv/amarok/pl_browser.png
-share/doc/kde/HTML/sv/amarok/pl_tip1.png
-share/doc/kde/HTML/sv/amarok/play_list.png
-share/doc/kde/HTML/sv/amarok/player_window.png
-share/doc/kde/HTML/sv/amarok/playlist_window.png
-share/doc/kde/HTML/sv/amarok/plugin.docbook
-share/doc/kde/HTML/sv/amarok/requirements.docbook
-share/doc/kde/HTML/sv/amarok/scripts_window.png
-share/doc/kde/HTML/sv/amarok/search.png
-share/doc/kde/HTML/sv/amarok/status_bar.png
-share/doc/kde/HTML/sv/amarok/streams.png
-share/doc/kde/HTML/sv/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/vis_window.png
-share/doc/kde/HTML/sv/amarok/welcome.png
+share/doc/kde/HTML/ru/amarok/advanced.docbook
+share/doc/kde/HTML/ru/amarok/common
+share/doc/kde/HTML/ru/amarok/config.docbook
+share/doc/kde/HTML/ru/amarok/faq.docbook
+share/doc/kde/HTML/ru/amarok/feature_guide.docbook
+share/doc/kde/HTML/ru/amarok/index.cache.bz2
+share/doc/kde/HTML/ru/amarok/index.docbook
+share/doc/kde/HTML/ru/amarok/quick.docbook
+share/doc/kde/HTML/ru/amarok/requirements.docbook
+share/doc/kde/HTML/ru/amarok/using.docbook
 share/kde/apps/amarok/amarokui.rc
 share/kde/apps/amarok/amarokui_xmms.rc
 share/kde/apps/amarok/data/Cool-Streams.m3u
@@ -124,17 +69,27 @@ share/kde/apps/amarok/data/dot.png
 share/kde/apps/amarok/data/grid.png
 share/kde/apps/amarok/data/wirl1.png
 share/kde/apps/amarok/data/wirl2.png
+share/kde/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/kde/apps/amarok/icons/crystalsvg/16x16/actions/random.png
+share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
+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/images/amarok_cut.png
 share/kde/apps/amarok/images/amarok_rocks.jpg
+share/kde/apps/amarok/images/audioscrobbler.png
 share/kde/apps/amarok/images/b_next.png
 share/kde/apps/amarok/images/b_pause.png
 share/kde/apps/amarok/images/b_play.png
 share/kde/apps/amarok/images/b_prev.png
 share/kde/apps/amarok/images/b_stop.png
+share/kde/apps/amarok/images/babelfish.png
 share/kde/apps/amarok/images/bucky.png
-share/kde/apps/amarok/images/context_gradient.png
 share/kde/apps/amarok/images/covermanager.png
+share/kde/apps/amarok/images/currenttrack_pause.png
 share/kde/apps/amarok/images/currenttrack_play.png
+share/kde/apps/amarok/images/currenttrack_repeat.png
 share/kde/apps/amarok/images/description.png
 share/kde/apps/amarok/images/eq_active2.png
 share/kde/apps/amarok/images/eq_inactive2.png
@@ -152,19 +107,28 @@ share/kde/apps/amarok/images/time_plus.png
 share/kde/apps/amarok/images/vol_speaker.png
 share/kde/apps/amarok/images/wizard_compact.png
 share/kde/apps/amarok/images/wizard_xmms.png
+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/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/themes/flat/stylesheet.css
+share/kde/apps/konqsidebartng/add/amarok.desktop
 share/kde/apps/konqueror/servicemenus/amarok_append.desktop
+share/kde/apps/profiles/amarok.profile.xml
 share/kde/config.kcfg/amarok.kcfg
 share/kde/config.kcfg/gstconfig.kcfg
 share/kde/config/amarokrc
-share/kde/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/kde/icons/crystalsvg/128x128/apps/amarok.png
 share/kde/icons/crystalsvg/16x16/apps/amarok.png
-share/kde/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/kde/icons/crystalsvg/22x22/apps/amarok.png
-share/kde/icons/crystalsvg/32x32/actions/player_playlist_2.png
 share/kde/icons/crystalsvg/32x32/apps/amarok.png
-share/kde/icons/crystalsvg/48x48/actions/player_playlist_2.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
@@ -172,6 +136,7 @@ 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/cy/LC_MESSAGES/amarok.mo
@@ -189,6 +154,8 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/amarok.mo
@@ -198,42 +165,51 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/sr/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
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/amarok.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/uz/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/xx/LC_MESSAGES/amarok.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/amarok.mo
 @comment in kde: @dirrm share/kde/servicetypes
 @comment in kde: @dirrm share/kde/services
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions
 @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
 @comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
 @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
-@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment in kde: @dirrm share/kde/config.kcfg
 @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/add
+@dirrm share/kde/apps/amarok/themes/flat
+@dirrm share/kde/apps/amarok/themes
+@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/48x48/actions
+@dirrm share/kde/apps/amarok/icons/crystalsvg/48x48
+@dirrm share/kde/apps/amarok/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/amarok/icons/crystalsvg/32x32
+@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/amarok/icons/crystalsvg/22x22
+@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/amarok/icons/crystalsvg/16x16
+@dirrm share/kde/apps/amarok/icons/crystalsvg
+@dirrm share/kde/apps/amarok/icons
 @dirrm share/kde/apps/amarok/data
 @dirrm share/kde/apps/amarok
 @comment in kde: @dirrm share/kde/apps
-@dirrm share/doc/kde/HTML/sv/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/sv
-@dirrm share/doc/kde/HTML/pt/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/pt
-@dirrm share/doc/kde/HTML/it/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/it
-@dirrm share/doc/kde/HTML/fr/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/fr
-@dirrm share/doc/kde/HTML/et/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/et
+@dirrm share/doc/kde/HTML/ru/amarok
+@comment in kde: @dirrm share/doc/kde/HTML/ru
 @dirrm share/doc/kde/HTML/en/amarok
 @comment in kde: @dirrm share/doc/kde/HTML/en
-@dirrm share/doc/kde/HTML/da/amarok
-@comment in kde: @dirrm share/doc/kde/HTML/da
 @comment in kde: @dirrm share/applications/kde
 @dirrm lib/mcop/Amarok
+@comment in arts: @dirrm lib/mcop
 @comment in kde: @dirrm lib/kde3
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 02f740539d9..93784822c66 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/17 09:45:44 seb Exp $
+$NetBSD: distinfo,v 1.2 2005/02/20 20:41:40 wiz Exp $
 
-SHA1 (amarok-1.1.1.tar.bz2) = 35a838d96718104cd4208375d061d9b722126624
-Size (amarok-1.1.1.tar.bz2) = 2888815 bytes
-SHA1 (patch-aa) = b137f67bd956421385154584562bb0f58d4c07c7
+SHA1 (amarok-1.2.tar.bz2) = a5358f2b3ee11b66d60b852553d17eb25c3a8655
+Size (amarok-1.2.tar.bz2) = 5449066 bytes
+SHA1 (patch-aa) = ab5f884612e3e25633c4fab6227849142b960b39
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
index 3e773035eb6..a733f4fe3de 100644
--- a/audio/amarok/patches/patch-aa
+++ b/audio/amarok/patches/patch-aa
@@ -1,18 +1,23 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/17 09:45:45 seb Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/20 20:41:40 wiz Exp $
 
---- amarok/src/vis/libvisual/libvisual.cpp.orig	2004-10-09 12:52:12.000000000 +0000
-+++ amarok/src/vis/libvisual/libvisual.cpp
-@@ -267,11 +267,11 @@ namespace SDL
-                 break;
+--- 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 ];
  
-             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;
+         debug() << "Running: " << command << endl;
  
-             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;
+         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 );
  
-             case SDL_QUIT:
+-        return QString::fromLocal8Bit( stdout );
++        return QString::fromLocal8Bit( amarok_stdout );
+     }
+ 
+     void