Index: head/databases/sqlitestudio/Makefile
===================================================================
--- head/databases/sqlitestudio/Makefile	(revision 522163)
+++ head/databases/sqlitestudio/Makefile	(revision 522164)
@@ -1,88 +1,84 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	sqlitestudio
-DISTVERSION=	3.2.1
-PORTREVISION=	8
+DISTVERSION=	3.2.1-705
+DISTVERSIONSUFFIX=	-gaf49fd61
 CATEGORIES=	databases
-MASTER_SITES=	http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SQLite database GUI manager
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/coreSQLiteStudio/licenses/sqlitestudio_license.txt
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 OPTIONS_GROUP=		PLUGINS
 OPTIONS_DEFAULT=	${OPTIONS_GROUP_PLUGINS}
 OPTIONS_SUB=		yes
 PLUGINS_DESC=			Install plugins:
 
 ALL_PLUGINS=		CsvImport CsvExport DbSqliteCipher HtmlExport JsonExport MultiEditorImage PdfExport Printing \
 			RegExpImport SqlFormatterSimple SqlExport SqlEnterpriseFormatter XmlExport
 .for p in ${ALL_PLUGINS}
 OPTIONS_GROUP_PLUGINS+=		PLUGIN${p:C/([A-Z])/_\1/g:tu}
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_DESC=		${p} plugin
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_VARS=	PLUGIN_DIRS+=${p}
 .endfor
 
 PLUGIN_DB_SQLITE_CIPHER_USES=		ssl
 PLUGIN_PRINTING_USE=			QT=printsupport
 
-WRKSRC=		${WRKDIR}/SQLiteStudio3
-
 USES=		compiler:c++11-lib gl gmake ncurses qmake qt:5 readline sqlite
+USE_GITHUB=	yes
+GH_ACCOUNT=	pawelsalawa
 USE_CXXSTD=	c++11
 USE_QT=		core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
 		uitools buildtools_build linguisttools_build
 USE_GL=		gl
 
+WRKSRC_SUBDIR=	SQLiteStudio3
+
 CXXFLAGS+=	-I${WRKSRC}/coreSQLiteStudio
 
 DESKTOP_ENTRIES=	"SQLite database manager" \
 			"Advanced SQLite database manager" \
 			"SQLiteStudio" \
 			"SQLiteStudio" \
 			"Database;Viewer;DataVisualization;Development;Qt;" \
 			""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' \
 		${WRKSRC}/dirs.pri
 	@${REINPLACE_CMD} -e 's|pluginDirs += QDir(CFG->getConfigDir()).absoluteFilePath("plugins");|pluginDirs += "${LOCALBASE}/lib/sqlitestudio";|' \
 		${WRKSRC}/coreSQLiteStudio/services/impl/pluginmanagerimpl.cpp
-	# Patch from http://bugs.sqlitestudio.pl/index.rvt?id=3102
-	@${REINPLACE_CMD} -e 's|^include(.*|include($$$$PWD/../../SQLiteStudio3/plugins.pri)|' \
-		${WRKDIR}/Plugins/DbSqliteCipher/DbSqliteCipher.pro
 
 post-configure:
 	# Fix for a suspected bug in qmake: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210418
 	@${REINPLACE_CMD} -E 's|SUBLIBS) -L[^ ]+|SUBLIBS) |' ${WRKSRC}/sqlitestudio/Makefile
 	@${REINPLACE_CMD} -E 's|LIBS)$$|LIBS) -L${PREFIX}/lib|' ${WRKSRC}/sqlitestudio/Makefile
 	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  cd ${WRKSRC}/../Plugins/$$plugin && \
 	  ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}; \
 	done;
 
 post-build:
 	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  cd ${WRKSRC}/../Plugins/$$plugin && \
 	  ${DO_MAKE_BUILD} ${ALL_TARGET}; \
 	done;
 
 post-install:
 	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  cd ${WRKSRC}/../Plugins/$$plugin && \
 	  ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; \
 	done;
 	# install icons for the .desktop file to work
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} \
 		${WRKSRC}/guiSQLiteStudio/img/sqlitestudio.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/SQLiteStudio.svg
 	# add the lowercase link to the executable for convenience
 	@cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s SQLiteStudio sqlitestudio
 
 .include <bsd.port.mk>
Index: head/databases/sqlitestudio/distinfo
===================================================================
--- head/databases/sqlitestudio/distinfo	(revision 522163)
+++ head/databases/sqlitestudio/distinfo	(revision 522164)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532728449
-SHA256 (sqlitestudio-3.2.1.tar.gz) = b0f9e79bb97ecd2cf1196d6d2fa4f3afb16b24b7efa67fa2ec3d7373046339c0
-SIZE (sqlitestudio-3.2.1.tar.gz) = 9405867
+TIMESTAMP = 1578221995
+SHA256 (pawelsalawa-sqlitestudio-3.2.1-705-gaf49fd61_GH0.tar.gz) = 8d6856f34b9d22d70820a3a422c30b9dee6572f82aaf5c1647edf1d5ee5d1167
+SIZE (pawelsalawa-sqlitestudio-3.2.1-705-gaf49fd61_GH0.tar.gz) = 11347053