Index: head/databases/sqlitestudio/Makefile =================================================================== --- head/databases/sqlitestudio/Makefile (revision 475393) +++ head/databases/sqlitestudio/Makefile (revision 475394) @@ -1,93 +1,69 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= sqlitestudio -PORTVERSION= 3.1.1 -PORTREVISION= 5 +DISTVERSION= 3.2.0 CATEGORIES= databases MASTER_SITES= http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/ 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 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 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 - -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 @${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 && \ ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}; \ done; post-build: @for plugin in ${PLUGIN_DIRS}; do \ cd ${WRKDIR}/Plugins/$$plugin && \ ${DO_MAKE_BUILD} ${ALL_TARGET}; \ done; post-install: @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 Index: head/databases/sqlitestudio/distinfo =================================================================== --- head/databases/sqlitestudio/distinfo (revision 475393) +++ head/databases/sqlitestudio/distinfo (revision 475394) @@ -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 Index: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h =================================================================== --- head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h (revision 475393) +++ head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h (nonexistent) @@ -1,25 +0,0 @@ ---- coreSQLiteStudio/db/db.h.orig 2016-11-04 15:27:43 UTC -+++ coreSQLiteStudio/db/db.h -@@ -1,6 +1,7 @@ - #ifndef DB_H - #define DB_H - -+#include // 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 --#include - #include - #include - #include - #include - #include - #include -+#include - - /** @file */ - Property changes on: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h =================================================================== --- head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h (revision 475393) +++ head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h (nonexistent) @@ -1,10 +0,0 @@ ---- 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 // upstream didn't fix the broken build for many months - #include - #include - #include Property changes on: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlitestudio/files/patch-sqlitestudiocli_cli__config.h =================================================================== --- head/databases/sqlitestudio/files/patch-sqlitestudiocli_cli__config.h (revision 475393) +++ head/databases/sqlitestudio/files/patch-sqlitestudiocli_cli__config.h (nonexistent) @@ -1,10 +0,0 @@ ---- sqlitestudiocli/cli_config.h.orig 2016-01-21 10:44:03 UTC -+++ sqlitestudiocli/cli_config.h -@@ -2,6 +2,7 @@ - #define CLI_CONFIG_H - - #include "config_builder.h" -+#include - - namespace CliResultsDisplay - { Property changes on: head/databases/sqlitestudio/files/patch-sqlitestudiocli_cli__config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_common_utils.cpp =================================================================== --- head/databases/sqlitestudio/files/patch-coreSQLiteStudio_common_utils.cpp (revision 475393) +++ head/databases/sqlitestudio/files/patch-coreSQLiteStudio_common_utils.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- coreSQLiteStudio/common/utils.cpp.orig 2016-01-21 10:31:10 UTC -+++ coreSQLiteStudio/common/utils.cpp -@@ -2,6 +2,7 @@ - #include "common/global.h" - #include "dbobjecttype.h" - #include "rsa/RSA.h" -+#include - #include - #include - #include Property changes on: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_common_utils.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlitestudio/pkg-plist =================================================================== --- head/databases/sqlitestudio/pkg-plist (revision 475393) +++ head/databases/sqlitestudio/pkg-plist (revision 475394) @@ -1,22 +1,23 @@ bin/SQLiteStudio bin/sqlitestudiocli lib/libcoreSQLiteStudio.so lib/libcoreSQLiteStudio.so.1 lib/libcoreSQLiteStudio.so.1.0 lib/libcoreSQLiteStudio.so.1.0.0 lib/libguiSQLiteStudio.so lib/libguiSQLiteStudio.so.1 lib/libguiSQLiteStudio.so.1.0 lib/libguiSQLiteStudio.so.1.0.0 %%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so %%PLUGIN_CSV_EXPORT%%lib/sqlitestudio/libCsvExport.so %%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 %%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so