5 files changed, 45 insertions, 39 deletions

diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 000e8540a134..4debfe2a9ddb 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	liblastfm
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://cdn.last.fm/src/
 
@@ -15,9 +14,7 @@ MAINTAINER=	datahead4@gmail.com
 COMMENT=	Collection of libraries to help integrate Last.fm services
 
 LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		fftw3f.5:${PORTSDIR}/math/fftw3-float \
-		mad.2:${PORTSDIR}/audio/libmad
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+		fftw3f.5:${PORTSDIR}/math/fftw3-float
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
@@ -26,12 +23,16 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib xml network sql gui qtestlib \
 		qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	-release
 MAKE_JOBS_UNSAFE=	yes
 
 USE_LDCONFIG=	yes
 
 post-extract:
-	${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${LOCALBASE}/bin/ruby|' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|__demos __tests||' ${WRKSRC}/admin/Makefile.rb
+	${REINPLACE_CMD} -e '/QMAKE_CXXFLAGS_RELEASE.*/d' \
+		-e 's|linux:|unix:|'  ${WRKSRC}/.qmake.cache
 	${FIND} ${WRKSRC}/admin -type f | ${XARGS} \
 		 ${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${LOCALBASE}/bin/ruby|'
 
diff --git a/audio/liblastfm/distinfo b/audio/liblastfm/distinfo
index 3c6a0997ac2e..d0d97959a12b 100644
--- a/audio/liblastfm/distinfo
+++ b/audio/liblastfm/distinfo
@@ -1,3 +1,3 @@
-MD5 (liblastfm-0.2.1.tar.bz2) = c849a5122f833090184c1a496350dcbc
-SHA256 (liblastfm-0.2.1.tar.bz2) = a8f816c5b1c624052912afd06351bbb29f876339ee216f5f2fec81740f09fdf9
-SIZE (liblastfm-0.2.1.tar.bz2) = 86083
+MD5 (liblastfm-0.3.0.tar.bz2) = 3f73222ebc31635941832b01e7a494b6
+SHA256 (liblastfm-0.3.0.tar.bz2) = dd7297fbfe114b2eb29b491d56c6df9b83f16f576c70466d39a95a5ff19af76d
+SIZE (liblastfm-0.3.0.tar.bz2) = 92957
diff --git a/audio/liblastfm/files/patch-configure b/audio/liblastfm/files/patch-configure
deleted file mode 100644
index 66220c3f0b59..000000000000
--- a/audio/liblastfm/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2009-04-20 20:20:03.000000000 -0500
-+++ configure	2009-04-20 21:12:07.000000000 -0500
-@@ -97,7 +97,7 @@
-         case `uname` in
-             Darwin)
-                 [ $STATIC_LINK_3RDPARTIES_ON_MAC ] || other_args="CONFIG -= app_bundle";;
--            Linux)
-+            Linux | FreeBSD)
-                 other_args="CONFIG += warn_off";;
-             *) 
-                 #Windows, hopefullly
diff --git a/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro b/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
new file mode 100644
index 000000000000..f99ff309462e
--- /dev/null
+++ b/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
@@ -0,0 +1,12 @@
+--- src/fingerprint/fingerprint.pro.orig	2009-06-05 03:41:27.000000000 +1100
++++ src/fingerprint/fingerprint.pro	2009-09-02 23:24:41.000000000 +1100
+@@ -20,8 +20,7 @@
+         INCLUDEPATH += /opt/local/include
+     }
+     else{
+-        CONFIG += link_pkgconfig
+-        PKGCONFIG += fftw3f samplerate
++    LIBS += -lsamplerate -lfftw3f
+     }
+ }
+ 
diff --git a/audio/liblastfm/pkg-plist b/audio/liblastfm/pkg-plist
index 90e2c70e75fc..fa0c792511a6 100644
--- a/audio/liblastfm/pkg-plist
+++ b/audio/liblastfm/pkg-plist
@@ -1,31 +1,35 @@
-include/lastfm/UrlBuilder
+include/lastfm/Album
+include/lastfm/Artist
+include/lastfm/Audioscrobbler
+include/lastfm/AuthenticatedUser
 include/lastfm/Fingerprint
-include/lastfm/CompleteFingerprint
+include/lastfm/FingerprintId
+include/lastfm/FingerprintableSource
+include/lastfm/InternetConnectionMonitor
+include/lastfm/Mbid
+include/lastfm/MutableTrack
+include/lastfm/NetworkAccessManager
+include/lastfm/Playlist
 include/lastfm/RadioStation
 include/lastfm/RadioTuner
-include/lastfm/Audioscrobbler
 include/lastfm/Scrobble
 include/lastfm/ScrobblePoint
-include/lastfm/Track
-include/lastfm/MutableTrack
-include/lastfm/Mbid
-include/lastfm/Artist
-include/lastfm/Album
-include/lastfm/FingerprintId
-include/lastfm/Playlist
 include/lastfm/Tag
+include/lastfm/Track
+include/lastfm/UrlBuilder
 include/lastfm/User
-include/lastfm/AuthenticatedUser
+include/lastfm/XmlQuery
 include/lastfm/Xspf
-include/lastfm/WsAccessManager
-include/lastfm/WsError
-include/lastfm/WsKeys
-include/lastfm/WsRequestBuilder
-include/lastfm/WsReply
-include/lastfm/WsDomElement
 include/lastfm/global.h
+include/lastfm/misc.h
+include/lastfm/ws.h
+include/lastfm.h
 lib/liblastfm.so
 lib/liblastfm.so.0
-lib/liblastfm.so.0.2
-lib/liblastfm.so.0.2.1
+lib/liblastfm.so.0.3
+lib/liblastfm.so.0.3.0
+lib/liblastfm_fingerprint.so
+lib/liblastfm_fingerprint.so.0
+lib/liblastfm_fingerprint.so.0.1
+lib/liblastfm_fingerprint.so.0.1.0
 @dirrm include/lastfm