Index: databases/sqlitestudio/Makefile
===================================================================
--- databases/sqlitestudio/Makefile
+++ databases/sqlitestudio/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	sqlitestudio
-PORTVERSION=	3.1.1
-PORTREVISION=	4
+DISTVERSION=	3.1.1
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/
 
-MAINTAINER=	yuri@rawbw.com
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SQLite database GUI manager
 
 LICENSE=	GPLv3
@@ -34,14 +34,14 @@
 OPTIONS_DEFAULT+=	PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT
 OPTIONS_DEFAULT+=	PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER
 OPTIONS_DEFAULT+=	PLUGIN_XML_EXPORT
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 WRKSRC=		${WRKDIR}/SQLiteStudio3
 
 USES=		compiler:c++11-lib gmake ncurses qmake readline sqlite
 USE_CXXSTD=	c++11
-USE_QT5=	core gui svg sql xml network sql-sqlite3_run widgets script \
-		concurrent uitools buildtools_build linguisttools_build
+USE_QT5=	core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
+		uitools buildtools_build linguisttools_build
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
Index: databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h
===================================================================
--- databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h
+++ databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h
@@ -1,6 +1,21 @@
---- coreSQLiteStudio/db/db.h.orig	2016-01-21 10:33:48 UTC
+--- coreSQLiteStudio/db/db.h.orig	2016-11-04 15:27:43 UTC
 +++ coreSQLiteStudio/db/db.h
-@@ -17,6 +17,7 @@
+@@ -1,6 +1,7 @@
+ #ifndef DB_H
+ #define DB_H
+ 
++#include <QVariant> // upstream didn't fix the broken build for many months
+ #include "returncode.h"
+ #include "dialect.h"
+ #include "services/functionmanager.h"
+@@ -10,13 +11,13 @@
+ #include "interruptable.h"
+ #include "dbobjecttype.h"
+ #include <QObject>
+-#include <QVariant>
+ #include <QList>
+ #include <QHash>
+ #include <QReadWriteLock>
  #include <QRunnable>
  #include <QStringList>
  #include <QSet>
Index: databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h
===================================================================
--- /dev/null
+++ databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h
@@ -0,0 +1,10 @@
+--- coreSQLiteStudio/services/functionmanager.h.orig	2017-11-23 00:59:57 UTC
++++ coreSQLiteStudio/services/functionmanager.h
+@@ -3,6 +3,7 @@
+ 
+ #include "coreSQLiteStudio_global.h"
+ #include "common/global.h"
++#include <QVariant> // upstream didn't fix the broken build for many months
+ #include <QList>
+ #include <QSharedPointer>
+ #include <QObject>