7 files changed, 81 insertions, 133 deletions

diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index d4afc7dfe5ee..cd9af89e08eb 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -1,46 +1,54 @@
-# New ports collection makefile for:	liblastfm
-# Date created:				Jun 7 2009
-# Whom:					Matt Tosto <datahead4@gmail.com>
-#
+# Created by: Matt Tosto <datahead4@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	liblastfm
-PORTVERSION=	0.3.3
-PORTREVISION=	4
+PORTVERSION=	1.0.6
+#PORTREVISION=	0
 CATEGORIES=	audio
-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
-
-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float
-
-USE_CSTD=	gnu89
-USE_RUBY=	yes
-USE_GMAKE=	yes
-USE_QT4=	corelib xml network sql gui qtestlib \
-		qmake_build moc_build rcc_build uic_build
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	-release --prefix ${PREFIX}
-MAKE_JOBS_UNSAFE=	yes
+COMMENT=	Qt C++ library for the Last.fm webservices
 
-USE_LDCONFIG=	yes
+LICENSE=	GPLv3
 
-WRKSRC=		${WRKDIR}/mxcl-liblastfm-1c739eb
+LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
+		fftw3f:${PORTSDIR}/math/fftw3-float \
+		samplerate:${PORTSDIR}/audio/libsamplerate
 
-.include <bsd.port.pre.mk>
-post-extract:
-	${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}|'
+CMAKE_ARGS=	-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
 
-.include <bsd.port.post.mk>
+GH_ACCOUNT=	lastfm
+GH_COMMIT=	5826fe6
+GH_PROJECT=	liblastfm
+GH_TAGNAME=	${PORTVERSION}
+
+MAKE_JOBS_UNSAFE=	yes
+
+OPTIONS_DEFINE=		FINGERPRINT TESTS
+FINGERPRINT_DESC=	Build the lastfm-fingerprint library
+TESTS_DESC=		Build liblastfm tests
+OPTIONS_DEFAULT=	FINGERPRINT
+
+USE_CMAKE=	yes
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
+USE_QT4=	dbus moc_build rcc_build network qmake_build qtestlib sql xml
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFINGERPRINT}
+CMAKE_ARGS+=	-DBUILD_FINGERPRINT:BOOL=ON
+PLIST_SUB+=	FINGERPRINT=""
+.else
+CMAKE_ARGS+=	-DBUILD_FINGERPRINT:BOOL=OFF
+PLIST_SUB+=	FINGERPRINT="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MTESTS}
+CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=ON
+.else
+CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=OFF
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/liblastfm/distinfo b/audio/liblastfm/distinfo
index 435cf65d7216..6463f4da2532 100644
--- a/audio/liblastfm/distinfo
+++ b/audio/liblastfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c
-SIZE (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700
+SHA256 (liblastfm-1.0.6.tar.gz) = 3b7c92338b956573fa0832cb980a24762156f39406e2efeceb4af702137ab98e
+SIZE (liblastfm-1.0.6.tar.gz) = 119595
diff --git a/audio/liblastfm/files/patch-no-ftools b/audio/liblastfm/files/patch-no-ftools
deleted file mode 100644
index 3488045085c4..000000000000
--- a/audio/liblastfm/files/patch-no-ftools
+++ /dev/null
@@ -1,36 +0,0 @@
---- admin/findsrc.rb.orig	2010-09-19 10:35:34.783333338 +0200
-+++ admin/findsrc.rb	2010-09-19 10:35:57.730000003 +0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/ruby
- require 'find'
--require "#{File.dirname __FILE__}/platform"
-+require "#{Dir.getwd}/admin/platform.rb"
- 
- def findsrc dir='.'
-   excludes = ['.svn','.git','_include','tests','_build']
---- admin/qpp.orig	2010-09-19 10:36:09.276666670 +0200
-+++ admin/qpp	2010-09-19 10:36:16.926666670 +0200
-@@ -2,9 +2,8 @@
- # Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and
- # RESOURCES under each argument to ARGV as directories
- 
--cwd=File.dirname __FILE__
- require 'find'
--require "#{cwd}/findsrc"
-+require "#{Dir.getwd}/admin/findsrc.rb"
- 
- sources = Array.new
- headers = Array.new
---- admin/Makefile.rb.orig	2010-09-19 10:35:38.086666671 +0200
-+++ admin/Makefile.rb	2010-09-19 10:36:05.816666671 +0200
-@@ -4,9 +4,8 @@
- # and then creates the directory _include and creates files named after the 
- # class names in there which #include the file that contains the class
- 
--cwd = File.dirname( __FILE__ )
- require 'find'
--require "#{cwd}/platform.rb"
-+require "#{Dir.getwd}/admin/platform.rb"
- 
- 
- ######################################################################### defs
diff --git a/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro b/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
deleted file mode 100644
index 614c82f4b2aa..000000000000
--- a/audio/liblastfm/files/patch-src_fingerprint_fingerprint.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-     }
--}
-\ No newline at end of file
-+}
diff --git a/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h b/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h
deleted file mode 100644
index 1c7c8d49b49e..000000000000
--- a/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_fingerprint_fplib_FloatingAverage.h,v 1.1 2012/04/17 17:39:47 joerg Exp $
-
---- src/fingerprint/fplib/FloatingAverage.h.orig	2012-04-17 15:10:50.000000000 +0000
-+++ src/fingerprint/fplib/FloatingAverage.h
-@@ -76,7 +76,7 @@ public:
-    {
-       T real_sum = 0;
-       const T* pCircularBuffer = m_values.get_buffer();
--      for ( int i = 0; i < size; ++i )
-+      for ( int i = 0; i < size(); ++i )
-          real_sum += pCircularBuffer[i];
-       return abs(real_sum - m_sum) / this->size();
-    }
diff --git a/audio/liblastfm/pkg-descr b/audio/liblastfm/pkg-descr
index 53db1bffd840..41387c08eea3 100644
--- a/audio/liblastfm/pkg-descr
+++ b/audio/liblastfm/pkg-descr
@@ -1,4 +1,5 @@
 liblastfm is a collection of libraries to help you integrate Last.fm services
-into your rich desktop software. It depends on Qt 4.4.
+into your rich desktop software. It is officially supported software developed
+by Last.fm staff.
 
-WWW: http://github.com/mxcl/liblastfm/tree/master
+WWW: http://github.com/lastfm/liblastfm
diff --git a/audio/liblastfm/pkg-plist b/audio/liblastfm/pkg-plist
index 305cb0ddbd84..728a3b9281ef 100644
--- a/audio/liblastfm/pkg-plist
+++ b/audio/liblastfm/pkg-plist
@@ -1,37 +1,37 @@
-include/lastfm/Album
-include/lastfm/Artist
-include/lastfm/Audioscrobbler
-include/lastfm/AuthenticatedUser
-include/lastfm/Fingerprint
-include/lastfm/FingerprintId
-include/lastfm/FingerprintableSource
-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
-include/lastfm/UrlBuilder
-include/lastfm/User
-include/lastfm/XmlQuery
-include/lastfm/Xspf
+@comment $FreeBSD$
+include/lastfm/AbstractType.h
+include/lastfm/Album.h
+include/lastfm/Artist.h
+include/lastfm/Audioscrobbler.h
+include/lastfm/Auth.h
+include/lastfm/Chart.h
+%%FINGERPRINT%%include/lastfm/Fingerprint.h
+include/lastfm/FingerprintId.h
+%%FINGERPRINT%%include/lastfm/FingerprintableSource.h
+include/lastfm/InternetConnectionMonitor.h
+include/lastfm/Library.h
+include/lastfm/Mbid.h
+include/lastfm/NetworkAccessManager.h
+include/lastfm/NetworkConnectionMonitor.h
+include/lastfm/Playlist.h
+include/lastfm/RadioStation.h
+include/lastfm/RadioTuner.h
+include/lastfm/ScrobbleCache.h
+include/lastfm/ScrobblePoint.h
+include/lastfm/Tag.h
+include/lastfm/Tasteometer.h
+include/lastfm/Track.h
+include/lastfm/UrlBuilder.h
+include/lastfm/User.h
+include/lastfm/XmlQuery.h
+include/lastfm/Xspf.h
 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.3
-lib/liblastfm.so.0.3.3
-lib/liblastfm_fingerprint.so
-lib/liblastfm_fingerprint.so.0
-lib/liblastfm_fingerprint.so.0.3
-lib/liblastfm_fingerprint.so.0.3.3
+lib/liblastfm.so.1
+lib/liblastfm.so.1.0.6
+%%FINGERPRINT%%lib/liblastfm_fingerprint.so
+%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1
+%%FINGERPRINT%%lib/liblastfm_fingerprint.so.1.0.6
 @dirrm include/lastfm