- update to -> 1.4.5

    Changelog: http://amarok.kde.org/content/view/10/66/

PR:		ports/108711
Submitted by:	Alex<goo@t72.ru>

10 files changed, 67 insertions, 84 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 1fb62eb0173e..e530c6002fbc 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	1.4.5
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -32,7 +31,6 @@ USE_LDCONFIG=	yes
 OPTIONS=	GPOD "iPod support" on \
 		NJB "Creative Nomad and Dell support" on \
 		MTP "MTP device support" on \
-		XMMS "XMMS visualizations" off \
 		OPENGL "OpenGL support" on \
 		AMAZON "Amazon cover fetching support" on \
 		MYSQL "Use MySQL as collection backend" off \
@@ -74,15 +72,6 @@ CONFIGURE_ARGS+=--with-libmtp
 PLIST_SUB+=	MTP=""
 .endif
 
-.if !defined(WITH_XMMS)
-PLIST_SUB+=	XMMS="@comment "
-CONFIGURE_ARGS+=--without-xmms
-.else
-BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-PLIST_SUB+=	XMMS=""
-.endif
-
 .if defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=--without-opengl
 .endif
@@ -101,6 +90,11 @@ USE_PGSQL=	yes
 CONFIGURE_ARGS+=--enable-postgresql
 .endif
 
+.if defined(DEBUG)
+CONFIGURE_ARGS+=--enable-debug=full
+STRIP=          # none
+.endif
+
 pre-extract:	check-options-version
 
 post-patch:
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 2bb11865bbf8..678f3343234d 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.4.tar.bz2) = 56a9aec42088c338b81252f8e0651781
-SHA256 (amarok-1.4.4.tar.bz2) = 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
-SIZE (amarok-1.4.4.tar.bz2) = 17635707
+MD5 (amarok-1.4.5.tar.bz2) = 1dac1cb5ac9c9cdabdab5f69b39e92c8
+SHA256 (amarok-1.4.5.tar.bz2) = 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8
+SIZE (amarok-1.4.5.tar.bz2) = 18034110
diff --git a/audio/amarok/files/patch-amarok_src_amarok__proxy.rb b/audio/amarok/files/patch-amarok_src_amarok__proxy.rb
deleted file mode 100644
index 621471505cd7..000000000000
--- a/audio/amarok/files/patch-amarok_src_amarok__proxy.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/amarok_proxy.rb.orig
-+++ amarok/src/amarok_proxy.rb
-@@ -117,6 +117,11 @@
-   def cp_to_empty_outward( income, output )
-     myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}"
-     income.each_line do |data|
-+      if data =~ /User-Agent: xine\/([0-9.]+)/
-+        version = $1.split(".").collect { |v| v.to_i }
-+        myputs("Found xine user agent version #{version.join(".")}")
-+        @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 )
-+      end
-       myputs( data )
-       data.chomp!
-       safe_write( output, data )
-@@ -142,7 +147,7 @@
- 
-   def cp_all_inward( income, output )
-     myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" )
--    if self.is_a?( LastFM ) and @engine == 'xine-engine'
-+    if self.is_a?( LastFM ) and @xineworkaround
-       myputs( "Using buffer fill workaround." )
-       filler = Array.new( 4096, 0 )
-       safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block
diff --git a/audio/amarok/files/patch-amarok_src_lastfm.cpp b/audio/amarok/files/patch-amarok_src_lastfm.cpp
index 14473120eaa0..6a642616d67b 100644
--- a/audio/amarok/files/patch-amarok_src_lastfm.cpp
+++ b/audio/amarok/files/patch-amarok_src_lastfm.cpp
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- amarok/src/lastfm.cpp.orig
 +++ amarok/src/lastfm.cpp
-@@ -729,7 +729,7 @@
+@@ -905,7 +905,7 @@
  
      QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
  
diff --git a/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp b/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp
deleted file mode 100644
index 03e8b914d812..000000000000
--- a/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig
-+++ amarok/src/mediadevice/generic/genericmediadevice.cpp
-@@ -415,7 +415,13 @@
-         if( m_medium.mountPoint() == (*mountiter)->mountPoint() )
-             m_medium.setFsType( (*mountiter)->mountType() );
-     }
--    m_actuallyVfat = m_medium.fsType() == "vfat" ? true : false;
-+    m_actuallyVfat = m_medium.fsType() == 
-+#ifdef __FreeBSD__
-+"msdosfs"
-+#else
-+"vfat"
-+#endif
-+ ? true : false;
-     m_connected = true;
-     m_transferDir = m_medium.mountPoint();
-     m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this );
-@@ -457,7 +463,7 @@
-     debug() << "Renaming: " << src << " to: " << dst << endl;
- 
-     //do we want a progress dialog?  If so, set last false to true
--    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) )
-+    if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, 0 ) )
-     {
-         m_mfm.erase( m_mim[item]->getFullName() );
-         m_mim[item]->setNamesFromBase( item->text(0) );
diff --git a/audio/amarok/files/patch-amarok_src_sqlite_fts1.c b/audio/amarok/files/patch-amarok_src_sqlite_fts1.c
new file mode 100644
index 000000000000..40b90d0fd218
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_sqlite_fts1.c
@@ -0,0 +1,11 @@
+--- amarok/src/sqlite/fts1.c.orig       Thu Feb  1 23:14:17 2007
++++ amarok/src/sqlite/fts1.c    Sat Feb  3 01:51:38 2007
+@@ -19,7 +19,7 @@
+ #endif
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #else
+ #include <stdlib.h>
diff --git a/audio/amarok/files/patch-amarok_src_sqlite_fts1__porter.c b/audio/amarok/files/patch-amarok_src_sqlite_fts1__porter.c
new file mode 100644
index 000000000000..d0ff8ef54bbe
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_sqlite_fts1__porter.c
@@ -0,0 +1,11 @@
+--- amarok/src/sqlite/fts1_porter.c.orig        Thu Feb  1 23:14:17 2007
++++ amarok/src/sqlite/fts1_porter.c     Sat Feb  3 01:51:55 2007
+@@ -26,7 +26,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #else
+ #include <stdlib.h>
diff --git a/audio/amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c b/audio/amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c
new file mode 100644
index 000000000000..81accd1f733e
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c
@@ -0,0 +1,11 @@
+--- amarok/src/sqlite/fts1_tokenizer1.c.orig    Thu Feb  1 23:14:17 2007
++++ amarok/src/sqlite/fts1_tokenizer1.c Sat Feb  3 01:52:07 2007
+@@ -18,7 +18,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #else
+ #include <stdlib.h>
diff --git a/audio/amarok/files/patch-amarok_src_statusbar_statusbar.cpp b/audio/amarok/files/patch-amarok_src_statusbar_statusbar.cpp
new file mode 100644
index 000000000000..6b19af04d246
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_statusbar_statusbar.cpp
@@ -0,0 +1,11 @@
+--- amarok/src/statusbar/statusbar.cpp.orig	Mon Dec 18 00:17:13 2006
++++ amarok/src/statusbar/statusbar.cpp	Mon Dec 18 00:13:27 2006
+@@ -81,7 +81,7 @@
+     m_slider->setMinimumWidth( m_timeLabel->width() );
+ 
+     m_timeLabel2 = new TimeLabel( positionBox );
+-    m_slider->setMinimumWidth( m_timeLabel2->width() );
++    m_slider->setMinimumWidth( m_timeLabel2->width() + 128 );
+ 
+ 
+     // TODO Both labels need tooltips (string freeze?)
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 5367ec9933fc..4d150af7bb7f 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -3,11 +3,10 @@ bin/amarokapp
 bin/amarokcollectionscanner
 bin/amarok_daapserver.rb
 bin/amarok_proxy.rb
-lib/libamarok.so
-lib/libamarok.so.0
 lib/libamarok.a
 lib/libamarok.la
-%%XMMS%%bin/amarok_xmmswrapper2
+lib/libamarok.so
+lib/libamarok.so.0
 lib/kde3/konqsidebar_universalamarok.a
 lib/kde3/konqsidebar_universalamarok.la
 lib/kde3/konqsidebar_universalamarok.so
@@ -23,15 +22,9 @@ lib/kde3/libamarok_nfs-device.a
 lib/kde3/libamarok_smb-device.so
 lib/kde3/libamarok_smb-device.la
 lib/kde3/libamarok_smb-device.a
-%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.so
-%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.la
-%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.a
 %%NJB%%lib/kde3/libamarok_njb-mediadevice.so
 %%NJB%%lib/kde3/libamarok_njb-mediadevice.la
 %%NJB%%lib/kde3/libamarok_njb-mediadevice.a
-%%MTP%%lib/kde3/libamarok_mtp-mediadevice.so
-%%MTP%%lib/kde3/libamarok_mtp-mediadevice.la
-%%MTP%%lib/kde3/libamarok_mtp-mediadevice.a
 lib/kde3/libamarok_generic-mediadevice.so
 lib/kde3/libamarok_generic-mediadevice.la
 lib/kde3/libamarok_generic-mediadevice.a
@@ -56,7 +49,6 @@ share/apps/amarok/data/equalizer_presets.xml
 share/apps/amarok/data/firstrun.m3u
 share/apps/amarok/data/grid.png
 share/apps/amarok/data/magnatune_logo.png
-share/apps/amarok/data/magnatune_start_page.html
 share/apps/amarok/data/wirl1.png
 share/apps/amarok/data/wirl2.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png
@@ -436,7 +428,6 @@ share/apps/amarok/images/currenttrack_repeat.png
 share/apps/amarok/images/currenttrack_repeat_small.png
 share/apps/amarok/images/currenttrack_stop.png
 share/apps/amarok/images/currenttrack_stop_small.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/lastfm.png
@@ -474,6 +465,7 @@ share/apps/amarok/ruby_lib/mongrel/configurator.rb
 share/apps/amarok/ruby_lib/mongrel/debug.rb
 share/apps/amarok/ruby_lib/mongrel/handlers.rb
 share/apps/amarok/ruby_lib/mongrel/init.rb
+share/apps/amarok/ruby_lib/mongrel/mime_types.yml
 share/apps/amarok/ruby_lib/mongrel/stats.rb
 share/apps/amarok/ruby_lib/mongrel/tcphack.rb
 share/apps/amarok/ruby_lib/rbconfig/datadir.rb
@@ -990,6 +982,7 @@ share/locale/el/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/fa/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
@@ -1016,6 +1009,7 @@ share/locale/ro/LC_MESSAGES/amarok.mo
 share/locale/ru/LC_MESSAGES/amarok.mo
 share/locale/rw/LC_MESSAGES/amarok.mo
 share/locale/sl/LC_MESSAGES/amarok.mo
+share/locale/se/LC_MESSAGES/amarok.mo
 share/locale/sk/LC_MESSAGES/amarok.mo
 share/locale/sq/LC_MESSAGES/amarok.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
@@ -1029,9 +1023,7 @@ share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uz/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
 share/locale/zh_TW/LC_MESSAGES/amarok.mo
-%%GPOD%%share/services/amarok_ipod-mediadevice.desktop
 %%NJB%%share/services/amarok_njb-mediadevice.desktop
-%%MTP%%share/services/amarok_mtp-mediadevice.desktop
 share/services/amarokitpc.protocol
 share/services/amaroklastfm.protocol
 share/services/amarokpcast.protocol
@@ -1072,12 +1064,20 @@ share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/sl/LC_MESSAGES
 @dirrmtry share/locale/sl
+@dirrmtry share/locale/se/LC_MESSAGES
+@dirrmtry share/locale/se
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
 @dirrmtry share/locale/tg/LC_MESSAGES
 @dirrmtry share/locale/tg
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrm share/doc/HTML/sv/amarok
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok