Index: Makefile
===================================================================
--- Makefile	(revision 355264)
+++ Makefile	(working copy)
@@ -2,12 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	clementine
-PORTVERSION=	1.2.1
-PORTREVISION=	7
+PORTVERSION=	1.2.3
 CATEGORIES=	audio
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	GH
 PKGNAMESUFFIX=	-player
 
+USE_GITHUB=	yes
+DISTFILES=	${PORTVERSION}.tar.gz
+GH_ACCOUNT=	${PORTNAME}${PKGNAMESUFFIX}
+GH_PROJECT=	Clementine
+GH_TAGNAME=	${PORTVERSION}
+GH_COMMIT=	${GH_TAGNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${GH_PROJECT}-c189ee5
+
 MAINTAINER=	sbruno@FreeBSD.org
 COMMENT=	Cross-platform music player based on Amarok 1.4
 
@@ -19,7 +26,8 @@
 		libprotobuf.so:${PORTSDIR}/devel/protobuf \
  	 	libqca.so:${PORTSDIR}/devel/qca \
 		libqjson.so:${PORTSDIR}/devel/qjson \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libechonest.so:${PORTSDIR}/audio/libechonest
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
Index: distinfo
===================================================================
--- distinfo	(revision 355264)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (clementine-1.2.1.tar.gz) = db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e
-SIZE (clementine-1.2.1.tar.gz) = 9274351
+SHA256 (1.2.3.tar.gz) = b7e4813b54f2cb586e80c27945240c11d884082459248e87b7359689a0f0dffb
+SIZE (1.2.3.tar.gz) = 9075813
Index: files/patch-ext__libclementine-common__core__closure.cpp
===================================================================
--- files/patch-ext__libclementine-common__core__closure.cpp	(revision 355264)
+++ files/patch-ext__libclementine-common__core__closure.cpp	(working copy)
@@ -1,20 +0,0 @@
---- ./ext/libclementine-common/core/closure.cpp.orig	2013-11-24 15:58:51.321696435 -0800
-+++ ./ext/libclementine-common/core/closure.cpp	2013-11-24 15:59:00.552695416 -0800
-@@ -33,7 +33,7 @@
- CallbackClosure::CallbackClosure(
-     QObject* sender,
-     const char* signal,
--    std::tr1::function<void()> callback)
-+    std::function<void()> callback)
-   : ClosureBase(new ObjectHelper(sender, signal, this)),
-     callback_(callback) {
- }
-@@ -67,7 +67,7 @@
- _detail::ClosureBase* NewClosure(
-     QObject* sender,
-     const char* signal,
--    std::tr1::function<void()> callback) {
-+    std::function<void()> callback) {
-   return new _detail::CallbackClosure(
-       sender, signal, callback);
- }
Index: files/patch-ext__libclementine-common__core__closure.h
===================================================================
--- files/patch-ext__libclementine-common__core__closure.h	(revision 355264)
+++ files/patch-ext__libclementine-common__core__closure.h	(working copy)
@@ -1,42 +0,0 @@
---- ./ext/libclementine-common/core/closure.h.orig	2013-11-24 15:58:19.241698287 -0800
-+++ ./ext/libclementine-common/core/closure.h	2013-11-24 15:58:38.634697259 -0800
-@@ -18,7 +18,7 @@
- #ifndef CLOSURE_H
- #define CLOSURE_H
- 
--#include <tr1/functional>
-+#include <functional>
- 
- #include <QMetaMethod>
- #include <QObject>
-@@ -158,12 +158,12 @@
-   CallbackClosure(
-       QObject* sender,
-       const char* signal,
--      std::tr1::function<void()> callback);
-+      std::function<void()> callback);
- 
-   virtual void Invoke();
- 
-  private:
--  std::tr1::function<void()> callback_;
-+  std::function<void()> callback_;
- };
- 
- }  // namespace _detail
-@@ -194,13 +194,13 @@
- _detail::ClosureBase* NewClosure(
-     QObject* sender,
-     const char* signal,
--    std::tr1::function<void()> callback);
-+    std::function<void()> callback);
- 
- template <typename... Args>
- _detail::ClosureBase* NewClosure(
-     QObject* sender,
-     const char* signal,
--    std::tr1::function<void(Args...)> callback,
-+    std::function<void(Args...)> callback,
-     const Args&... args) {
-   return NewClosure(sender, signal, boost::bind(callback, args...));
- }
Index: files/patch-src__library_groupbydialog.h
===================================================================
--- files/patch-src__library_groupbydialog.h	(revision 0)
+++ files/patch-src__library_groupbydialog.h	(working copy)
@@ -0,0 +1,11 @@
+--- ./src/library/groupbydialog.h.orig	2014-05-25 10:38:37.378768447 -0700
++++ ./src/library/groupbydialog.h	2014-05-25 10:39:12.641759778 -0700
+@@ -22,6 +22,8 @@
+ 
+ #include <memory>
+ 
++#include <functional>
++
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+ 

Property changes on: files/patch-src__library_groupbydialog.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__playlistparsers__plsparser.cpp
===================================================================
--- files/patch-src__playlistparsers__plsparser.cpp	(revision 355264)
+++ files/patch-src__playlistparsers__plsparser.cpp	(working copy)
@@ -1,11 +0,0 @@
---- ./src/playlistparsers/plsparser.cpp.orig	2013-11-24 16:01:13.247686715 -0800
-+++ ./src/playlistparsers/plsparser.cpp	2013-11-24 16:03:24.812677689 -0800
-@@ -46,7 +46,7 @@
-       // Use the title and length we've already loaded if any
-       if (!songs[n].title().isEmpty())
-         song.set_title(songs[n].title());
--      if (!songs[n].length_nanosec() != -1)
-+      if (songs[n].length_nanosec() != -1)
-         song.set_length_nanosec(songs[n].length_nanosec());
- 
-       songs[n] = song;