Index: head/audio/kid3-qt5/Makefile
===================================================================
--- head/audio/kid3-qt5/Makefile	(revision 552289)
+++ head/audio/kid3-qt5/Makefile	(revision 552290)
@@ -1,99 +1,100 @@
 # $FreeBSD$
 
 PORTNAME=	kid3
-PORTVERSION=	3.8.3
+PORTVERSION=	3.8.4
 PORTREVISION?=	0
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-${SLAVE}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Audio file tag editor
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gnome pkgconfig qt:5
 USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
 USE_QT=		core dbus gui multimedia network xml widgets \
 		buildtools_build linguisttools_build qmake_build
 
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \
 		-DWITH_LIBDIR=lib \
 		-DWITH_MANDIR=man \
 		-DWITH_PLUGINSDIR=lib/kid3 \
 		-DFFMPEG_ROOT="${LOCALBASE}" \
 		-DWITH_QML=OFF \
 		-DWITH_APPS="${KID3_APPS:S/ /;/gW}"
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION}
 
 SLAVE?=		qt5
 .if ${SLAVE} == qt5
 # Qt5
 PLIST_SUB+=	KF5="@comment " QT="" QT_SUFX="-qt"
 KID3_APPS+=	QT
 .else
 # KF5
 USES+=		kde:5
-USE_KDE+=	auth codecs config configwidgets coreaddons \
-		widgetsaddons xmlgui doctools_build ecm_build
+USE_KDE+=	auth codecs config configwidgets coreaddons kio \
+		service widgetsaddons xmlgui doctools_build ecm_build
+USE_QT+=	concurrent
 PLIST_SUB+=	KF5="" QT="@comment " QT_SUFX=""
 KID3_APPS+=	KDE
 .endif
 
 .for s in kf5 qt5
 .  if ${SLAVE} != ${s}
 CONFLICTS_INSTALL+=	kid3-${s}
 .  endif
 .endfor
 
 OPTIONS_DEFINE=		CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB TEST
 OPTIONS_DEFAULT=	CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
 ACOUSTID_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
 			libavcodec.so:multimedia/ffmpeg
 ACOUSTID_CMAKE_BOOL=	WITH_CHROMAPRINT WITH_FFMPEG
 
 CLI_DESC=		Build and install command line utility
 CLI_USES=		python:3.5+,test readline
 CLI_VARS=		KID3_APPS+=CLI
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		VORBIS
 
 MP3_LIB_DEPENDS=	libid3.so:audio/id3lib
 MP3_CMAKE_BOOL=		WITH_ID3LIB
 
 MP4_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MP4_CMAKE_BOOL=		WITH_MP4V2
 
 TAGLIB_DESC=		Various audio formats support via Taglib
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
 TEST_USE=		LOCALE=en_US.UTF-8 QT=testlib_build
 TEST_WRKSRC=		${BUILD_WRKSRC}/src/test
 TEST_VARS=		KID3_APPS+=TEST
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	WITH_VORBIS
 
 .include <bsd.port.options.mk>
 
 pre-test:
 	@${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC}
 
 do-test:
 	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ./kid3-test)
 
 do-test-CLI-on:
 	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py)
 
 .include <bsd.port.mk>
Index: head/audio/kid3-qt5/distinfo
===================================================================
--- head/audio/kid3-qt5/distinfo	(revision 552289)
+++ head/audio/kid3-qt5/distinfo	(revision 552290)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593542051
-SHA256 (kid3-3.8.3.tar.gz) = 6a1aa06d2f225f6d8a139cfd3c3d382f82170fa17196517690d28caaeb220c44
-SIZE (kid3-3.8.3.tar.gz) = 3091795
+TIMESTAMP = 1602373492
+SHA256 (kid3-3.8.4.tar.gz) = 598b843aa32ed9530ebfa9a45424579e622714447f0d67cf36a62e693277bc07
+SIZE (kid3-3.8.4.tar.gz) = 3161673
Index: head/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp
===================================================================
--- head/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp	(revision 552289)
+++ head/audio/kid3-qt5/files/patch-src_test_testjsonparser.cpp	(nonexistent)
@@ -1,14 +0,0 @@
-The QDateTime object used to create the test value contains milliseconds, so
-the test fails because the returned value did not match the expected value.
-
---- src/test/testjsonparser.cpp.orig	2018-12-21 05:40:14 UTC
-+++ src/test/testjsonparser.cpp
-@@ -103,7 +103,7 @@ void TestJsonParser::serializeAndDeserializeTypes()
- 
-   QString str = JsonParser::serialize(map);
-   QCOMPARE(str, QString(QLatin1String(
--             "{\"val00\": \"2011-08-18T14:02:07\", \"val01\": -7654321, "
-+             "{\"val00\": \"2011-08-18T14:02:07.000\", \"val01\": -7654321, "
-              "\"val02\": 1234567890123456789, "
-              "\"val03\": false, \"val04\": true, \"val05\": null, \"val06\": "
-              "\"String with \\\"'\\\\{}[]\", \"val07\": 3.141592653, "

Property changes on: head/audio/kid3-qt5/files/patch-src_test_testjsonparser.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/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp
===================================================================
--- head/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp	(revision 552289)
+++ head/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.cpp	(nonexistent)
@@ -1,34 +0,0 @@
-Fix test to reflect the current data in the MusicBrainz database.
-
---- src/test/testmusicbrainzreleaseimporter.cpp.orig	2019-08-23 09:52:05 UTC
-+++ src/test/testmusicbrainzreleaseimporter.cpp
-@@ -38,7 +38,7 @@ void TestMusicBrainzReleaseImporter::testQueryAlbums()
- {
-   queryAlbums(QLatin1String("Wizard"), QLatin1String("Odin"));
-   AlbumListModel* albumModel = m_importer->getAlbumListModel();
--  QCOMPARE(albumModel->rowCount(), 3);
-+  QCOMPARE(albumModel->rowCount(), 4);
-   QString text, category, id;
-   albumModel->getItem(0, text, category, id);
-   QCOMPARE(text, QString(QLatin1String("Wizard - Odin")));
-@@ -53,9 +53,9 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
-   QStringList titles;
-   titles << QLatin1String("The Prophecy") << QLatin1String("Betrayer")
-          << QLatin1String("Dead Hope") << QLatin1String("Dark God")
--         << QLatin1String("Loki's Punishment")
-+         << QString::fromUtf8("Loki\u2019s Punishment")
-          << QLatin1String("Beginning of the End")
--         << QLatin1String("Thor's Hammer")
-+         << QString::fromUtf8("Thor\u2019s Hammer")
-          << QLatin1String("Hall of Odin") << QLatin1String("The Powergod")
-          << QLatin1String("March of the Einheriers")
-          << QLatin1String("End of All");
-@@ -65,7 +65,7 @@ void TestMusicBrainzReleaseImporter::testQueryTracks()
-           << QLatin1String("5:08") << QLatin1String("4:01")
-           << QLatin1String("5:01") << QLatin1String("5:06")
-           << QLatin1String("5:21") << QLatin1String("5:40")
--          << QLatin1String("3:53");
-+          << QLatin1String("3:55");
-   QCOMPARE(m_trackDataModel->rowCount(), 11);
-   for (int row = 0; row < 11; ++row) {
-     QCOMPARE(m_trackDataModel->index(row, 0).data().toString(),

Property changes on: head/audio/kid3-qt5/files/patch-src_test_testmusicbrainzreleaseimporter.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/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp
===================================================================
--- head/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp	(revision 552289)
+++ head/audio/kid3-qt5/files/patch-src_app_kde_kdemainwindow.cpp	(revision 552290)
@@ -1,43 +1,45 @@
 Squash startup warnings for KF5 app.
 
 Shortcut for action  "open_directory" "O&pen Directory..." set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 Shortcut for action  "reload" "Re&load" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 Shortcut for action  "filelist_rename" "&Rename" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 Shortcut for action  "filelist_delete" "&Move to Trash" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.
 
---- src/app/kde/kdemainwindow.cpp.orig	2020-05-09 12:12:37 UTC
+--- src/app/kde/kdemainwindow.cpp.orig	2020-09-25 07:02:19 UTC
 +++ src/app/kde/kdemainwindow.cpp
-@@ -189,7 +189,7 @@ void KdeMainWindow::initActions()
+@@ -190,7 +190,7 @@ void KdeMainWindow::initActions()
    action = new QAction(QIcon::fromTheme(QLatin1String("document-open")),
                         tr("O&pen Folder..."), this);
    action->setStatusTip(tr("Opens a folder"));
 -  action->setShortcut(QKeySequence(QLatin1String("Ctrl+D")));
 +  collection->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::Key_D));
    collection->addAction(QLatin1String("open_directory"), action);
    connect(action, &QAction::triggered,
            impl(), &BaseMainWindowImpl::slotFileOpenDirectory);
-@@ -197,7 +197,7 @@ void KdeMainWindow::initActions()
-   action = new QAction(QIcon::fromTheme(QLatin1String("view-refresh")),
-                        tr("Re&load"), this);
-   action->setStatusTip(tr("Reload folder"));
--  action->setShortcut(QKeySequence::Refresh);
-+  collection->setDefaultShortcut(action, QKeySequence::Refresh);
+@@ -203,7 +203,7 @@ void KdeMainWindow::initActions()
+   // Avoid this by assigning Qt::Key_F5 instead of QKeySequence::Refresh.
+   // The section "Standard Shortcuts" in the QKeySequence documentation lists
+   // F5 as a key for "Refresh" on all platforms.
+-  action->setShortcut(Qt::Key_F5);
++  collection->setDefaultShortcut(action, QKeySequence(Qt::Key_F5));
    collection->addAction(QLatin1String("reload"), action);
    connect(action, &QAction::triggered,
            impl(), &BaseMainWindowImpl::slotFileReload);
-@@ -415,13 +415,13 @@ void KdeMainWindow::initActions()
+@@ -421,7 +421,7 @@ void KdeMainWindow::initActions()
    collection->addAction(QLatin1String("filelist_focus"), action);
    connect(action, &QAction::triggered, form(), &Kid3Form::setFocusFileList);
    action = new QAction(tr("&Rename"), this);
 -  action->setShortcut(QKeySequence(Qt::Key_F2));
 +  collection->setDefaultShortcut(action, QKeySequence(Qt::Key_F2));
    action->setShortcutContext(Qt::WidgetShortcut);
    connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::renameFile);
-   collection->addAction(QLatin1String("filelist_rename"), action);
+   // This action is not made configurable because its shortcut F2 conflicts
+@@ -430,7 +430,7 @@ void KdeMainWindow::initActions()
+   // collection->addAction(QLatin1String("filelist_rename"), action);
    form()->getFileList()->setRenameAction(action);
    action = new QAction(tr("&Move to Trash"), this);
 -  action->setShortcut(QKeySequence::Delete);
 +  collection->setDefaultShortcut(action, QKeySequence::Delete);
    action->setShortcutContext(Qt::WidgetShortcut);
    connect(action, &QAction::triggered, impl(), &BaseMainWindowImpl::deleteFile);
-   collection->addAction(QLatin1String("filelist_delete"), action);
+   // collection->addAction(QLatin1String("filelist_delete"), action);
Index: head/audio/kid3-qt5/pkg-plist
===================================================================
--- head/audio/kid3-qt5/pkg-plist	(revision 552289)
+++ head/audio/kid3-qt5/pkg-plist	(revision 552290)
@@ -1,101 +1,102 @@
 bin/kid3%%QT_SUFX%%
 %%CLI%%bin/kid3-cli
 lib/libkid3-core.so
 lib/libkid3-core.so.%%SHLIB_VER%%
 lib/libkid3-gui.so
 lib/libkid3-gui.so.%%SHLIB_VER%%
 %%ACOUSTID%%lib/kid3/libacoustidimport.so
 lib/kid3/libamazonimport.so
 lib/kid3/libdiscogsimport.so
 lib/kid3/libfreedbimport.so
 %%MP3%%lib/kid3/libid3libmetadata.so
 %%MP4%%lib/kid3/libmp4v2metadata.so
 lib/kid3/libmusicbrainzimport.so
 %%VORBIS%%lib/kid3/liboggflacmetadata.so
 %%TAGLIB%%lib/kid3/libtaglibmetadata.so
 %%CLI%%man/ca/man1/kid3-cli.1.gz
 %%QT%%man/ca/man1/kid3-qt.1.gz
 man/ca/man1/kid3.1.gz
 %%CLI%%man/de/man1/kid3-cli.1.gz
 %%QT%%man/de/man1/kid3-qt.1.gz
 man/de/man1/kid3.1.gz
 %%CLI%%man/it/man1/kid3-cli.1.gz
 %%QT%%man/it/man1/kid3-qt.1.gz
 man/it/man1/kid3.1.gz
 %%CLI%%man/man1/kid3-cli.1.gz
 %%QT%%man/man1/kid3-qt.1.gz
 man/man1/kid3.1.gz
 %%CLI%%man/nl/man1/kid3-cli.1.gz
 %%QT%%man/nl/man1/kid3-qt.1.gz
 man/nl/man1/kid3.1.gz
 %%CLI%%man/pt/man1/kid3-cli.1.gz
 %%QT%%man/pt/man1/kid3-qt.1.gz
 man/pt/man1/kid3.1.gz
 %%CLI%%man/sv/man1/kid3-cli.1.gz
 %%QT%%man/sv/man1/kid3-qt.1.gz
 man/sv/man1/kid3.1.gz
 %%CLI%%man/uk/man1/kid3-cli.1.gz
 %%QT%%man/uk/man1/kid3-qt.1.gz
 man/uk/man1/kid3.1.gz
 share/applications/org.kde.kid3%%QT_SUFX%%.desktop
 %%KF5%%share/dbus-1/interfaces/org.kde.Kid3.xml
 %%KF5%%share/doc/HTML/ca/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/ca/kid3/index.docbook
 %%KF5%%share/doc/HTML/de/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/de/kid3/index.docbook
 %%KF5%%share/doc/HTML/en/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/en/kid3/index.docbook
 %%KF5%%share/doc/HTML/it/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/it/kid3/index.docbook
 %%KF5%%share/doc/HTML/nl/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/nl/kid3/index.docbook
 %%KF5%%share/doc/HTML/pt/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/pt/kid3/index.docbook
 %%KF5%%share/doc/HTML/sv/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/sv/kid3/index.docbook
 %%KF5%%share/doc/HTML/uk/kid3/index.cache.bz2
 %%KF5%%share/doc/HTML/uk/kid3/index.docbook
 %%QT%%share/doc/kid3-qt/kid3_ca.html
 %%QT%%share/doc/kid3-qt/kid3_de.html
 %%QT%%share/doc/kid3-qt/kid3_en.html
 %%QT%%share/doc/kid3-qt/kid3_it.html
 %%QT%%share/doc/kid3-qt/kid3_nl.html
 %%QT%%share/doc/kid3-qt/kid3_pt.html
 %%QT%%share/doc/kid3-qt/kid3_sv.html
 %%QT%%share/doc/kid3-qt/kid3_uk.html
 share/icons/hicolor/128x128/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/16x16/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/48x48/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png
 %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
 %%KF5%%share/icons/hicolor/scalable/apps/kid3.svgz
 %%KF5%%share/kxmlgui5/kid3/kid3ui.rc
 %%DATADIR%%/translations/kid3_ca.qm
 %%DATADIR%%/translations/kid3_ca@valencia.qm
 %%DATADIR%%/translations/kid3_cs.qm
 %%DATADIR%%/translations/kid3_da.qm
 %%DATADIR%%/translations/kid3_de.qm
 %%DATADIR%%/translations/kid3_el.qm
 %%DATADIR%%/translations/kid3_en.qm
 %%DATADIR%%/translations/kid3_en_GB.qm
 %%DATADIR%%/translations/kid3_es.qm
 %%DATADIR%%/translations/kid3_et.qm
 %%DATADIR%%/translations/kid3_fi.qm
 %%DATADIR%%/translations/kid3_fr.qm
 %%DATADIR%%/translations/kid3_it.qm
 %%DATADIR%%/translations/kid3_ko.qm
 %%DATADIR%%/translations/kid3_nl.qm
 %%DATADIR%%/translations/kid3_pl.qm
 %%DATADIR%%/translations/kid3_pt.qm
+%%DATADIR%%/translations/kid3_pt_BR.qm
 %%DATADIR%%/translations/kid3_ru.qm
 %%DATADIR%%/translations/kid3_sr.qm
 %%DATADIR%%/translations/kid3_sr@ijekavian.qm
 %%DATADIR%%/translations/kid3_sr@ijekavianlatin.qm
 %%DATADIR%%/translations/kid3_sr@latin.qm
 %%DATADIR%%/translations/kid3_sv.qm
 %%DATADIR%%/translations/kid3_tr.qm
 %%DATADIR%%/translations/kid3_uk.qm
 %%DATADIR%%/translations/kid3_zh_CN.qm
 %%DATADIR%%/translations/kid3_zh_TW.qm
 share/metainfo/org.kde.kid3%%QT_SUFX%%.appdata.xml