Index: Makefile
===================================================================
--- Makefile	(revision 308104)
+++ Makefile	(working copy)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	last.fm
-PORTVERSION=	1.4.2.58240
-PORTREVISION=	6
+PORTVERSION=	1.5.4.26862
 CATEGORIES=	audio net
 MASTER_SITES=	http://cdn.last.fm/client/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -43,6 +42,7 @@
 .endif
 
 post-patch:
+	${CP} ${WRKSRC}/dist/tarball_files/configure ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|/bin/bash|/${LOCALBASE}/bin/bash|g' \
 			-E -e 's|(.*"CONFIG-=debug")|\1 ${QMAKEFLAGS}|g' \
 			-e 's|function header|header()|g' \
Index: distinfo
===================================================================
--- distinfo	(revision 308070)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (last.fm-1.4.2.58240.src.tar.bz2) = 6e66f3408021b3ea512224451599e81bd0fb9ede464575d9acae2cc16d5b6429
-SIZE (last.fm-1.4.2.58240.src.tar.bz2) = 7302117
+SHA256 (last.fm-1.5.4.26862.src.tar.bz2) = 5c110ab6e7a4c4ec950fb65912bc5ddfd106ce969c4b7376a7603cf7b3720e2a
+SIZE (last.fm-1.5.4.26862.src.tar.bz2) = 11415025
Index: files/patch-LastFM.pro
===================================================================
--- files/patch-LastFM.pro	(revision 0)
+++ files/patch-LastFM.pro	(working copy)
@@ -0,0 +1,11 @@
+--- LastFM.pro.orig	2012-12-02 14:23:24.000000000 +0100
++++ LastFM.pro	2012-12-02 14:23:37.000000000 +0100
+@@ -37,7 +37,7 @@
+     SUBDIRS -= src/mediadevices/ipod
+ }
+ 
+-linux* {
++unix:!mac* {
+     SUBDIRS -= src/Twiddly \
+                src/Bootstrapper/ITunesDevice
+ 

Property changes on: files/patch-LastFM.pro
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src-Helper-mediadevicewather.cpp
===================================================================
--- files/patch-src-Helper-mediadevicewather.cpp	(revision 308070)
+++ files/patch-src-Helper-mediadevicewather.cpp	(working copy)
@@ -1,10 +0,0 @@
---- src/Helper/mediadevicewatcher.cpp.orig	2009-11-04 22:48:51.000000000 +0100
-+++ src/Helper/mediadevicewatcher.cpp	2009-11-04 22:50:13.000000000 +0100
-@@ -73,6 +73,7 @@
-             QString appExe = "Last.fm_debug";
-         #endif
-     #endif
-+    QString appExe = "last.fm";
- 
-     QString app = QCoreApplication::applicationDirPath() + "/" + appExe;
-     QStringList params( "-tray" );
Index: files/patch-src-mediadevice-itunes-itunesdevice.cpp
===================================================================
--- files/patch-src-mediadevice-itunes-itunesdevice.cpp	(revision 308070)
+++ files/patch-src-mediadevice-itunes-itunesdevice.cpp	(working copy)
@@ -1,13 +0,0 @@
---- src/mediadevices/itunes/itunesdevice.cpp.orig	2009-11-04 22:07:06.000000000 +0100
-+++ src/mediadevices/itunes/itunesdevice.cpp	2009-11-04 22:07:12.000000000 +0100
-@@ -589,8 +589,9 @@
-             //HACK
-         #ifdef WIN32
-             QDir qcd = m_path;
--        #endif
-             QSettings().setValue( "devicePaths/" + uid + "/path", qcd.absolutePath() );
-+        #endif
-+
-             //HACK
-         }
-         else
Index: files/patch-src-output-alsa-playback-xconvert.c
===================================================================
--- files/patch-src-output-alsa-playback-xconvert.c	(revision 0)
+++ files/patch-src-output-alsa-playback-xconvert.c	(working copy)
@@ -0,0 +1,10 @@
+--- src/output/alsa-playback/xconvert.c.orig	2012-12-02 14:30:50.000000000 +0100
++++ src/output/alsa-playback/xconvert.c	2012-12-02 14:33:58.000000000 +0100
+@@ -57,6 +57,7 @@
+ 
+ #endif
+ 
++#define uint size_t
+ 
+ struct buffer {
+     void *buffer;

Property changes on: files/patch-src-output-alsa-playback-xconvert.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src-updatewizard.h
===================================================================
--- files/patch-src-updatewizard.h	(revision 0)
+++ files/patch-src-updatewizard.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/updatewizard.h.orig	2012-12-02 14:01:31.000000000 +0100
++++ src/updatewizard.h	2012-12-02 14:01:42.000000000 +0100
+@@ -50,7 +50,7 @@
+         CAutoUpdater& updater,
+         QWidget*      parent = NULL);
+ 
+-    UpdateWizard::UpdateWizard( CComponentInfo* );
++    UpdateWizard( CComponentInfo* );
+ 
+     bool shouldShow() const{ return m_showWizard; }
+ 

Property changes on: files/patch-src-updatewizard.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src-wizardselectupdatespage.h
===================================================================
--- files/patch-src-wizardselectupdatespage.h	(revision 0)
+++ files/patch-src-wizardselectupdatespage.h	(working copy)
@@ -0,0 +1,11 @@
+--- src/wizardselectupdatespage.h.orig	2012-12-02 13:59:46.000000000 +0100
++++ src/wizardselectupdatespage.h	2012-12-02 14:00:17.000000000 +0100
+@@ -58,7 +58,7 @@
+     GetChecked(
+         std::vector<CComponentInfo*>& vecChecked);
+     
+-    void WizardSelectUpdatesPage::GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
++    void GetMajorUpdateComponent( std::vector<CComponentInfo*>& vecToUpdate );
+ 
+ public slots:
+ 

Property changes on: files/patch-src-wizardselectupdatespage.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src_LastFMHelper-controlinterface.h
===================================================================
--- files/patch-src_LastFMHelper-controlinterface.h	(revision 308070)
+++ files/patch-src_LastFMHelper-controlinterface.h	(working copy)
@@ -1,10 +0,0 @@
---- src/Helper/controlinterface.h.orig	2007-09-24 23:41:54.000000000 +0200
-+++ src/Helper/controlinterface.h	2007-09-24 23:42:01.000000000 +0200
-@@ -24,6 +24,7 @@
- 
- #include <QObject>
- #include <QMutex>
-+#include <QCoreApplication>
- 
- class ControlInterface : public QObject
- {