summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/amarok/Makefile37
-rw-r--r--audio/amarok/PLIST240
-rw-r--r--audio/amarok/distinfo8
3 files changed, 244 insertions, 41 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index b46b9276f96..75e5b5330db 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/04/17 13:46:15 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/05/31 17:59:57 wiz Exp $
-DISTNAME= amarok-1.3.9
-PKGREVISION= 2
+DISTNAME= amarok-1.4.0a
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amarok/}
EXTRACT_SUFX= .tar.bz2
@@ -10,6 +9,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://amarok.kde.org/
COMMENT= KDE audio player
+WRKSRC= ${WRKDIR}/amarok-1.4.0
USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
@@ -19,10 +19,33 @@ USE_LIBTOOL= yes
CONFIGURE_ARGS+= --without-nmm
CONFIGURE_ARGS+= --without-mas
CONFIGURE_ARGS+= --without-helix
-CONFIGURE_ARGS+= --without-arts # disable aRts engine
+CONFIGURE_ARGS+= --with-mp4v2
+CONFIGURE_ARGS+= --with-mp4v2-dir=${LOCALBASE}
LIBS+= ${LIBOSSAUDIO}
+PYTHON_PATCH_SCRIPTS= \
+ amarok/src/scripts/amarok_live/amarok_live.py \
+ amarok/src/scripts/common/Publisher.py \
+ amarok/src/scripts/common/Zeroconf.py \
+ amarok/src/scripts/playlist2html/Playlist.py \
+ amarok/src/scripts/webcontrol/Playlist.py \
+ amarok/src/scripts/playlist2html/PlaylistServer.py \
+ amarok/src/scripts/playlist2html/playlist2html.py \
+ amarok/src/scripts/templates/python_qt_template.py \
+ amarok/src/scripts/webcontrol/Globals.py \
+ amarok/src/scripts/playlist2html/Playlist.py \
+ amarok/src/scripts/webcontrol/Playlist.py \
+ amarok/src/scripts/webcontrol/RequestHandler.py \
+ amarok/src/scripts/webcontrol/WebControl.py \
+ amarok/src/scripts/webcontrol/WebPublisher.py
+REPLACE_RUBY= \
+ amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb \
+ amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb \
+ amarok/src/scripts/ruby_debug/debug.rb \
+ amarok/src/scripts/templates/amarok.rb \
+ amarok/src/scripts/templates/ruby_qt_template.rb
+
BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.3.0
BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
@@ -31,11 +54,13 @@ BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
.include "../../audio/libvisual/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/ruby/buildlink3.mk"
+.include "../../lang/ruby/replace.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../mk/oss.buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../multimedia/kdemultimedia3/buildlink3.mk"
+.include "../../multimedia/mpeg4ip/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index e51d64316e5..66c420b1a26 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,12 +1,20 @@
-@comment $NetBSD: PLIST,v 1.15 2006/04/17 07:07:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/05/31 17:59:57 wiz Exp $
bin/amarok
bin/amarok_libvisual
bin/amarok_xmmswrapper2
bin/amarokapp
+bin/amarokcollectionscanner
lib/kde3/konqsidebar_universalamarok.la
-lib/kde3/libamarok_gstengine_plugin.la
+lib/kde3/libamarok_generic-mediadevice.a
+lib/kde3/libamarok_generic-mediadevice.la
+lib/kde3/libamarok_generic-mediadevice.so
lib/kde3/libamarok_void-engine_plugin.la
lib/kde3/libamarok_xine-engine.la
+lib/libamarok.a
+lib/libamarok.la
+lib/libamarok.so
+lib/libamarok.so.0
+lib/libamarok.so.0.0.0
share/applications/kde/amarok.desktop
share/doc/kde/HTML/da/amarok/advanced.docbook
share/doc/kde/HTML/da/amarok/common
@@ -17,7 +25,9 @@ share/doc/kde/HTML/da/amarok/index.docbook
share/doc/kde/HTML/da/amarok/quick.docbook
share/doc/kde/HTML/da/amarok/requirements.docbook
share/doc/kde/HTML/da/amarok/using.docbook
+share/doc/kde/HTML/de/amarok/add_dynamic.png
share/doc/kde/HTML/de/amarok/advanced.docbook
+share/doc/kde/HTML/de/amarok/amarok_playlist.png
share/doc/kde/HTML/de/amarok/analyzer.png
share/doc/kde/HTML/de/amarok/buttons.png
share/doc/kde/HTML/de/amarok/collection.png
@@ -33,8 +43,8 @@ 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_mode1.png
-share/doc/kde/HTML/de/amarok/dynamic_mode2.png
+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
@@ -49,6 +59,7 @@ share/doc/kde/HTML/de/amarok/pl_browser.png
share/doc/kde/HTML/de/amarok/pl_tip1.png
share/doc/kde/HTML/de/amarok/play_list.png
share/doc/kde/HTML/de/amarok/player_window.png
+share/doc/kde/HTML/de/amarok/playlist_browser.png
share/doc/kde/HTML/de/amarok/playlist_window.png
share/doc/kde/HTML/de/amarok/queue_manager.png
share/doc/kde/HTML/de/amarok/quick.docbook
@@ -58,7 +69,9 @@ share/doc/kde/HTML/de/amarok/script_manager.png
share/doc/kde/HTML/de/amarok/status_bar.png
share/doc/kde/HTML/de/amarok/using.docbook
share/doc/kde/HTML/de/amarok/vis_window.png
+share/doc/kde/HTML/en/amarok/add_dynamic.png
share/doc/kde/HTML/en/amarok/advanced.docbook
+share/doc/kde/HTML/en/amarok/amarok_playlist.png
share/doc/kde/HTML/en/amarok/analyzer.png
share/doc/kde/HTML/en/amarok/buttons.png
share/doc/kde/HTML/en/amarok/collection.png
@@ -71,10 +84,9 @@ 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/dynamic_mode1.png
-share/doc/kde/HTML/en/amarok/dynamic_mode2.png
+share/doc/kde/HTML/en/amarok/dynamic_bar.png
+share/doc/kde/HTML/en/amarok/dynamic_settings.png
share/doc/kde/HTML/en/amarok/equalizer.png
share/doc/kde/HTML/en/amarok/faq.docbook
share/doc/kde/HTML/en/amarok/file_browser.png
@@ -84,10 +96,10 @@ 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_browser.png
share/doc/kde/HTML/en/amarok/playlist_window.png
share/doc/kde/HTML/en/amarok/queue_manager.png
share/doc/kde/HTML/en/amarok/quick.docbook
@@ -95,6 +107,9 @@ share/doc/kde/HTML/en/amarok/requirements.docbook
share/doc/kde/HTML/en/amarok/rmb_menu.png
share/doc/kde/HTML/en/amarok/script_manager.png
share/doc/kde/HTML/en/amarok/status_bar.png
+share/doc/kde/HTML/en/amarok/tab_lyrics.png
+share/doc/kde/HTML/en/amarok/tab_music.png
+share/doc/kde/HTML/en/amarok/tab_wiki.png
share/doc/kde/HTML/en/amarok/using.docbook
share/doc/kde/HTML/en/amarok/vis_window.png
share/doc/kde/HTML/es/amarok/analyzer.png
@@ -123,6 +138,7 @@ 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_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/rmb_menu.png
share/doc/kde/HTML/es/amarok/script_manager.png
share/doc/kde/HTML/es/amarok/status_bar.png
@@ -151,19 +167,50 @@ 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/add_dynamic.png
share/doc/kde/HTML/it/amarok/advanced.docbook
+share/doc/kde/HTML/it/amarok/amarok_playlist.png
+share/doc/kde/HTML/it/amarok/analyzer.png
+share/doc/kde/HTML/it/amarok/buttons.png
+share/doc/kde/HTML/it/amarok/collection.png
share/doc/kde/HTML/it/amarok/common
+share/doc/kde/HTML/it/amarok/completo.png
share/doc/kde/HTML/it/amarok/config.docbook
+share/doc/kde/HTML/it/amarok/config_appearance.png
+share/doc/kde/HTML/it/amarok/config_collection.png
+share/doc/kde/HTML/it/amarok/config_engine.png
+share/doc/kde/HTML/it/amarok/config_general.png
+share/doc/kde/HTML/it/amarok/config_osd.png
+share/doc/kde/HTML/it/amarok/config_playback.png
+share/doc/kde/HTML/it/amarok/config_scrobbler.png
+share/doc/kde/HTML/it/amarok/context.png
+share/doc/kde/HTML/it/amarok/coverman.png
share/doc/kde/HTML/it/amarok/develop.docbook
+share/doc/kde/HTML/it/amarok/dynamic_bar.png
+share/doc/kde/HTML/it/amarok/dynamic_settings.png
+share/doc/kde/HTML/it/amarok/equalizer.png
share/doc/kde/HTML/it/amarok/faq.docbook
share/doc/kde/HTML/it/amarok/feature_guide.docbook
+share/doc/kde/HTML/it/amarok/file_browser.png
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/media_device.png
+share/doc/kde/HTML/it/amarok/menubar.png
+share/doc/kde/HTML/it/amarok/pl_browser.png
+share/doc/kde/HTML/it/amarok/pl_tip1.png
+share/doc/kde/HTML/it/amarok/play_list.png
+share/doc/kde/HTML/it/amarok/player_window.png
+share/doc/kde/HTML/it/amarok/playlist_browser.png
share/doc/kde/HTML/it/amarok/plugin.docbook
+share/doc/kde/HTML/it/amarok/queue_manager.png
share/doc/kde/HTML/it/amarok/quick.docbook
share/doc/kde/HTML/it/amarok/requirements.docbook
+share/doc/kde/HTML/it/amarok/rmb_menu.png
+share/doc/kde/HTML/it/amarok/script_manager.png
+share/doc/kde/HTML/it/amarok/status_bar.png
share/doc/kde/HTML/it/amarok/using.docbook
+share/doc/kde/HTML/it/amarok/vis_window.png
share/doc/kde/HTML/nl/amarok/advanced.docbook
share/doc/kde/HTML/nl/amarok/analyzer.png
share/doc/kde/HTML/nl/amarok/buttons.png
@@ -204,6 +251,15 @@ share/doc/kde/HTML/nl/amarok/search.png
share/doc/kde/HTML/nl/amarok/status_bar.png
share/doc/kde/HTML/nl/amarok/using.docbook
share/doc/kde/HTML/nl/amarok/vis_window.png
+share/doc/kde/HTML/pl/amarok/advanced.docbook
+share/doc/kde/HTML/pl/amarok/common
+share/doc/kde/HTML/pl/amarok/config.docbook
+share/doc/kde/HTML/pl/amarok/faq.docbook
+share/doc/kde/HTML/pl/amarok/index.cache.bz2
+share/doc/kde/HTML/pl/amarok/index.docbook
+share/doc/kde/HTML/pl/amarok/quick.docbook
+share/doc/kde/HTML/pl/amarok/requirements.docbook
+share/doc/kde/HTML/pl/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
@@ -240,6 +296,7 @@ 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/dynamic_mode1.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
@@ -251,17 +308,23 @@ 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/queue_manager.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/doc/kde/HTML/sv/amarok/add_dynamic.png
share/doc/kde/HTML/sv/amarok/advanced.docbook
+share/doc/kde/HTML/sv/amarok/amarok_playlist.png
+share/doc/kde/HTML/sv/amarok/analyzer.png
+share/doc/kde/HTML/sv/amarok/browser_choice.png
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_appearance.png
+share/doc/kde/HTML/sv/amarok/config_collection.png
share/doc/kde/HTML/sv/amarok/config_colors.png
share/doc/kde/HTML/sv/amarok/config_engine.png
share/doc/kde/HTML/sv/amarok/config_fonts.png
@@ -273,6 +336,8 @@ share/doc/kde/HTML/sv/amarok/config_scrobbler.png
share/doc/kde/HTML/sv/amarok/context.png
share/doc/kde/HTML/sv/amarok/coverman.png
share/doc/kde/HTML/sv/amarok/develop.docbook
+share/doc/kde/HTML/sv/amarok/dynamic_bar.png
+share/doc/kde/HTML/sv/amarok/dynamic_settings.png
share/doc/kde/HTML/sv/amarok/equalizer.png
share/doc/kde/HTML/sv/amarok/faq.docbook
share/doc/kde/HTML/sv/amarok/feature_guide.docbook
@@ -286,11 +351,14 @@ 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_browser.png
share/doc/kde/HTML/sv/amarok/playlist_window.png
share/doc/kde/HTML/sv/amarok/plugin.docbook
+share/doc/kde/HTML/sv/amarok/queue_manager.png
share/doc/kde/HTML/sv/amarok/quick.docbook
share/doc/kde/HTML/sv/amarok/requirements.docbook
share/doc/kde/HTML/sv/amarok/rmb_menu.png
+share/doc/kde/HTML/sv/amarok/script_manager.png
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
@@ -301,9 +369,11 @@ share/doc/kde/HTML/sv/amarok/welcome.png
share/kde/apps/amarok/amarokui.rc
share/kde/apps/amarok/amarokui_xmms.rc
share/kde/apps/amarok/data/Cool-Streams.xml
+share/kde/apps/amarok/data/amaroK_1.4_welcome.ogg
share/kde/apps/amarok/data/ball.png
share/kde/apps/amarok/data/dot.png
share/kde/apps/amarok/data/equalizer_presets.xml
+share/kde/apps/amarok/data/firstrun.m3u
share/kde/apps/amarok/data/grid.png
share/kde/apps/amarok/data/wirl1.png
share/kde/apps/amarok/data/wirl2.png
@@ -326,11 +396,116 @@ 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/icons/crystalsvg/scalable/actions/dynamic.svg
share/kde/apps/amarok/icons/crystalsvg/scalable/actions/player_playlist_2.svg
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
share/kde/apps/amarok/icons/hicolor/64x64/actions/collection.png
share/kde/apps/amarok/images/amarok_cut.png
share/kde/apps/amarok/images/amarok_rocks.jpg
@@ -341,6 +516,9 @@ 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/back_stars_grey.png
+share/kde/apps/amarok/images/currenttrack_bar_left.png
+share/kde/apps/amarok/images/currenttrack_bar_mid.png
+share/kde/apps/amarok/images/currenttrack_bar_right.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
@@ -354,13 +532,16 @@ share/kde/apps/amarok/images/loading1.png
share/kde/apps/amarok/images/loading2.png
share/kde/apps/amarok/images/logo_web.png
share/kde/apps/amarok/images/menu_sidepixmap.png
+share/kde/apps/amarok/images/more_albums.png
share/kde/apps/amarok/images/musicbrainz.png
share/kde/apps/amarok/images/nocover.png
share/kde/apps/amarok/images/pl_active2.png
share/kde/apps/amarok/images/pl_inactive2.png
share/kde/apps/amarok/images/sbinner_stars.png
share/kde/apps/amarok/images/shadow_albumcover.png
-share/kde/apps/amarok/images/splash_screen.png
+share/kde/apps/amarok/images/smallstar.png
+share/kde/apps/amarok/images/splash_screen.jpg
+share/kde/apps/amarok/images/star.png
share/kde/apps/amarok/images/time_minus.png
share/kde/apps/amarok/images/time_plus.png
share/kde/apps/amarok/images/vol_speaker.png
@@ -371,21 +552,25 @@ share/kde/apps/amarok/images/volumeslider-inset.png
share/kde/apps/amarok/images/wizard_compact.png
share/kde/apps/amarok/images/wizard_xmms.png
share/kde/apps/amarok/images/xine_logo.png
-share/kde/apps/amarok/scripts/alarm/COPYING
-share/kde/apps/amarok/scripts/alarm/README
-share/kde/apps/amarok/scripts/alarm/alarm.py
share/kde/apps/amarok/scripts/amarok_live/README
share/kde/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
share/kde/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
share/kde/apps/amarok/scripts/amarok_live/amarok_live.py
share/kde/apps/amarok/scripts/common/Publisher.py
share/kde/apps/amarok/scripts/common/Zeroconf.py
-share/kde/apps/amarok/scripts/graphequalizer/README
-share/kde/apps/amarok/scripts/graphequalizer/graphequalizer
+share/kde/apps/amarok/scripts/lyrics_astraweb/COPYING
+share/kde/apps/amarok/scripts/lyrics_astraweb/README
+share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
+share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
+share/kde/apps/amarok/scripts/lyrics_lyrc/COPYING
+share/kde/apps/amarok/scripts/lyrics_lyrc/README
+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/README
share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
+share/kde/apps/amarok/scripts/ruby_debug/debug.rb
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
@@ -394,6 +579,7 @@ 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/WebControl.spec
share/kde/apps/amarok/scripts/webcontrol/WebPublisher.py
share/kde/apps/amarok/scripts/webcontrol/amarok_cut.png
share/kde/apps/amarok/scripts/webcontrol/controlbackground.png
@@ -404,6 +590,8 @@ 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/smallstar.png
+share/kde/apps/amarok/scripts/webcontrol/star.png
share/kde/apps/amarok/scripts/webcontrol/template.thtml
share/kde/apps/amarok/scripts/webcontrol/vol_speaker.png
share/kde/apps/amarok/themes/example/stylesheet.css
@@ -416,7 +604,6 @@ 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
-share/kde/config.kcfg/gstconfig.kcfg
share/kde/config.kcfg/xinecfg.kcfg
share/kde/config/amarokrc
share/kde/icons/hicolor/128x128/apps/amarok.png
@@ -425,15 +612,12 @@ share/kde/icons/hicolor/22x22/apps/amarok.png
share/kde/icons/hicolor/32x32/apps/amarok.png
share/kde/icons/hicolor/48x48/apps/amarok.png
share/kde/icons/hicolor/64x64/apps/amarok.png
-share/kde/services/amarok_gstengine_plugin.desktop
+share/kde/services/amarok_generic-mediadevice.desktop
share/kde/services/amarok_void-engine_plugin.desktop
share/kde/services/amarok_xine-engine.desktop
share/kde/servicetypes/amarok_plugin.desktop
-share/locale/af/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
@@ -442,29 +626,22 @@ 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/fi/LC_MESSAGES/amarok.mo
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/hr/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/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/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
@@ -473,12 +650,10 @@ 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/se/LC_MESSAGES/amarok.mo
+share/locale/rw/LC_MESSAGES/amarok.mo
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
@@ -486,6 +661,7 @@ share/locale/th/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/xx/LC_MESSAGES/amarok.mo
share/locale/zh_CN/LC_MESSAGES/amarok.mo
share/locale/zh_TW/LC_MESSAGES/amarok.mo
@comment in kde: @dirrm share/kde/servicetypes
@@ -510,11 +686,12 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
@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/ruby_debug
@dirrm share/kde/apps/amarok/scripts/playlist2html
-@dirrm share/kde/apps/amarok/scripts/graphequalizer
+@dirrm share/kde/apps/amarok/scripts/lyrics_lyrc
+@dirrm share/kde/apps/amarok/scripts/lyrics_astraweb
@dirrm share/kde/apps/amarok/scripts/common
@dirrm share/kde/apps/amarok/scripts/amarok_live
-@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/hicolor/64x64/actions
@@ -549,6 +726,7 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
@comment in kde: @dirrm share/doc/kde/HTML/pt_BR
@dirrm share/doc/kde/HTML/pt/amarok
@comment in kde: @dirrm share/doc/kde/HTML/pt
+@dirrm share/doc/kde/HTML/pl/amarok
@dirrm share/doc/kde/HTML/nl/amarok
@comment in kde: @dirrm share/doc/kde/HTML/nl
@dirrm share/doc/kde/HTML/it/amarok
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 5b74461f25e..1ec50c4229e 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2006/05/26 09:07:49 joerg Exp $
+$NetBSD: distinfo,v 1.19 2006/05/31 17:59:57 wiz Exp $
-SHA1 (amarok-1.3.9.tar.bz2) = 724293cd312b8bebb50329713ccf702382f29314
-RMD160 (amarok-1.3.9.tar.bz2) = ac13bf4f9e155c0acccc6540869a3c38920f2747
-Size (amarok-1.3.9.tar.bz2) = 10032254 bytes
+SHA1 (amarok-1.4.0a.tar.bz2) = 0274e7d7b780ab10c0d1357fe852d895d86dd409
+RMD160 (amarok-1.4.0a.tar.bz2) = 47ae8f9e23aec02f825fe3791eae63520f56394e
+Size (amarok-1.4.0a.tar.bz2) = 13045009 bytes
SHA1 (patch-aa) = 32ae1ed331a36951739651f380363b71cc0b04e8
SHA1 (patch-ab) = 48c99f7eefef2925e76801dca0a97765ecba6609