3 files changed, 182 insertions, 28 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 4dfc489676eb..7cf8b4e7e9c7 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Media player for KDE
 
-LIB_DEPENDS=    tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=    tag.4:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
@@ -22,10 +21,12 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-OPTIONS=	ARTS "aRts support" on \
-		GSTREAMER "GStreamer support" off \
+OPTIONS=	ARTS "aRts support" off \
+		GSTREAMER "GStreamer support" on \
+		XINE "xine support" off \
 		XMMS "XMMS visualizations" on \
 		OPENGL "OpenGL support" on \
+		AMAZON "Amazon cover fetching support" on
 
 .include <bsd.port.pre.mk>
 
@@ -45,6 +46,14 @@ LIB_DEPENDS+=	gstplay-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
 PLIST_SUB+=	GSTREAMER=""
 .endif
 
+.if defined(WITHOUT_XINE)
+CONFIGURE_ARGS+=--without-xine
+PLIST_SUB+=     XINE="@comment "
+.else
+LIB_DEPENDS+=   xine.9:${PORTSDIR}/multimedia/libxine
+PLIST_SUB+=     XINE=""
+.endif
+
 .if defined(WITHOUT_XMMS)
 PLIST_SUB+=	XMMS="@comment "
 .else
@@ -57,12 +66,18 @@ PLIST_SUB+=	XMMS=""
 CONFIGURE_ARGS+=--without-opengl
 .endif
 
+.if defined(WITHOUT_AMAZON)
+CONFIGURE_ARGS+=--without-amazon
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
 
 post-configure:
 .if defined(WITHOUT_XMMS)
 	@${REINPLACE_CMD} -e '/XMMS /d' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e 's/xmmswrapper//g' ${WRKSRC}/amarok/src/vis/Makefile
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index e3a5148bc225..ec5b45273208 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,2 +1,2 @@
-MD5 (amarok-1.0.1.tar.bz2) = 3572e1bbbc76d3985af9a982f22a5da8
-SIZE (amarok-1.0.1.tar.bz2) = 1834336
+MD5 (amarok-1.1.1.tar.bz2) = 6c0cccd4c8b508a2e0c9b0f187a907cf
+SIZE (amarok-1.1.1.tar.bz2) = 2888815
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index a1eb8515dc8b..6e12e39802b6 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -1,10 +1,15 @@
 bin/amarok
-%%XMMS%%bin/amarok_xmmswrapper
+%%XMMS%%bin/amarok_xmmswrapper2
 bin/amarokapp
+bin/release_amarok
 %%ARTS%%lib/kde3/libamarok_artsengine_plugin.la
 %%ARTS%%lib/kde3/libamarok_artsengine_plugin.so
 %%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.la
 %%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.so
+lib/kde3/libamarok_void-engine_plugin.la
+lib/kde3/libamarok_void-engine_plugin.so
+%%XINE%%lib/kde3/libamarok_xine-engine.la
+%%XINE%%lib/kde3/libamarok_xine-engine.so
 %%ARTS%%lib/libamarokarts.la
 %%ARTS%%lib/libamarokarts.so
 %%ARTS%%lib/mcop/Amarok/RawScope.mcopclass
@@ -13,100 +18,234 @@ bin/amarokapp
 %%ARTS%%lib/mcop/amarokarts.mcoptype
 share/applications/kde/amarok.desktop
 share/apps/amarok/amarokui.rc
-share/apps/amarok/amarokui_first.rc
 share/apps/amarok/amarokui_xmms.rc
+share/apps/amarok/data/Cool-Streams.m3u
 share/apps/amarok/data/ball.png
 share/apps/amarok/data/dot.png
 share/apps/amarok/data/grid.png
-share/apps/amarok/data/metasound.xml
-share/apps/amarok/data/startupTip.txt
 share/apps/amarok/data/wirl1.png
 share/apps/amarok/data/wirl2.png
+share/apps/amarok/images/amarok_cut.png
+share/apps/amarok/images/amarok_rocks.jpg
 share/apps/amarok/images/b_next.png
 share/apps/amarok/images/b_pause.png
 share/apps/amarok/images/b_play.png
 share/apps/amarok/images/b_prev.png
 share/apps/amarok/images/b_stop.png
 share/apps/amarok/images/bucky.png
+share/apps/amarok/images/context_gradient.png
+share/apps/amarok/images/covermanager.png
+share/apps/amarok/images/currenttrack_play.png
 share/apps/amarok/images/description.png
 share/apps/amarok/images/eq_active2.png
 share/apps/amarok/images/eq_inactive2.png
+share/apps/amarok/images/folder_crystal.png
+share/apps/amarok/images/loading1.png
+share/apps/amarok/images/loading2.png
 share/apps/amarok/images/logo_splash.png
 share/apps/amarok/images/logo_web.png
+share/apps/amarok/images/musicbrainz.png
+share/apps/amarok/images/nocover.png
 share/apps/amarok/images/pl_active2.png
 share/apps/amarok/images/pl_inactive2.png
-share/apps/amarok/images/sound.png
 share/apps/amarok/images/time_minus.png
 share/apps/amarok/images/time_plus.png
 share/apps/amarok/images/vol_speaker.png
+share/apps/amarok/images/wizard_compact.png
+share/apps/amarok/images/wizard_xmms.png
+share/apps/konqueror/servicemenus/amarok_append.desktop
 share/config.kcfg/amarok.kcfg
+%%GSTREAMER%%share/config.kcfg/gstconfig.kcfg
 share/config/amarokrc
+share/doc/HTML/da/amarok/common
+share/doc/HTML/da/amarok/index.cache.bz2
+share/doc/HTML/da/amarok/index.docbook
+share/doc/HTML/en/amarok/advanced.docbook
+share/doc/HTML/en/amarok/analyzer.png
 share/doc/HTML/en/amarok/buttons.png
 share/doc/HTML/en/amarok/collection.png
 share/doc/HTML/en/amarok/common
+share/doc/HTML/en/amarok/config.docbook
 share/doc/HTML/en/amarok/config_colors.png
+share/doc/HTML/en/amarok/config_engine.png
 share/doc/HTML/en/amarok/config_fonts.png
 share/doc/HTML/en/amarok/config_general.png
 share/doc/HTML/en/amarok/config_osd.png
 share/doc/HTML/en/amarok/config_playback.png
 share/doc/HTML/en/amarok/context.png
+share/doc/HTML/en/amarok/coverman.png
+share/doc/HTML/en/amarok/develop.docbook
+share/doc/HTML/en/amarok/faq.docbook
 share/doc/HTML/en/amarok/file_browser.png
+share/doc/HTML/en/amarok/hidden.docbook
 share/doc/HTML/en/amarok/index.cache.bz2
 share/doc/HTML/en/amarok/index.docbook
 share/doc/HTML/en/amarok/logo.png
+share/doc/HTML/en/amarok/pl_browser.png
 share/doc/HTML/en/amarok/pl_tip1.png
 share/doc/HTML/en/amarok/play_list.png
 share/doc/HTML/en/amarok/player_window.png
 share/doc/HTML/en/amarok/playlist_window.png
+share/doc/HTML/en/amarok/requirements.docbook
+share/doc/HTML/en/amarok/rmb_menu.png
 share/doc/HTML/en/amarok/search.png
 share/doc/HTML/en/amarok/status_bar.png
-share/doc/HTML/en/amarok/streams.png
+share/doc/HTML/en/amarok/using.docbook
 share/doc/HTML/en/amarok/vis_window.png
-share/doc/HTML/en/amarok/welcome.png
+share/doc/HTML/et/amarok/advanced.docbook
+share/doc/HTML/et/amarok/common
+share/doc/HTML/et/amarok/config.docbook
+share/doc/HTML/et/amarok/develop.docbook
+share/doc/HTML/et/amarok/faq.docbook
+share/doc/HTML/et/amarok/howto.docbook
+share/doc/HTML/et/amarok/index.cache.bz2
+share/doc/HTML/et/amarok/index.docbook
+share/doc/HTML/et/amarok/plugin.docbook
+share/doc/HTML/et/amarok/requirements.docbook
+share/doc/HTML/et/amarok/using.docbook
+share/doc/HTML/fr/amarok/common
+share/doc/HTML/fr/amarok/index.cache.bz2
+share/doc/HTML/fr/amarok/index.docbook
+share/doc/HTML/it/amarok/advanced.docbook
+share/doc/HTML/it/amarok/common
+share/doc/HTML/it/amarok/config.docbook
+share/doc/HTML/it/amarok/develop.docbook
+share/doc/HTML/it/amarok/faq.docbook
+share/doc/HTML/it/amarok/hidden.docbook
+share/doc/HTML/it/amarok/index.cache.bz2
+share/doc/HTML/it/amarok/index.docbook
+share/doc/HTML/it/amarok/plugin.docbook
+share/doc/HTML/it/amarok/requirements.docbook
+share/doc/HTML/it/amarok/using.docbook
+share/doc/HTML/pt/amarok/advanced.docbook
+share/doc/HTML/pt/amarok/common
+share/doc/HTML/pt/amarok/config.docbook
+share/doc/HTML/pt/amarok/develop.docbook
+share/doc/HTML/pt/amarok/faq.docbook
+share/doc/HTML/pt/amarok/hidden.docbook
+share/doc/HTML/pt/amarok/index.cache.bz2
+share/doc/HTML/pt/amarok/index.docbook
+share/doc/HTML/pt/amarok/plugin.docbook
+share/doc/HTML/pt/amarok/requirements.docbook
+share/doc/HTML/pt/amarok/using.docbook
+share/doc/HTML/sv/amarok/advanced.docbook
+share/doc/HTML/sv/amarok/buttons.png
+share/doc/HTML/sv/amarok/collection.png
+share/doc/HTML/sv/amarok/common
+share/doc/HTML/sv/amarok/config.docbook
+share/doc/HTML/sv/amarok/config_colors.png
+share/doc/HTML/sv/amarok/config_fonts.png
+share/doc/HTML/sv/amarok/config_general.png
+share/doc/HTML/sv/amarok/config_osd.png
+share/doc/HTML/sv/amarok/config_playback.png
+share/doc/HTML/sv/amarok/context.png
+share/doc/HTML/sv/amarok/develop.docbook
+share/doc/HTML/sv/amarok/faq.docbook
+share/doc/HTML/sv/amarok/file_browser.png
+share/doc/HTML/sv/amarok/hidden.docbook
+share/doc/HTML/sv/amarok/index.cache.bz2
+share/doc/HTML/sv/amarok/index.docbook
+share/doc/HTML/sv/amarok/pl_browser.png
+share/doc/HTML/sv/amarok/pl_tip1.png
+share/doc/HTML/sv/amarok/play_list.png
+share/doc/HTML/sv/amarok/player_window.png
+share/doc/HTML/sv/amarok/playlist_window.png
+share/doc/HTML/sv/amarok/plugin.docbook
+share/doc/HTML/sv/amarok/requirements.docbook
+share/doc/HTML/sv/amarok/scripts_window.png
+share/doc/HTML/sv/amarok/search.png
+share/doc/HTML/sv/amarok/status_bar.png
+share/doc/HTML/sv/amarok/streams.png
+share/doc/HTML/sv/amarok/using.docbook
+share/doc/HTML/sv/amarok/vis_window.png
+share/doc/HTML/sv/amarok/welcome.png
+share/icons/crystalsvg/16x16/actions/player_playlist_2.png
 share/icons/crystalsvg/16x16/apps/amarok.png
+share/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/icons/crystalsvg/22x22/apps/amarok.png
+share/icons/crystalsvg/32x32/actions/player_playlist_2.png
 share/icons/crystalsvg/32x32/apps/amarok.png
+share/icons/crystalsvg/48x48/actions/player_playlist_2.png
 share/icons/crystalsvg/48x48/apps/amarok.png
 share/icons/crystalsvg/64x64/apps/amarok.png
-share/locale/da/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/en_GB/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/es/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/et/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/fr/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/hu/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/pt/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/pt_BR/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/ru/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/sr/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/sv/LC_MESSAGES/amarok-1.0.1.mo
-share/locale/tr/LC_MESSAGES/amarok-1.0.1.mo
+share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/br/LC_MESSAGES/amarok.mo
+share/locale/ca/LC_MESSAGES/amarok.mo
+share/locale/cy/LC_MESSAGES/amarok.mo
+share/locale/da/LC_MESSAGES/amarok.mo
+share/locale/de/LC_MESSAGES/amarok.mo
+share/locale/en_GB/LC_MESSAGES/amarok.mo
+share/locale/es/LC_MESSAGES/amarok.mo
+share/locale/et/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/hu/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/ko/LC_MESSAGES/amarok.mo
+share/locale/nl/LC_MESSAGES/amarok.mo
+share/locale/pl/LC_MESSAGES/amarok.mo
+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/sr/LC_MESSAGES/amarok.mo
+share/locale/sv/LC_MESSAGES/amarok.mo
+share/locale/ta/LC_MESSAGES/amarok.mo
+share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/uz/LC_MESSAGES/amarok.mo
+share/locale/zh_CN/LC_MESSAGES/amarok.mo
 %%ARTS%%share/services/amarok_artsengine_plugin.desktop
 %%GSTREAMER%%share/services/amarok_gstengine_plugin.desktop
+share/services/amarok_void-engine_plugin.desktop
+%%XINE%%share/services/amarok_xine-engine.desktop
+%%XINE%%share/services/amarok_xineengine_plugin.desktop
 share/servicetypes/amarok_plugin.desktop
 @unexec rmdir %D/share/servicetypes 2>/dev/null || true
 @unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/48x48/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/sv/amarok
+@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrm share/doc/HTML/pt/amarok
+@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrm share/doc/HTML/it/amarok
+@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrm share/doc/HTML/fr/amarok
+@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrm share/doc/HTML/et/amarok
+@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
 @dirrm share/doc/HTML/en/amarok
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrm share/doc/HTML/da/amarok
+@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @unexec rmdir %D/share/config.kcfg 2>/dev/null || true
 @unexec rmdir %D/share/config 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
 @dirrm share/apps/amarok/images
 @dirrm share/apps/amarok/data
 @dirrm share/apps/amarok
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applications/kde 2>/dev/null || true
 @unexec rmdir %D/share/applications 2>/dev/null || true
-@dirrm lib/mcop/Amarok
-@unexec rmdir %D/lib/mcop 2>/dev/null || true
+%%ARTS%%@dirrm lib/mcop/Amarok
+%%ARTS%%@unexec rmdir %D/lib/mcop 2>/dev/null || true