- Update to 0.3.3

- Fix build with Ruby 1.9

4 files changed, 30 insertions, 22 deletions

diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 7a0b503377c7..7f21c1465fa8 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	liblastfm
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.3
+PORTREVISION=	0
 CATEGORIES=	audio
-MASTER_SITES=	http://cdn.last.fm/src/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	swills
+DISTNAME=	mxcl-${PORTNAME}-${PORTVERSION}-0-gf0b3239
 
 MAINTAINER=	datahead4@gmail.com
 COMMENT=	Collection of libraries to help integrate Last.fm services
@@ -17,7 +19,6 @@ COMMENT=	Collection of libraries to help integrate Last.fm services
 LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		fftw3f.5:${PORTSDIR}/math/fftw3-float
 
-USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
@@ -29,16 +30,21 @@ MAKE_JOBS_UNSAFE=	yes
 
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/mxcl-liblastfm-1c739eb
+
 .include <bsd.port.pre.mk>
 post-extract:
-	${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${LOCALBASE}/bin/ruby|' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${RUBY_WITH_SUFFIX}|' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|\`ruby |`${RUBY_WITH_SUFFIX} |' ${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|#!${RUBY_WITH_SUFFIX}|'
-.if ${RUBY_VERSION_CODE} >= 190000
+.if ${RUBY_VER} == 1.9
 	${REINPLACE_CMD} -e "s|'ftools'|'fileutils'|" ${WRKSRC}/admin/qpp ${WRKSRC}/admin/Makefile.rb
+	${REINPLACE_CMD} -e "s|require \"#{cwd}/platform.rb\"|require_relative \"platform.rb\"|" ${WRKSRC}/admin/Makefile.rb
+	${REINPLACE_CMD} -e "s|ruby admin/lastfm.h.rb|${RUBY_WITH_SUFFIX} admin/lastfm.h.rb|" ${WRKSRC}/admin/Makefile.rb
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/liblastfm/distinfo b/audio/liblastfm/distinfo
index e7778c8eddbb..435cf65d7216 100644
--- a/audio/liblastfm/distinfo
+++ b/audio/liblastfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblastfm-0.3.0.tar.bz2) = dd7297fbfe114b2eb29b491d56c6df9b83f16f576c70466d39a95a5ff19af76d
-SIZE (liblastfm-0.3.0.tar.bz2) = 92957
+SHA256 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c
+SIZE (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700
diff --git a/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro b/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
index f99ff309462e..614c82f4b2aa 100644
--- a/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
+++ b/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
@@ -1,12 +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
+--- src/fingerprint/fingerprint.pro.orig        2011-03-06 17:36:13.070963361 -0500
++++ src/fingerprint/fingerprint.pro     2011-03-06 17:36:32.901964223 -0500
+@@ -23,6 +23,6 @@
+         # the difference with win32 is that windows doesn't have the f suffix
+         # but I think this may be because doug didn't compile it with single
+         # precision, and I'm not sure if that matters or not
+-        PKGCONFIG += fftw3f
++        LIBS += -lsamplerate -lfftw3f
      }
-     else{
--        CONFIG += link_pkgconfig
--        PKGCONFIG += fftw3f samplerate
-+    LIBS += -lsamplerate -lfftw3f
-     }
- }
- 
+-}
+\ No newline at end of file
++}
diff --git a/audio/liblastfm/pkg-plist b/audio/liblastfm/pkg-plist
index fa0c792511a6..305cb0ddbd84 100644
--- a/audio/liblastfm/pkg-plist
+++ b/audio/liblastfm/pkg-plist
@@ -9,10 +9,12 @@ include/lastfm/InternetConnectionMonitor
 include/lastfm/Mbid
 include/lastfm/MutableTrack
 include/lastfm/NetworkAccessManager
+include/lastfm/ParseError
 include/lastfm/Playlist
 include/lastfm/RadioStation
 include/lastfm/RadioTuner
 include/lastfm/Scrobble
+include/lastfm/ScrobbleCache
 include/lastfm/ScrobblePoint
 include/lastfm/Tag
 include/lastfm/Track
@@ -27,9 +29,9 @@ include/lastfm.h
 lib/liblastfm.so
 lib/liblastfm.so.0
 lib/liblastfm.so.0.3
-lib/liblastfm.so.0.3.0
+lib/liblastfm.so.0.3.3
 lib/liblastfm_fingerprint.so
 lib/liblastfm_fingerprint.so.0
-lib/liblastfm_fingerprint.so.0.1
-lib/liblastfm_fingerprint.so.0.1.0
+lib/liblastfm_fingerprint.so.0.3
+lib/liblastfm_fingerprint.so.0.3.3
 @dirrm include/lastfm