From owner-svn-ports-head@freebsd.org Thu Jul 26 19:00:21 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C979010575FE; Thu, 26 Jul 2018 19:00:20 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7EF0D747E2; Thu, 26 Jul 2018 19:00:20 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FDE75493; Thu, 26 Jul 2018 19:00:20 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QJ0K4i091386; Thu, 26 Jul 2018 19:00:20 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QJ0Jlg091383; Thu, 26 Jul 2018 19:00:19 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201807261900.w6QJ0Jlg091383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 26 Jul 2018 19:00:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475394 - in head/databases/sqlitestudio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/databases/sqlitestudio: . files X-SVN-Commit-Revision: 475394 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 19:00:21 -0000 Author: yuri Date: Thu Jul 26 19:00:19 2018 New Revision: 475394 URL: https://svnweb.freebsd.org/changeset/ports/475394 Log: databases/sqlitestudio: Update 3.1.1 -> 3.2.0 Changelog: https://sqlitestudio.pl/index.rvt?act=changelog Port changes: * Use DISTVERSION * Update LICENSE_FILE * Add options group * Simplify option handling such that the plugins list is in only one place * New plugin was added: MultiEditorImage * Remove USE_LDCONFIG, not needed Deleted: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_common_utils.cpp head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h head/databases/sqlitestudio/files/patch-sqlitestudiocli_cli__config.h Modified: head/databases/sqlitestudio/Makefile head/databases/sqlitestudio/distinfo head/databases/sqlitestudio/pkg-plist Modified: head/databases/sqlitestudio/Makefile ============================================================================== --- head/databases/sqlitestudio/Makefile Thu Jul 26 18:17:30 2018 (r475393) +++ head/databases/sqlitestudio/Makefile Thu Jul 26 19:00:19 2018 (r475394) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sqlitestudio -PORTVERSION= 3.1.1 -PORTREVISION= 5 +DISTVERSION= 3.2.0 CATEGORIES= databases MASTER_SITES= http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/ @@ -11,31 +10,24 @@ MAINTAINER= yuri@FreeBSD.org COMMENT= SQLite database GUI manager LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/guiSQLiteStudio/license.txt +LICENSE_FILE= ${WRKSRC}/coreSQLiteStudio/licenses/sqlitestudio_license.txt -OPTIONS_DEFINE= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_DB_SQLITE_CIPHER PLUGIN_HTML_EXPORT -OPTIONS_DEFINE+= PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT -OPTIONS_DEFINE+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER -OPTIONS_DEFINE+= PLUGIN_XML_EXPORT -PLUGIN_CSV_IMPORT_DESC= Install CsvImport plugin -PLUGIN_CSV_EXPORT_DESC= Install CsvExport plugin -PLUGIN_DB_SQLITE_CIPHER_DESC= Install DbSqliteCipher plugin -PLUGIN_HTML_EXPORT_DESC= Install HtmlExport plugin -PLUGIN_JSON_EXPORT_DESC= Install JsonExport plugin -PLUGIN_PDF_EXPORT_DESC= Install PdfExport plugin -PLUGIN_PRINTING_DESC= Install Printing plugin -PLUGIN_REGEXP_IMPORT_DESC= Install RegExp plugin -PLUGIN_SQL_FORMATTER_SIMPLE_DESC= Install SqlFormatterSimple plugin -PLUGIN_SQL_EXPORT_DESC= Install SqlExport plugin -PLUGIN_SQL_ENTERPRISE_FORMATTER_DESC= Install SqlEnterpriseFormatter plugin -PLUGIN_XML_EXPORT_DESC= Install XmlExport plugin - -OPTIONS_DEFAULT= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_HTML_EXPORT -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_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 gmake ncurses qmake qt:5 readline sqlite @@ -43,7 +35,6 @@ 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 -USE_LDCONFIG= yes CXXFLAGS+= -I${WRKSRC}/coreSQLiteStudio @@ -55,21 +46,6 @@ post-patch: # 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 - -PLUGIN_DIRS= -PLUGIN_CSV_IMPORT_VARS= PLUGIN_DIRS+=CsvImport -PLUGIN_CSV_EXPORT_VARS= PLUGIN_DIRS+=CsvExport -PLUGIN_DB_SQLITE_CIPHER_USES= ssl -PLUGIN_DB_SQLITE_CIPHER_VARS= PLUGIN_DIRS+=DbSqliteCipher -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_QT+=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 Modified: head/databases/sqlitestudio/distinfo ============================================================================== --- head/databases/sqlitestudio/distinfo Thu Jul 26 18:17:30 2018 (r475393) +++ head/databases/sqlitestudio/distinfo Thu Jul 26 19:00:19 2018 (r475394) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481570258 -SHA256 (sqlitestudio-3.1.1.tar.gz) = f757a82466e97137addd70dd5323a1a7ba7cad7841dc138812a2da2799f92c6c -SIZE (sqlitestudio-3.1.1.tar.gz) = 8610037 +TIMESTAMP = 1532583392 +SHA256 (sqlitestudio-3.2.0.tar.gz) = 73822e13e668383a41e643c2c0ec79449251b64c4b1f374e1afbba6c1fbe381d +SIZE (sqlitestudio-3.2.0.tar.gz) = 9404865 Modified: head/databases/sqlitestudio/pkg-plist ============================================================================== --- head/databases/sqlitestudio/pkg-plist Thu Jul 26 18:17:30 2018 (r475393) +++ head/databases/sqlitestudio/pkg-plist Thu Jul 26 19:00:19 2018 (r475394) @@ -13,9 +13,10 @@ lib/libguiSQLiteStudio.so.1.0.0 %%PLUGIN_DB_SQLITE_CIPHER%%lib/sqlitestudio/libDbSqliteCipher.so %%PLUGIN_HTML_EXPORT%%lib/sqlitestudio/libHtmlExport.so %%PLUGIN_JSON_EXPORT%%lib/sqlitestudio/libJsonExport.so +%%PLUGIN_MULTI_EDITOR_IMAGE%%lib/sqlitestudio/libMultiEditorImage.so %%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so %%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so -%%PLUGIN_REGEXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so +%%PLUGIN_REG_EXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so %%PLUGIN_SQL_FORMATTER_SIMPLE%%lib/sqlitestudio/libSqlFormatterSimple.so %%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so %%PLUGIN_SQL_ENTERPRISE_FORMATTER%%lib/sqlitestudio/libSqlEnterpriseFormatter.so