5 files changed, 14 insertions, 29 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 06b9b4db1aa1..ef75ba672760 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.8
-PORTREVISION=	4
+PORTVERSION=	1.4.9.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index 6e6091f226b2..d018fb0b6fe3 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.8.tar.bz2) = 7f65c4a8f3f0ff9042a5b5dd21b36cc8
-SHA256 (amarok-1.4.8.tar.bz2) = 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
-SIZE (amarok-1.4.8.tar.bz2) = 12699378
+MD5 (amarok-1.4.9.1.tar.bz2) = aa588778379a391ad3f4b3fc770217e4
+SHA256 (amarok-1.4.9.1.tar.bz2) = c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
+SIZE (amarok-1.4.9.1.tar.bz2) = 12707926
diff --git a/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp b/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp
deleted file mode 100644
index 6a642616d67b..000000000000
--- a/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/lastfm.cpp.orig
-+++ amarok/src/lastfm.cpp
-@@ -905,7 +905,7 @@
- 
-     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
- 
--    QString token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
-+    token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
-                        .arg( QString( QUrl( currentUsername() ).encodedPathAndQuery() ) )
-                        .arg( QString( QUrl( md5pass ).encodedPathAndQuery() ) )
-                        .arg( QString( QUrl( challenge ).encodedPathAndQuery() ) )
diff --git a/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in b/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
index 0a969a69e2a3..6e844fcad276 100644
--- a/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
+++ b/audio/amarok-kde4/files/patch-amarok_src_metadata_audible_Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- amarok/src/metadata/audible/Makefile.in.orig
-+++ amarok/src/metadata/audible/Makefile.in
-@@ -435,7 +435,7 @@
- xmms_cflags = @xmms_cflags@
- xmms_libs = @xmms_libs@
+--- amarok/src/metadata/audible/Makefile.in.orig        Thu Apr 10 22:17:11 2008
++++ amarok/src/metadata/audible/Makefile.in     Thu May 15 15:40:38 2008
+@@ -407,7 +407,7 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
  SUBDIRS = 
--INCLUDES = $(all_includes) $(taglib_includes)
-+INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(taglib_includes)
+-INCLUDES = $(all_includes) $(TAGLIB_CFLAGS)
++INCLUDES = -I$(top_srcdir)/amarok/src $(all_includes) $(TAGLIB_CFLAGS)
  #>- METASOURCES = AUTO
  libtagaudible_la_LDFLAGS = $(all_libraries)
  noinst_LTLIBRARIES = libtagaudible.la
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index c92931d754e5..21bbdc442850 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -666,6 +666,7 @@ share/doc/HTML/es/amarok/analyzer.png
 share/doc/HTML/es/amarok/browser_choice.png
 share/doc/HTML/es/amarok/buttons.png
 share/doc/HTML/es/amarok/collection.png
+share/doc/HTML/es/amarok/common
 share/doc/HTML/es/amarok/config.docbook
 share/doc/HTML/es/amarok/config_appearance.png
 share/doc/HTML/es/amarok/config_collection.png
@@ -683,6 +684,8 @@ share/doc/HTML/es/amarok/dynamic_settings.png
 share/doc/HTML/es/amarok/equalizer.png
 share/doc/HTML/es/amarok/faq.docbook
 share/doc/HTML/es/amarok/file_browser.png
+share/doc/HTML/es/amarok/index.cache.bz2
+share/doc/HTML/es/amarok/index.docbook
 share/doc/HTML/es/amarok/logo.png
 share/doc/HTML/es/amarok/media_device.png
 share/doc/HTML/es/amarok/menubar.png