Update Qt5-based Matrix clients

 - libqmatrixclient is undergoing a name-change, to libQuotient.
   Anticipate that a little.
 - libqmatrixclient installed a ${LOCALBASE}/include/util.h which
   is awfully generic; move the includes into include/Quotient
   (again, in advance of the completion of the renaming).
   Reported by Jan Henrik Sylvester.
 - quaternion just has a minor release with several-times-rerolled
   AppImage support (which isn't relevant for us).
 - spectral has had several more tags done, but no official releases.
   The tags are build-numbers, really, so PORTVERSION=603 means
   build 603, and can be interpreted as 0.0.0.603 until there's
   a real release. This does mean that we'll hit a PORTEPOCH once
   such a release happens, when PORTVERSION drops back down to
   0.0.1 (or whatever).
 - spectral doesn't update to the latest tag (648) because that
   requires an unreleased libQuotient version (not an issue if you
   build from source with git submodules, but problematic in
   packaging).

8 files changed, 130 insertions, 128 deletions

diff --git a/net-im/libqmatrixclient/Makefile b/net-im/libqmatrixclient/Makefile
index 864c6353fb22..5a5f68d6ac56 100644
--- a/net-im/libqmatrixclient/Makefile
+++ b/net-im/libqmatrixclient/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libqmatrixclient
-DISTVERSION=	0.5.1.2
+DISTVERSION=	0.5.2
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
@@ -15,6 +15,9 @@ USE_QT=	core gui multimedia network \
 	buildtools_build qmake_build
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	QMatrixClient
+GH_ACCOUNT=	quotient-im
+GH_PROJECT=	libQuotient
+
+CMAKE_ARGS=	-DCMAKE_INSTALL_INCLUDEDIR=include/Quotient
 
 .include <bsd.port.mk>
diff --git a/net-im/libqmatrixclient/distinfo b/net-im/libqmatrixclient/distinfo
index 609c3aa2bcef..6a7a0142984c 100644
--- a/net-im/libqmatrixclient/distinfo
+++ b/net-im/libqmatrixclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555612770
-SHA256 (QMatrixClient-libqmatrixclient-0.5.1.2_GH0.tar.gz) = c5de2aaef010a1d4d1d81c711bc983366d41c482487c828db3f0e6fa7a6e050d
-SIZE (QMatrixClient-libqmatrixclient-0.5.1.2_GH0.tar.gz) = 520003
+TIMESTAMP = 1559827129
+SHA256 (quotient-im-libQuotient-0.5.2_GH0.tar.gz) = 1848bc0af53ce42c2b1a1a4fdeccb054af1f9e0f765cadf609f62727ce23dfd2
+SIZE (quotient-im-libQuotient-0.5.2_GH0.tar.gz) = 520642
diff --git a/net-im/libqmatrixclient/pkg-plist b/net-im/libqmatrixclient/pkg-plist
index 078154209c7a..a821d1d46f7a 100644
--- a/net-im/libqmatrixclient/pkg-plist
+++ b/net-im/libqmatrixclient/pkg-plist
@@ -1,115 +1,115 @@
 bin/qmc-example
-include/application-service/definitions/location.h
-include/application-service/definitions/protocol.h
-include/application-service/definitions/user.h
-include/avatar.h
-include/connection.h
-include/connectiondata.h
-include/converters.h
-include/csapi/account-data.h
-include/csapi/admin.h
-include/csapi/administrative_contact.h
-include/csapi/appservice_room_directory.h
-include/csapi/banning.h
-include/csapi/capabilities.h
-include/csapi/content-repo.h
-include/csapi/create_room.h
-include/csapi/definitions/auth_data.h
-include/csapi/definitions/client_device.h
-include/csapi/definitions/device_keys.h
-include/csapi/definitions/event_filter.h
-include/csapi/definitions/public_rooms_response.h
-include/csapi/definitions/push_condition.h
-include/csapi/definitions/push_rule.h
-include/csapi/definitions/push_ruleset.h
-include/csapi/definitions/room_event_filter.h
-include/csapi/definitions/sync_filter.h
-include/csapi/definitions/user_identifier.h
-include/csapi/definitions/wellknown/full.h
-include/csapi/definitions/wellknown/homeserver.h
-include/csapi/definitions/wellknown/identity_server.h
-include/csapi/device_management.h
-include/csapi/directory.h
-include/csapi/event_context.h
-include/csapi/filter.h
-include/csapi/inviting.h
-include/csapi/joining.h
-include/csapi/keys.h
-include/csapi/kicking.h
-include/csapi/leaving.h
-include/csapi/list_joined_rooms.h
-include/csapi/list_public_rooms.h
-include/csapi/login.h
-include/csapi/logout.h
-include/csapi/message_pagination.h
-include/csapi/notifications.h
-include/csapi/openid.h
-include/csapi/peeking_events.h
-include/csapi/presence.h
-include/csapi/profile.h
-include/csapi/pusher.h
-include/csapi/pushrules.h
-include/csapi/read_markers.h
-include/csapi/receipts.h
-include/csapi/redaction.h
-include/csapi/registration.h
-include/csapi/report_content.h
-include/csapi/room_send.h
-include/csapi/room_state.h
-include/csapi/room_upgrades.h
-include/csapi/rooms.h
-include/csapi/search.h
-include/csapi/sso_login_redirect.h
-include/csapi/tags.h
-include/csapi/third_party_lookup.h
-include/csapi/third_party_membership.h
-include/csapi/to_device.h
-include/csapi/typing.h
-include/csapi/users.h
-include/csapi/versions.h
-include/csapi/voip.h
-include/csapi/wellknown.h
-include/csapi/whoami.h
-include/eventitem.h
-include/events/accountdataevents.h
-include/events/callanswerevent.h
-include/events/callcandidatesevent.h
-include/events/callhangupevent.h
-include/events/callinviteevent.h
-include/events/directchatevent.h
-include/events/event.h
-include/events/eventcontent.h
-include/events/eventloader.h
-include/events/receiptevent.h
-include/events/redactionevent.h
-include/events/roomavatarevent.h
-include/events/roomcreateevent.h
-include/events/roomevent.h
-include/events/roommemberevent.h
-include/events/roommessageevent.h
-include/events/roomtombstoneevent.h
-include/events/simplestateevents.h
-include/events/stateevent.h
-include/events/typingevent.h
-include/identity/definitions/request_email_validation.h
-include/identity/definitions/request_msisdn_validation.h
-include/identity/definitions/sid.h
-include/jobs/basejob.h
-include/jobs/downloadfilejob.h
-include/jobs/mediathumbnailjob.h
-include/jobs/postreadmarkersjob.h
-include/jobs/requestdata.h
-include/jobs/syncjob.h
-include/joinstate.h
-include/logging.h
-include/networkaccessmanager.h
-include/networksettings.h
-include/qt_connection_util.h
-include/room.h
-include/settings.h
-include/syncdata.h
-include/user.h
-include/util.h
+include/Quotient/application-service/definitions/location.h
+include/Quotient/application-service/definitions/protocol.h
+include/Quotient/application-service/definitions/user.h
+include/Quotient/avatar.h
+include/Quotient/connection.h
+include/Quotient/connectiondata.h
+include/Quotient/converters.h
+include/Quotient/csapi/account-data.h
+include/Quotient/csapi/admin.h
+include/Quotient/csapi/administrative_contact.h
+include/Quotient/csapi/appservice_room_directory.h
+include/Quotient/csapi/banning.h
+include/Quotient/csapi/capabilities.h
+include/Quotient/csapi/content-repo.h
+include/Quotient/csapi/create_room.h
+include/Quotient/csapi/definitions/auth_data.h
+include/Quotient/csapi/definitions/client_device.h
+include/Quotient/csapi/definitions/device_keys.h
+include/Quotient/csapi/definitions/event_filter.h
+include/Quotient/csapi/definitions/public_rooms_response.h
+include/Quotient/csapi/definitions/push_condition.h
+include/Quotient/csapi/definitions/push_rule.h
+include/Quotient/csapi/definitions/push_ruleset.h
+include/Quotient/csapi/definitions/room_event_filter.h
+include/Quotient/csapi/definitions/sync_filter.h
+include/Quotient/csapi/definitions/user_identifier.h
+include/Quotient/csapi/definitions/wellknown/full.h
+include/Quotient/csapi/definitions/wellknown/homeserver.h
+include/Quotient/csapi/definitions/wellknown/identity_server.h
+include/Quotient/csapi/device_management.h
+include/Quotient/csapi/directory.h
+include/Quotient/csapi/event_context.h
+include/Quotient/csapi/filter.h
+include/Quotient/csapi/inviting.h
+include/Quotient/csapi/joining.h
+include/Quotient/csapi/keys.h
+include/Quotient/csapi/kicking.h
+include/Quotient/csapi/leaving.h
+include/Quotient/csapi/list_joined_rooms.h
+include/Quotient/csapi/list_public_rooms.h
+include/Quotient/csapi/login.h
+include/Quotient/csapi/logout.h
+include/Quotient/csapi/message_pagination.h
+include/Quotient/csapi/notifications.h
+include/Quotient/csapi/openid.h
+include/Quotient/csapi/peeking_events.h
+include/Quotient/csapi/presence.h
+include/Quotient/csapi/profile.h
+include/Quotient/csapi/pusher.h
+include/Quotient/csapi/pushrules.h
+include/Quotient/csapi/read_markers.h
+include/Quotient/csapi/receipts.h
+include/Quotient/csapi/redaction.h
+include/Quotient/csapi/registration.h
+include/Quotient/csapi/report_content.h
+include/Quotient/csapi/room_send.h
+include/Quotient/csapi/room_state.h
+include/Quotient/csapi/room_upgrades.h
+include/Quotient/csapi/rooms.h
+include/Quotient/csapi/search.h
+include/Quotient/csapi/sso_login_redirect.h
+include/Quotient/csapi/tags.h
+include/Quotient/csapi/third_party_lookup.h
+include/Quotient/csapi/third_party_membership.h
+include/Quotient/csapi/to_device.h
+include/Quotient/csapi/typing.h
+include/Quotient/csapi/users.h
+include/Quotient/csapi/versions.h
+include/Quotient/csapi/voip.h
+include/Quotient/csapi/wellknown.h
+include/Quotient/csapi/whoami.h
+include/Quotient/eventitem.h
+include/Quotient/events/accountdataevents.h
+include/Quotient/events/callanswerevent.h
+include/Quotient/events/callcandidatesevent.h
+include/Quotient/events/callhangupevent.h
+include/Quotient/events/callinviteevent.h
+include/Quotient/events/directchatevent.h
+include/Quotient/events/event.h
+include/Quotient/events/eventcontent.h
+include/Quotient/events/eventloader.h
+include/Quotient/events/receiptevent.h
+include/Quotient/events/redactionevent.h
+include/Quotient/events/roomavatarevent.h
+include/Quotient/events/roomcreateevent.h
+include/Quotient/events/roomevent.h
+include/Quotient/events/roommemberevent.h
+include/Quotient/events/roommessageevent.h
+include/Quotient/events/roomtombstoneevent.h
+include/Quotient/events/simplestateevents.h
+include/Quotient/events/stateevent.h
+include/Quotient/events/typingevent.h
+include/Quotient/identity/definitions/request_email_validation.h
+include/Quotient/identity/definitions/request_msisdn_validation.h
+include/Quotient/identity/definitions/sid.h
+include/Quotient/jobs/basejob.h
+include/Quotient/jobs/downloadfilejob.h
+include/Quotient/jobs/mediathumbnailjob.h
+include/Quotient/jobs/postreadmarkersjob.h
+include/Quotient/jobs/requestdata.h
+include/Quotient/jobs/syncjob.h
+include/Quotient/joinstate.h
+include/Quotient/logging.h
+include/Quotient/networkaccessmanager.h
+include/Quotient/networksettings.h
+include/Quotient/qt_connection_util.h
+include/Quotient/room.h
+include/Quotient/settings.h
+include/Quotient/syncdata.h
+include/Quotient/user.h
+include/Quotient/util.h
 lib/cmake/QMatrixClient/QMatrixClientConfig.cmake
 lib/cmake/QMatrixClient/QMatrixClientConfigVersion.cmake
 lib/cmake/QMatrixClient/QMatrixClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile
index 8d8b6072631c..dc524c5f224d 100644
--- a/net-im/quaternion/Makefile
+++ b/net-im/quaternion/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	Quaternion
 DISTVERSION=	0.0.9.4
-DISTVERSIONSUFFIX=	-rc3
-PORTREVISION=	2
+DISTVERSIONSUFFIX=	c
+PORTREVISION=	3
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/net-im/quaternion/distinfo b/net-im/quaternion/distinfo
index a5f7add14bba..ee081b62e5e8 100644
--- a/net-im/quaternion/distinfo
+++ b/net-im/quaternion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555612772
-SHA256 (QMatrixClient-Quaternion-0.0.9.4-rc3_GH0.tar.gz) = eb1ae6599595405840b534ee157975e2f6608dab87ddf0d369ed90812caa8c1d
-SIZE (QMatrixClient-Quaternion-0.0.9.4-rc3_GH0.tar.gz) = 1017945
+TIMESTAMP = 1559826112
+SHA256 (QMatrixClient-Quaternion-0.0.9.4c_GH0.tar.gz) = a865f29a6342fd7cc2a7bbfb0bf215fcb8abebd72320302b9a76a6a5a80a0df0
+SIZE (QMatrixClient-Quaternion-0.0.9.4c_GH0.tar.gz) = 998434
diff --git a/net-im/quaternion/pkg-plist b/net-im/quaternion/pkg-plist
index 6b63f44f6295..4039880402a7 100644
--- a/net-im/quaternion/pkg-plist
+++ b/net-im/quaternion/pkg-plist
@@ -3,7 +3,7 @@ share/QMatrixClient/quaternion/translations/quaternion_de_DE.qm
 share/QMatrixClient/quaternion/translations/quaternion_en_GB.qm
 share/QMatrixClient/quaternion/translations/quaternion_pl.qm
 share/QMatrixClient/quaternion/translations/quaternion_ru.qm
-share/applications/quaternion.desktop
+share/applications/com.github.quaternion.desktop
 share/icons/hicolor/128x128/apps/quaternion.png
 share/icons/hicolor/16x16/apps/quaternion.png
 share/icons/hicolor/22x22/apps/quaternion.png
diff --git a/net-im/spectral/Makefile b/net-im/spectral/Makefile
index 0a4a9d80aee0..4b8626c4e178 100644
--- a/net-im/spectral/Makefile
+++ b/net-im/spectral/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	spectral
-PORTVERSION=	464
-PORTREVISION=	2
+PORTVERSION=	603
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
@@ -23,7 +22,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	b0
 GL_PROJECT=	spectral \
 		SortFilterProxyModel:sfpm
-GL_COMMIT=	0473f25d38a064ee4e18203ec16eeae84fea4866 \
+GL_COMMIT=	4ef8e1efd95cd8de3f5c215d2ed27754d8e8c11a \
 		c61f2bdb0da48804a596a9a3a9382eebdba764dc:sfpm
 GL_SUBDIR=	include/SortFilterProxyModel:sfpm
 
diff --git a/net-im/spectral/distinfo b/net-im/spectral/distinfo
index 38835a34da7c..7801d92cf224 100644
--- a/net-im/spectral/distinfo
+++ b/net-im/spectral/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1552059588
-SHA256 (b0-spectral-0473f25d38a064ee4e18203ec16eeae84fea4866_GL0.tar.gz) = 821b57ecfb2ca5440e4141e8a8d535792c94736214f929d8eeae6635eca843ee
-SIZE (b0-spectral-0473f25d38a064ee4e18203ec16eeae84fea4866_GL0.tar.gz) = 9215030
+TIMESTAMP = 1559832001
+SHA256 (b0-spectral-4ef8e1efd95cd8de3f5c215d2ed27754d8e8c11a_GL0.tar.gz) = 21a042072c1e04e4129d1786f2e5143cb35f408cd692065867f67dc4085615cb
+SIZE (b0-spectral-4ef8e1efd95cd8de3f5c215d2ed27754d8e8c11a_GL0.tar.gz) = 868460
 SHA256 (b0-SortFilterProxyModel-c61f2bdb0da48804a596a9a3a9382eebdba764dc_GL0.tar.gz) = 1c2ba6d6926192e0c5e20aa9270d77accce4649a780f957a0b95f5c9d375050b
 SIZE (b0-SortFilterProxyModel-c61f2bdb0da48804a596a9a3a9382eebdba764dc_GL0.tar.gz) = 32084