- Update to 3.1.1

- Update pkg-descr

PR:		214181
Submitted by:	yuri@rawbw.com(maintainer)

3 files changed, 29 insertions, 57 deletions

diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index c491021ac450..2b6c22e9c09e 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlitestudio
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	databases
 MASTER_SITES=	http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/
 
@@ -55,65 +55,37 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^include(.*|include($$$$PWD/../../SQLiteStudio3/plugins.pri)|' \
 		${WRKDIR}/Plugins/DbSqliteCipher/DbSqliteCipher.pro
 
-.include <bsd.port.options.mk>
-
 PLUGIN_DIRS=
-.if ${PORT_OPTIONS:MPLUGIN_CSV_IMPORT}
-PLUGIN_DIRS     += CsvImport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_CSV_EXPORT}
-PLUGIN_DIRS     += CsvExport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_DB_SQLITE_CIPHER}
-PLUGIN_DIRS     += DbSqliteCipher
-USE_OPENSSL=	yes
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_HTML_EXPORT}
-PLUGIN_DIRS     += HtmlExport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_JSON_EXPORT}
-PLUGIN_DIRS     += JsonExport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_PDF_EXPORT}
-PLUGIN_DIRS     += PdfExport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_PRINTING}
-PLUGIN_DIRS     += Printing
-USE_QT5+=	printsupport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_REGEXP_IMPORT}
-PLUGIN_DIRS     += RegExpImport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_SQL_ENTERPRISE_FORMATTER}
-PLUGIN_DIRS     += SqlEnterpriseFormatter
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_SQL_EXPORT}
-PLUGIN_DIRS     += SqlExport
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_SQL_FORMATTER_SIMPLE}
-PLUGIN_DIRS     += SqlFormatterSimple
-.endif
-.if ${PORT_OPTIONS:MPLUGIN_XML_EXPORT}
-PLUGIN_DIRS     += XmlExport
-.endif
+PLUGIN_CSV_IMPORT_VARS=			PLUGIN_DIRS+=CsvImport
+PLUGIN_CSV_EXPORT_VARS=			PLUGIN_DIRS+=CsvExport
+PLUGIN_DB_SQLITE_CIPHER_VARS=		PLUGIN_DIRS+=DbSqliteCipher USES+=ssl
+PLUGIN_HTML_EXPORT_VARS=		PLUGIN_DIRS+=HtmlExport
+PLUGIN_JSON_EXPORT_VARS=		PLUGIN_DIRS+=JsonExport
+PLUGIN_PDF_EXPORT_VARS=			PLUGIN_DIRS+=PdfExport
+PLUGIN_PRINTING_VARS=			PLUGIN_DIRS+=Printing USE_QT5+=printsupport
+PLUGIN_REGEXP_IMPORT_VARS=		PLUGIN_DIRS+=RegExpImport
+PLUGIN_SQL_ENTERPRISE_FORMATTER_VARS=	PLUGIN_DIRS+=SqlEnterpriseFormatter
+PLUGIN_SQL_EXPORT_VARS=			PLUGIN_DIRS+=SqlExport
+PLUGIN_SQL_FORMATTER_SIMPLE_VARS=	PLUGIN_DIRS+=SqlFormatterSimple
+PLUGIN_XML_EXPORT_VARS=			PLUGIN_DIRS+=XmlExport
 
 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}
-	@cd ${WRKDIR}/Plugins/${plugin} && \
-		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}
-.endfor
+	@for plugin in ${PLUGIN_DIRS}; do \
+	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}; \
+	done;
 post-build:
-.for plugin in ${PLUGIN_DIRS}
-	@cd ${WRKDIR}/Plugins/${plugin} && \
-		${DO_MAKE_BUILD} ${ALL_TARGET}
-.endfor
+	@for plugin in ${PLUGIN_DIRS}; do \
+	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  ${DO_MAKE_BUILD} ${ALL_TARGET}; \
+	done;
 post-install:
-.for plugin in ${PLUGIN_DIRS}
-	@cd ${WRKDIR}/Plugins/${plugin} && \
-		${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
-.endfor
+	@for plugin in ${PLUGIN_DIRS}; do \
+	  cd ${WRKDIR}/Plugins/$$plugin && \
+	  ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; \
+	done;
 
 .include <bsd.port.mk>
diff --git a/databases/sqlitestudio/distinfo b/databases/sqlitestudio/distinfo
index 4042e0c32839..4dab40fee8bd 100644
--- a/databases/sqlitestudio/distinfo
+++ b/databases/sqlitestudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466103045
-SHA256 (sqlitestudio-3.1.0.tar.gz) = e36690e71825a21d4274de730932a05a029b01dad28728b2c45f9fce0cfe9894
-SIZE (sqlitestudio-3.1.0.tar.gz) = 4565170
+TIMESTAMP = 1481570258
+SHA256 (sqlitestudio-3.1.1.tar.gz) = f757a82466e97137addd70dd5323a1a7ba7cad7841dc138812a2da2799f92c6c
+SIZE (sqlitestudio-3.1.1.tar.gz) = 8610037
diff --git a/databases/sqlitestudio/pkg-descr b/databases/sqlitestudio/pkg-descr
index 3bbac2643ee7..b4c4af44aa3a 100644
--- a/databases/sqlitestudio/pkg-descr
+++ b/databases/sqlitestudio/pkg-descr
@@ -3,7 +3,7 @@ SQLiteStudio is a SQLite database manager with the following features:
 * Powerful, yet light and fast
 * Exporting to various formats (SQL statements, CSV, HTML, XML, PDF, JSON)
 * Importing data from various formats (CSV, custom text files)
-* Numerous small additions, like formatting code, history of queries executed
+* Numerous small additions, like formatting code, history of executed queries,
   in editor windows, on-the-fly syntax checking, and more
 * Unicode support
 * Configurable colors, fonts and shortcuts