Index: head/audio/cantata/Makefile
===================================================================
--- head/audio/cantata/Makefile
+++ head/audio/cantata/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		cantata
-PORTVERSION=		2.1.0
+DISTVERSION=		2.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=		audio kde
 
@@ -22,7 +22,7 @@
 			-DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE
 
 USES=			cmake:outsource cpe pkgconfig shebangfix
-SHEBANG_FILES=		dynamic/cantata-dynamic cantata-remote.cmake
+SHEBANG_FILES=		playlists/cantata-dynamic cantata-remote.cmake
 CPE_VENDOR=		craig_drummond
 USE_LDCONFIG=		yes
 
Index: head/audio/cantata/distinfo
===================================================================
--- head/audio/cantata/distinfo
+++ head/audio/cantata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501534413
-SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b
-SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024
+TIMESTAMP = 1506781584
+SHA256 (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 000f7a8561667fc8d15fad3b8bf0ada8f693a76fed0afafa166a0225cc93e9de
+SIZE (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 2955660
Index: head/audio/cantata/files/patch-devices_cddbinterface.cpp
===================================================================
--- head/audio/cantata/files/patch-devices_cddbinterface.cpp
+++ head/audio/cantata/files/patch-devices_cddbinterface.cpp
@@ -1,13 +0,0 @@
-https://github.com/CDrummond/cantata/pull/1052
-
---- devices/cddbinterface.cpp.orig	2017-07-30 19:13:05 UTC
-+++ devices/cddbinterface.cpp
-@@ -158,7 +158,7 @@ void CddbInterface::readDisc()
-                     cddb_track_t *track = cddb_track_new();
-                     if (track) {
-                         cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2));
--                        cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData());
-+                        cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1").arg(i).toUtf8().constData());
-                         cddb_track_set_artist(track, unknown.constData());
-                         cddb_disc_add_track(disc, track);
-                     }
Index: head/audio/cantata/files/patch-mpd-interface_httpstream.cpp
===================================================================
--- head/audio/cantata/files/patch-mpd-interface_httpstream.cpp
+++ head/audio/cantata/files/patch-mpd-interface_httpstream.cpp
@@ -1,14 +0,0 @@
-https://github.com/CDrummond/cantata/pull/1052
-
---- mpd-interface/httpstream.cpp.orig	2017-08-01 10:50:50 UTC
-+++ mpd-interface/httpstream.cpp
-@@ -25,7 +25,9 @@
- #include "mpdconnection.h"
- #include "mpdstatus.h"
- #include "gui/settings.h"
-+#ifndef LIBVLC_FOUND
- #include <QtMultimedia/QMediaPlayer>
-+#endif
- #include <QTimer>
- 
- static const int constPlayerCheckPeriod=250;
Index: head/audio/cantata/files/patch-mpd-interface_mpdstats.h
===================================================================
--- head/audio/cantata/files/patch-mpd-interface_mpdstats.h
+++ head/audio/cantata/files/patch-mpd-interface_mpdstats.h
@@ -1,12 +0,0 @@
-https://github.com/CDrummond/cantata/pull/1052
-
---- mpd-interface/mpdstats.h.orig	2017-07-30 19:13:05 UTC
-+++ mpd-interface/mpdstats.h
-@@ -27,6 +27,7 @@
- #ifndef MPD_STATS_H
- #define MPD_STATS_H
- 
-+#include <ctime>
- #include <QDateTime>
- #include <QObject>
-