Index: head/multimedia/minitube/Makefile
===================================================================
--- head/multimedia/minitube/Makefile	(revision 544632)
+++ head/multimedia/minitube/Makefile	(revision 544633)
@@ -1,38 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	minitube
-DISTVERSION=	2.9
-PORTREVISION=	5
+DISTVERSION=	3.5
 CATEGORIES=	multimedia www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TV-like client for YouTube
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libmpv.so:multimedia/mpv
+
 USES=		compiler:c++11-lang gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	flaviotordini
+GH_TUPLE=	flaviotordini:http:92fd16a:http/lib/http \
+		flaviotordini:idle:6aa092d:idle/lib/idle \
+		flaviotordini:media:0d07cad:media/lib/media
 USE_GL=		gl
-USE_QT=		core dbus declarative gui network phonon4 script sql widgets \
-		buildtools_build imageformats_run sql-sqlite3_run
+USE_QT=		core dbus declarative gui network script sql widgets \
+		buildtools_build imageformats_run sql-sqlite3_run \
+		x11extras
+
 QMAKE_ARGS=	QMAKE_LRELEASE=${LRELEASE} \
 		DEFINES+=APP_GOOGLE_API_KEY="${MINITUBE_GOOGLE_API_KEY}"
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	qt:5
 NLS_USE=	QT=linguisttools_build
 
 post-patch:
 # Remove BOM
 	@${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
 		${WRKSRC}/src/aggregatevideosource.cpp
-	@${REINPLACE_CMD} -e 's|/usr/include|/usr/local/include|g' \
-		${WRKSRC}/minitube.pro
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${WRKSRC}/minitube.pro
 
 .include <bsd.port.mk>
Index: head/multimedia/minitube/distinfo
===================================================================
--- head/multimedia/minitube/distinfo	(revision 544632)
+++ head/multimedia/minitube/distinfo	(revision 544633)
@@ -1,3 +1,9 @@
-TIMESTAMP = 1518753952
-SHA256 (flaviotordini-minitube-2.9_GH0.tar.gz) = 0f51fb86d0fdfbcf00af142868ceeacb6c27eb8a1e36d856162e23d63e90eb07
-SIZE (flaviotordini-minitube-2.9_GH0.tar.gz) = 1000060
+TIMESTAMP = 1597081657
+SHA256 (flaviotordini-minitube-3.5_GH0.tar.gz) = 1867e3f2132029dd48f293886f80eb029ae3bc970a6d70c67a170091678777c0
+SIZE (flaviotordini-minitube-3.5_GH0.tar.gz) = 1256189
+SHA256 (flaviotordini-http-92fd16a_GH0.tar.gz) = 3af66d8584766f65db697e55ace4b8667ecc918b72ae0ec3cf4d968c690f118d
+SIZE (flaviotordini-http-92fd16a_GH0.tar.gz) = 10253
+SHA256 (flaviotordini-idle-6aa092d_GH0.tar.gz) = 9aa3ac940f900d8b6924492905ff1351e9af6224fdcb2d1b6e5a55af920c81eb
+SIZE (flaviotordini-idle-6aa092d_GH0.tar.gz) = 1675
+SHA256 (flaviotordini-media-0d07cad_GH0.tar.gz) = 59500c9ddba3718c6d2c6385c3b40b07eaf0810131d22aac0f071790fcb30af5
+SIZE (flaviotordini-media-0d07cad_GH0.tar.gz) = 24967
Index: head/multimedia/minitube/files/patch-src_ytregions.cpp
===================================================================
--- head/multimedia/minitube/files/patch-src_ytregions.cpp	(revision 544632)
+++ head/multimedia/minitube/files/patch-src_ytregions.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- src/ytregions.cpp.orig	2018-02-16 08:18:19 UTC
-+++ src/ytregions.cpp
-@@ -84,7 +84,7 @@ YTRegion YTRegions::r(const QString &nam
- }
- 
- const YTRegion &YTRegions::localRegion() {
--    static const YTRegion region = [] {
-+    static const YTRegion region = []() -> const YTRegion { // workaround for https://github.com/flaviotordini/minitube/issues/99
-         QString country = QLocale::system().name().right(2);
-         for (const YTRegion &r : list()) {
-             if (r.id == country) return r;

Property changes on: head/multimedia/minitube/files/patch-src_ytregions.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/minitube/files/patch-minitube.pro
===================================================================
--- head/multimedia/minitube/files/patch-minitube.pro	(nonexistent)
+++ head/multimedia/minitube/files/patch-minitube.pro	(revision 544633)
@@ -0,0 +1,11 @@
+--- minitube.pro.orig	2020-08-10 17:56:42 UTC
++++ minitube.pro
+@@ -43,6 +43,8 @@ include(lib/media/media.pri)
+ include(src/qtsingleapplication/qtsingleapplication.pri)
+ include(src/invidious/invidious.pri)
+ 
++INCLUDEPATH += $$PWD/src
++
+ HEADERS += src/video.h \
+     src/messagebar.h \
+     src/spacer.h \

Property changes on: head/multimedia/minitube/files/patch-minitube.pro
___________________________________________________________________
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
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/minitube/pkg-message
===================================================================
--- head/multimedia/minitube/pkg-message	(revision 544632)
+++ head/multimedia/minitube/pkg-message	(revision 544633)
@@ -1,27 +1,22 @@
 [
 { type: install
   message: <<EOM
 Google is now requiring an API key in order to access YouTube Data
 web services.
 
 To obtain a key:
 
 1. Create a new project at https://console.developers.google.com/
 
 2. Select newly created project and go to Enable API,
    go to APIs & auth / APIs, select the Youtube Data API
    and click Enable.
 
 3. Go to Credentials, click Create Credentials and choose API key.
 
 4. If you are going to build minitube from ports, set
    MINITUBE_GOOGLE_API_KEY=your_key in make.conf. If you use package
    set GOOGLE_API_KEY environment variable to your key.
-
-Make sure you also have a Phonon backend installed:
-multimedia/phonon-gstreamer
--or-
-multimedia/phonon-vlc
 EOM
 }
 ]
Index: head/multimedia/minitube/pkg-plist
===================================================================
--- head/multimedia/minitube/pkg-plist	(revision 544632)
+++ head/multimedia/minitube/pkg-plist	(revision 544633)
@@ -1,61 +1,64 @@
 bin/minitube
 share/appdata/minitube.appdata.xml
 share/applications/minitube.desktop
 share/icons/hicolor/128x128/apps/minitube.png
 share/icons/hicolor/16x16/apps/minitube.png
 share/icons/hicolor/22x22/apps/minitube.png
 share/icons/hicolor/256x256/apps/minitube.png
 share/icons/hicolor/32x32/apps/minitube.png
 share/icons/hicolor/48x48/apps/minitube.png
 share/icons/hicolor/512x512/apps/minitube.png
 share/icons/hicolor/64x64/apps/minitube.png
 share/icons/hicolor/scalable/apps/minitube.svg
 %%NLS%%%%DATADIR%%/locale/ar.qm
 %%NLS%%%%DATADIR%%/locale/ast.qm
 %%NLS%%%%DATADIR%%/locale/be.qm
 %%NLS%%%%DATADIR%%/locale/bg_BG.qm
 %%NLS%%%%DATADIR%%/locale/ca.qm
 %%NLS%%%%DATADIR%%/locale/ca_ES.qm
 %%NLS%%%%DATADIR%%/locale/cs_CZ.qm
 %%NLS%%%%DATADIR%%/locale/da.qm
 %%NLS%%%%DATADIR%%/locale/de_DE.qm
 %%NLS%%%%DATADIR%%/locale/el.qm
 %%NLS%%%%DATADIR%%/locale/en.qm
+%%NLS%%%%DATADIR%%/locale/en_GB.qm
 %%NLS%%%%DATADIR%%/locale/es.qm
 %%NLS%%%%DATADIR%%/locale/es_AR.qm
 %%NLS%%%%DATADIR%%/locale/es_ES.qm
 %%NLS%%%%DATADIR%%/locale/es_MX.qm
 %%NLS%%%%DATADIR%%/locale/fi.qm
 %%NLS%%%%DATADIR%%/locale/fi_FI.qm
 %%NLS%%%%DATADIR%%/locale/fr.qm
 %%NLS%%%%DATADIR%%/locale/gl.qm
 %%NLS%%%%DATADIR%%/locale/he_IL.qm
 %%NLS%%%%DATADIR%%/locale/hr.qm
 %%NLS%%%%DATADIR%%/locale/hu.qm
 %%NLS%%%%DATADIR%%/locale/id.qm
 %%NLS%%%%DATADIR%%/locale/it.qm
 %%NLS%%%%DATADIR%%/locale/ja_JP.qm
 %%NLS%%%%DATADIR%%/locale/ko_KR.qm
 %%NLS%%%%DATADIR%%/locale/ky.qm
 %%NLS%%%%DATADIR%%/locale/ms_MY.qm
 %%NLS%%%%DATADIR%%/locale/nb.qm
 %%NLS%%%%DATADIR%%/locale/nl.qm
 %%NLS%%%%DATADIR%%/locale/nn.qm
 %%NLS%%%%DATADIR%%/locale/pl.qm
 %%NLS%%%%DATADIR%%/locale/pl_PL.qm
 %%NLS%%%%DATADIR%%/locale/pt.qm
 %%NLS%%%%DATADIR%%/locale/pt_BR.qm
+%%NLS%%%%DATADIR%%/locale/pt_PT.qm
 %%NLS%%%%DATADIR%%/locale/ro.qm
 %%NLS%%%%DATADIR%%/locale/ru.qm
 %%NLS%%%%DATADIR%%/locale/sk.qm
 %%NLS%%%%DATADIR%%/locale/sl.qm
 %%NLS%%%%DATADIR%%/locale/sq.qm
 %%NLS%%%%DATADIR%%/locale/sr.qm
 %%NLS%%%%DATADIR%%/locale/sv_SE.qm
 %%NLS%%%%DATADIR%%/locale/th.qm
 %%NLS%%%%DATADIR%%/locale/tr.qm
 %%NLS%%%%DATADIR%%/locale/uk.qm
 %%NLS%%%%DATADIR%%/locale/uk_UA.qm
 %%NLS%%%%DATADIR%%/locale/vi.qm
 %%NLS%%%%DATADIR%%/locale/zh_CN.qm
 %%NLS%%%%DATADIR%%/locale/zh_TW.qm
+%%DATADIR%%/sounds/snapshot.wav